mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-09-30 16:56:35 -04:00
API: added feature sets in the instance summary
This commit is contained in:
parent
8d68fa5231
commit
95f5e9ec7a
@ -6144,6 +6144,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"devicesetlist" : {
|
"devicesetlist" : {
|
||||||
"$ref" : "#/definitions/DeviceSetList"
|
"$ref" : "#/definitions/DeviceSetList"
|
||||||
|
},
|
||||||
|
"featuresetlist" : {
|
||||||
|
"$ref" : "#/definitions/FeatureSetList"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "Summarized information about this SDRangel instance"
|
"description" : "Summarized information about this SDRangel instance"
|
||||||
@ -48108,7 +48111,7 @@ except ApiException as e:
|
|||||||
</div>
|
</div>
|
||||||
<div id="generator">
|
<div id="generator">
|
||||||
<div class="content">
|
<div class="content">
|
||||||
Generated 2021-08-28T23:40:46.879+02:00
|
Generated 2021-08-31T23:36:40.361+02:00
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -2366,6 +2366,8 @@ definitions:
|
|||||||
$ref: "#/definitions/LoggingInfo"
|
$ref: "#/definitions/LoggingInfo"
|
||||||
devicesetlist:
|
devicesetlist:
|
||||||
$ref: "#/definitions/DeviceSetList"
|
$ref: "#/definitions/DeviceSetList"
|
||||||
|
featuresetlist:
|
||||||
|
$ref: "#/definitions/FeatureSetList"
|
||||||
|
|
||||||
InstanceConfigResponse:
|
InstanceConfigResponse:
|
||||||
description: Preferences, Presets and Commands of the MainSettings saved by Qt
|
description: Preferences, Presets and Commands of the MainSettings saved by Qt
|
||||||
|
@ -122,6 +122,9 @@ int WebAPIAdapter::instanceSummary(
|
|||||||
SWGSDRangel::SWGDeviceSetList *deviceSetList = response.getDevicesetlist();
|
SWGSDRangel::SWGDeviceSetList *deviceSetList = response.getDevicesetlist();
|
||||||
getDeviceSetList(deviceSetList);
|
getDeviceSetList(deviceSetList);
|
||||||
|
|
||||||
|
SWGSDRangel::SWGFeatureSetList *featureSetList = response.getFeaturesetlist();
|
||||||
|
getFeatureSetList(featureSetList);
|
||||||
|
|
||||||
return 200;
|
return 200;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2366,6 +2366,8 @@ definitions:
|
|||||||
$ref: "#/definitions/LoggingInfo"
|
$ref: "#/definitions/LoggingInfo"
|
||||||
devicesetlist:
|
devicesetlist:
|
||||||
$ref: "#/definitions/DeviceSetList"
|
$ref: "#/definitions/DeviceSetList"
|
||||||
|
featuresetlist:
|
||||||
|
$ref: "#/definitions/FeatureSetList"
|
||||||
|
|
||||||
InstanceConfigResponse:
|
InstanceConfigResponse:
|
||||||
description: Preferences, Presets and Commands of the MainSettings saved by Qt
|
description: Preferences, Presets and Commands of the MainSettings saved by Qt
|
||||||
|
@ -6144,6 +6144,9 @@ margin-bottom: 20px;
|
|||||||
},
|
},
|
||||||
"devicesetlist" : {
|
"devicesetlist" : {
|
||||||
"$ref" : "#/definitions/DeviceSetList"
|
"$ref" : "#/definitions/DeviceSetList"
|
||||||
|
},
|
||||||
|
"featuresetlist" : {
|
||||||
|
"$ref" : "#/definitions/FeatureSetList"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "Summarized information about this SDRangel instance"
|
"description" : "Summarized information about this SDRangel instance"
|
||||||
@ -48108,7 +48111,7 @@ except ApiException as e:
|
|||||||
</div>
|
</div>
|
||||||
<div id="generator">
|
<div id="generator">
|
||||||
<div class="content">
|
<div class="content">
|
||||||
Generated 2021-08-28T23:40:46.879+02:00
|
Generated 2021-08-31T23:36:40.361+02:00
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -48,6 +48,8 @@ SWGInstanceSummaryResponse::SWGInstanceSummaryResponse() {
|
|||||||
m_logging_isSet = false;
|
m_logging_isSet = false;
|
||||||
devicesetlist = nullptr;
|
devicesetlist = nullptr;
|
||||||
m_devicesetlist_isSet = false;
|
m_devicesetlist_isSet = false;
|
||||||
|
featuresetlist = nullptr;
|
||||||
|
m_featuresetlist_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGInstanceSummaryResponse::~SWGInstanceSummaryResponse() {
|
SWGInstanceSummaryResponse::~SWGInstanceSummaryResponse() {
|
||||||
@ -76,6 +78,8 @@ SWGInstanceSummaryResponse::init() {
|
|||||||
m_logging_isSet = false;
|
m_logging_isSet = false;
|
||||||
devicesetlist = new SWGDeviceSetList();
|
devicesetlist = new SWGDeviceSetList();
|
||||||
m_devicesetlist_isSet = false;
|
m_devicesetlist_isSet = false;
|
||||||
|
featuresetlist = new SWGFeatureSetList();
|
||||||
|
m_featuresetlist_isSet = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -104,6 +108,9 @@ SWGInstanceSummaryResponse::cleanup() {
|
|||||||
if(devicesetlist != nullptr) {
|
if(devicesetlist != nullptr) {
|
||||||
delete devicesetlist;
|
delete devicesetlist;
|
||||||
}
|
}
|
||||||
|
if(featuresetlist != nullptr) {
|
||||||
|
delete featuresetlist;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SWGInstanceSummaryResponse*
|
SWGInstanceSummaryResponse*
|
||||||
@ -137,6 +144,8 @@ SWGInstanceSummaryResponse::fromJsonObject(QJsonObject &pJson) {
|
|||||||
|
|
||||||
::SWGSDRangel::setValue(&devicesetlist, pJson["devicesetlist"], "SWGDeviceSetList", "SWGDeviceSetList");
|
::SWGSDRangel::setValue(&devicesetlist, pJson["devicesetlist"], "SWGDeviceSetList", "SWGDeviceSetList");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&featuresetlist, pJson["featuresetlist"], "SWGFeatureSetList", "SWGFeatureSetList");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QString
|
QString
|
||||||
@ -183,6 +192,9 @@ SWGInstanceSummaryResponse::asJsonObject() {
|
|||||||
if((devicesetlist != nullptr) && (devicesetlist->isSet())){
|
if((devicesetlist != nullptr) && (devicesetlist->isSet())){
|
||||||
toJsonValue(QString("devicesetlist"), devicesetlist, obj, QString("SWGDeviceSetList"));
|
toJsonValue(QString("devicesetlist"), devicesetlist, obj, QString("SWGDeviceSetList"));
|
||||||
}
|
}
|
||||||
|
if((featuresetlist != nullptr) && (featuresetlist->isSet())){
|
||||||
|
toJsonValue(QString("featuresetlist"), featuresetlist, obj, QString("SWGFeatureSetList"));
|
||||||
|
}
|
||||||
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
@ -287,6 +299,16 @@ SWGInstanceSummaryResponse::setDevicesetlist(SWGDeviceSetList* devicesetlist) {
|
|||||||
this->m_devicesetlist_isSet = true;
|
this->m_devicesetlist_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SWGFeatureSetList*
|
||||||
|
SWGInstanceSummaryResponse::getFeaturesetlist() {
|
||||||
|
return featuresetlist;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGInstanceSummaryResponse::setFeaturesetlist(SWGFeatureSetList* featuresetlist) {
|
||||||
|
this->featuresetlist = featuresetlist;
|
||||||
|
this->m_featuresetlist_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
SWGInstanceSummaryResponse::isSet(){
|
SWGInstanceSummaryResponse::isSet(){
|
||||||
@ -322,6 +344,9 @@ SWGInstanceSummaryResponse::isSet(){
|
|||||||
if(devicesetlist && devicesetlist->isSet()){
|
if(devicesetlist && devicesetlist->isSet()){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
|
if(featuresetlist && featuresetlist->isSet()){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
}while(false);
|
}while(false);
|
||||||
return isObjectUpdated;
|
return isObjectUpdated;
|
||||||
}
|
}
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
|
|
||||||
|
|
||||||
#include "SWGDeviceSetList.h"
|
#include "SWGDeviceSetList.h"
|
||||||
|
#include "SWGFeatureSetList.h"
|
||||||
#include "SWGLoggingInfo.h"
|
#include "SWGLoggingInfo.h"
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
@ -74,6 +75,9 @@ public:
|
|||||||
SWGDeviceSetList* getDevicesetlist();
|
SWGDeviceSetList* getDevicesetlist();
|
||||||
void setDevicesetlist(SWGDeviceSetList* devicesetlist);
|
void setDevicesetlist(SWGDeviceSetList* devicesetlist);
|
||||||
|
|
||||||
|
SWGFeatureSetList* getFeaturesetlist();
|
||||||
|
void setFeaturesetlist(SWGFeatureSetList* featuresetlist);
|
||||||
|
|
||||||
|
|
||||||
virtual bool isSet() override;
|
virtual bool isSet() override;
|
||||||
|
|
||||||
@ -108,6 +112,9 @@ private:
|
|||||||
SWGDeviceSetList* devicesetlist;
|
SWGDeviceSetList* devicesetlist;
|
||||||
bool m_devicesetlist_isSet;
|
bool m_devicesetlist_isSet;
|
||||||
|
|
||||||
|
SWGFeatureSetList* featuresetlist;
|
||||||
|
bool m_featuresetlist_isSet;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user