VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-01 21:54:55 -04:00
Code Issues Projects Releases Wiki Activity

v7 API: removed instance feature set end points and some swagger generated code cleanup

Browse Source
This commit is contained in:
f4exb
2022-05-03 04:55:35 +02:00
parent 85f7b1de47
commit 233c3f961d
37 changed files with 33 additions and 5027 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/webapi/webapiadapter.cpp
+2 -67
View File
@@ -75,8 +75,6 @@
#include "SWGFeaturePresetGroup.h"
#include "SWGFeaturePresetItem.h"
#include "SWGFeaturePresetIdentifier.h"
#include "SWGFeaturePresetTransfer.h"
#include "SWGFeatureSetList.h"
#include "SWGFeatureSettings.h"
#include "SWGFeatureReport.h"
#include "SWGFeatureActions.h"
@@ -127,8 +125,8 @@ int WebAPIAdapter::instanceSummary(
SWGSDRangel::SWGDeviceSetList *deviceSetList = response.getDevicesetlist();
getDeviceSetList(deviceSetList);
SWGSDRangel::SWGFeatureSetList *featureSetList = response.getFeaturesetlist();
getFeatureSetList(featureSetList);
SWGSDRangel::SWGFeatureSet *featureSet = response.getFeatureset();
getFeatureSet(featureSet, m_mainCore->m_featureSets.back(), 0);
return 200;
}
@@ -1489,15 +1487,6 @@ int WebAPIAdapter::instanceDeviceSetsGet(
return 200;
}
int WebAPIAdapter::instanceFeatureSetsGet(
SWGSDRangel::SWGFeatureSetList& response,
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
getFeatureSetList(&response);
return 200;
}
int WebAPIAdapter::instanceDeviceSetPost(
int direction,
SWGSDRangel::SWGSuccessResponse& response,
@@ -1538,45 +1527,6 @@ int WebAPIAdapter::instanceDeviceSetDelete(
}
}
int WebAPIAdapter::instanceFeatureSetPost(
SWGSDRangel::SWGSuccessResponse& response,
SWGSDRangel::SWGErrorResponse& error)
{
(void) error;
MainCore::MsgAddFeatureSet *msg = MainCore::MsgAddFeatureSet::create();
m_mainCore->m_mainMessageQueue->push(msg);
response.init();
*response.getMessage() = QString("Message to add a new feature set (MsgAddFeatureSet) was submitted successfully");
return 202;
}
int WebAPIAdapter::instanceFeatureSetDelete(
SWGSDRangel::SWGSuccessResponse& response,
SWGSDRangel::SWGErrorResponse& error)
{
unsigned int minFeatureSets = QCoreApplication::applicationName() == "SDRangelSrv" ? 0 : 1;
if (m_mainCore->m_featureSets.size() > minFeatureSets)
{
MainCore::MsgRemoveLastFeatureSet *msg = MainCore::MsgRemoveLastFeatureSet::create();
m_mainCore->m_mainMessageQueue->push(msg);
response.init();
*response.getMessage() = QString("Message to remove last feature set (MsgRemoveLastFeatureSet) was submitted successfully");
return 202;
}
else
{
error.init();
*error.getMessage() = "No more feature sets to be removed";
return 404;
}
}
int WebAPIAdapter::devicesetGet(
int deviceSetIndex,
SWGSDRangel::SWGDeviceSet& response,
@@ -3746,21 +3696,6 @@ int WebAPIAdapter::featuresetGet(
}
}
void WebAPIAdapter::getFeatureSetList(SWGSDRangel::SWGFeatureSetList* featureSetList)
{
featureSetList->init();
featureSetList->setFeaturesetcount((int) m_mainCore->m_featureSets.size());
std::vector<FeatureSet*>::const_iterator it = m_mainCore->m_featureSets.begin();
for (int i = 0; it != m_mainCore->m_featureSets.end(); ++it, i++)
{
QList<SWGSDRangel::SWGFeatureSet*> *featureSets = featureSetList->getFeatureSets();
featureSets->append(new SWGSDRangel::SWGFeatureSet());
getFeatureSet(featureSets->back(), *it, i);
}
}
void WebAPIAdapter::getFeatureSet(SWGSDRangel::SWGFeatureSet *swgFeatureSet, const FeatureSet* featureSet, int featureSetIndex)
{
swgFeatureSet->init();