VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-02 22:14:45 -04:00
Code Issues Projects Releases Wiki Activity

v7: removed feature set index from API. Implements #1231

Browse Source
This commit is contained in:
f4exb
2022-05-04 13:27:13 +02:00
parent 233c3f961d
commit 4eba3bb871
14 changed files with 751 additions and 2382 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/webapi/webapiadapter.cpp
+3 -4
View File
@@ -126,7 +126,7 @@ int WebAPIAdapter::instanceSummary(
getDeviceSetList(deviceSetList);
SWGSDRangel::SWGFeatureSet *featureSet = response.getFeatureset();
getFeatureSet(featureSet, m_mainCore->m_featureSets.back(), 0);
getFeatureSet(featureSet, m_mainCore->m_featureSets.back());
return 200;
}
@@ -3683,7 +3683,7 @@ int WebAPIAdapter::featuresetGet(
if ((featureSetIndex >= 0) && (featureSetIndex < (int) m_mainCore->m_featureSets.size()))
{
const FeatureSet *featureSet = m_mainCore->m_featureSets[featureSetIndex];
getFeatureSet(&response, featureSet, featureSetIndex);
getFeatureSet(&response, featureSet);
return 200;
}
@@ -3696,11 +3696,10 @@ int WebAPIAdapter::featuresetGet(
}
}
void WebAPIAdapter::getFeatureSet(SWGSDRangel::SWGFeatureSet *swgFeatureSet, const FeatureSet* featureSet, int featureSetIndex)
void WebAPIAdapter::getFeatureSet(SWGSDRangel::SWGFeatureSet *swgFeatureSet, const FeatureSet* featureSet)
{
swgFeatureSet->init();
swgFeatureSet->setFeaturecount(featureSet->getNumberOfFeatures());
swgFeatureSet->setIndex(featureSetIndex);
QList<SWGSDRangel::SWGFeature*> *features = swgFeatureSet->getFeatures();
for (int i = 0; i < featureSet->getNumberOfFeatures(); i++)