VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-13 19:28:41 -04:00
Code Issues Projects Releases Wiki Activity

Web API: put some array items in their own classes

Browse Source
This commit is contained in:
f4exb
2018-05-27 19:54:33 +02:00
parent 9360c4de0b
commit 2184425311
41 changed files with 1192 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/airspy/airspyinput.cpp
+3 -3
View File
@@ -741,11 +741,11 @@ void AirspyInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& res
void AirspyInput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response)
{
response.getAirspyReport()->setSampleRates(new QList<SWGSDRangel::SWGAirspyReport_sampleRates*>);
response.getAirspyReport()->setSampleRates(new QList<SWGSDRangel::SWGSampleRate*>);
for (std::vector<uint32_t>::const_iterator it = getSampleRates().begin(); it != getSampleRates().end(); ++it)
{
response.getAirspyReport()->getSampleRates()->append(new SWGSDRangel::SWGAirspyReport_sampleRates);
response.getAirspyReport()->getSampleRates()->back()->setSampleRate(*it);
response.getAirspyReport()->getSampleRates()->append(new SWGSDRangel::SWGSampleRate);
response.getAirspyReport()->getSampleRates()->back()->setRate(*it);
}
}
plugins/samplesource/airspyhf/airspyhfinput.cpp
+3 -3
View File
@@ -565,12 +565,12 @@ void AirspyHFInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& r
void AirspyHFInput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response)
{
response.getAirspyHfReport()->setSampleRates(new QList<SWGSDRangel::SWGAirspyReport_sampleRates*>);
response.getAirspyHfReport()->setSampleRates(new QList<SWGSDRangel::SWGSampleRate*>);
for (std::vector<uint32_t>::const_iterator it = getSampleRates().begin(); it != getSampleRates().end(); ++it)
{
response.getAirspyHfReport()->getSampleRates()->append(new SWGSDRangel::SWGAirspyReport_sampleRates);
response.getAirspyHfReport()->getSampleRates()->back()->setSampleRate(*it);
response.getAirspyHfReport()->getSampleRates()->append(new SWGSDRangel::SWGSampleRate);
response.getAirspyHfReport()->getSampleRates()->back()->setRate(*it);
}
}
plugins/samplesource/perseus/perseusinput.cpp
+3 -3
View File
@@ -525,12 +525,12 @@ void PerseusInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& re
void PerseusInput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response)
{
response.getPerseusReport()->setSampleRates(new QList<SWGSDRangel::SWGAirspyReport_sampleRates*>);
response.getPerseusReport()->setSampleRates(new QList<SWGSDRangel::SWGSampleRate*>);
for (std::vector<uint32_t>::const_iterator it = getSampleRates().begin(); it != getSampleRates().end(); ++it)
{
response.getPerseusReport()->getSampleRates()->append(new SWGSDRangel::SWGAirspyReport_sampleRates);
response.getPerseusReport()->getSampleRates()->back()->setSampleRate(*it);
response.getPerseusReport()->getSampleRates()->append(new SWGSDRangel::SWGSampleRate);
response.getPerseusReport()->getSampleRates()->back()->setRate(*it);
}
}
plugins/samplesource/rtlsdr/rtlsdrinput.cpp
+3 -3
View File
@@ -668,12 +668,12 @@ int RTLSDRInput::webapiReportGet(
void RTLSDRInput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response)
{
response.getRtlSdrReport()->setGains(new QList<SWGSDRangel::SWGRtlSdrReport_gains*>);
response.getRtlSdrReport()->setGains(new QList<SWGSDRangel::SWGGain*>);
for (std::vector<int>::const_iterator it = getGains().begin(); it != getGains().end(); ++it)
{
response.getRtlSdrReport()->getGains()->append(new SWGSDRangel::SWGRtlSdrReport_gains);
response.getRtlSdrReport()->getGains()->back()->setGain(*it);
response.getRtlSdrReport()->getGains()->append(new SWGSDRangel::SWGGain);
response.getRtlSdrReport()->getGains()->back()->setGainCb(*it);
}
}
plugins/samplesource/sdrplay/sdrplayinput.cpp
+13 -13
View File
@@ -662,38 +662,38 @@ int SDRPlayInput::webapiReportGet(
void SDRPlayInput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response)
{
response.getSdrPlayReport()->setSampleRates(new QList<SWGSDRangel::SWGAirspyReport_sampleRates*>);
response.getSdrPlayReport()->setSampleRates(new QList<SWGSDRangel::SWGSampleRate*>);
for (unsigned int i = 0; i < SDRPlaySampleRates::getNbRates(); i++)
{
response.getSdrPlayReport()->getSampleRates()->append(new SWGSDRangel::SWGAirspyReport_sampleRates);
response.getSdrPlayReport()->getSampleRates()->back()->setSampleRate(SDRPlaySampleRates::getRate(i));
response.getSdrPlayReport()->getSampleRates()->append(new SWGSDRangel::SWGSampleRate);
response.getSdrPlayReport()->getSampleRates()->back()->setRate(SDRPlaySampleRates::getRate(i));
}
response.getSdrPlayReport()->setIntermediateFrequencies(new QList<SWGSDRangel::SWGSDRPlayReport_intermediateFrequencies*>);
response.getSdrPlayReport()->setIntermediateFrequencies(new QList<SWGSDRangel::SWGFrequency*>);
for (unsigned int i = 0; i < SDRPlayIF::getNbIFs(); i++)
{
response.getSdrPlayReport()->getIntermediateFrequencies()->append(new SWGSDRangel::SWGSDRPlayReport_intermediateFrequencies);
response.getSdrPlayReport()->getIntermediateFrequencies()->back()->setIntermediateFrequency(SDRPlayIF::getIF(i));
response.getSdrPlayReport()->getIntermediateFrequencies()->append(new SWGSDRangel::SWGFrequency);
response.getSdrPlayReport()->getIntermediateFrequencies()->back()->setFrequency(SDRPlayIF::getIF(i));
}
response.getSdrPlayReport()->setBandwidths(new QList<SWGSDRangel::SWGSDRPlayReport_bandwidths*>);
response.getSdrPlayReport()->setBandwidths(new QList<SWGSDRangel::SWGBandwidth*>);
for (unsigned int i = 0; i < SDRPlayBandwidths::getNbBandwidths(); i++)
{
response.getSdrPlayReport()->getBandwidths()->append(new SWGSDRangel::SWGSDRPlayReport_bandwidths);
response.getSdrPlayReport()->getBandwidths()->append(new SWGSDRangel::SWGBandwidth);
response.getSdrPlayReport()->getBandwidths()->back()->setBandwidth(SDRPlayBandwidths::getBandwidth(i));
}
response.getSdrPlayReport()->setFrequencyBands(new QList<SWGSDRangel::SWGSDRPlayReport_frequencyBands*>);
response.getSdrPlayReport()->setFrequencyBands(new QList<SWGSDRangel::SWGFrequencyBand*>);
for (unsigned int i = 0; i < SDRPlayBands::getNbBands(); i++)
{
response.getSdrPlayReport()->getFrequencyBands()->append(new SWGSDRangel::SWGSDRPlayReport_frequencyBands);
response.getSdrPlayReport()->getFrequencyBands()->back()->setBandName(new QString(SDRPlayBands::getBandName(i)));
response.getSdrPlayReport()->getFrequencyBands()->back()->setBandLow(SDRPlayBands::getBandLow(i));
response.getSdrPlayReport()->getFrequencyBands()->back()->setBandHigh(SDRPlayBands::getBandHigh(i));
response.getSdrPlayReport()->getFrequencyBands()->append(new SWGSDRangel::SWGFrequencyBand);
response.getSdrPlayReport()->getFrequencyBands()->back()->setName(new QString(SDRPlayBands::getBandName(i)));
response.getSdrPlayReport()->getFrequencyBands()->back()->setLowerBound(SDRPlayBands::getBandLow(i));
response.getSdrPlayReport()->getFrequencyBands()->back()->setHigherBound(SDRPlayBands::getBandHigh(i));
}
}