diff --git a/plugins/feature/afc/afc.cpp b/plugins/feature/afc/afc.cpp index 465f95a8b..8066f428d 100644 --- a/plugins/feature/afc/afc.cpp +++ b/plugins/feature/afc/afc.cpp @@ -335,9 +335,21 @@ int AFC::webapiActionsPost( if (swgAFCActions) { + bool unknownAction = true; + + if (featureActionsKeys.contains("run")) + { + bool featureRun = swgAFCActions->getRun() != 0; + unknownAction = false; + + MsgStartStop *msg = MsgStartStop::create(featureRun); + getInputMessageQueue()->push(msg); + } + if (featureActionsKeys.contains("deviceTrack")) { bool deviceTrack = swgAFCActions->getDeviceTrack() != 0; + unknownAction = false; if (deviceTrack) { @@ -349,6 +361,7 @@ int AFC::webapiActionsPost( if (featureActionsKeys.contains("devicesApply")) { bool devicesApply = swgAFCActions->getDevicesApply() != 0; + unknownAction = false; if (devicesApply) { @@ -357,7 +370,15 @@ int AFC::webapiActionsPost( } } - return 202; + if (unknownAction) + { + errorMessage = "Unknown action"; + return 400; + } + else + { + return 202; + } } else { diff --git a/plugins/feature/gs232controller/gs232controller.cpp b/plugins/feature/gs232controller/gs232controller.cpp index 4afdf5f49..91d7789a7 100644 --- a/plugins/feature/gs232controller/gs232controller.cpp +++ b/plugins/feature/gs232controller/gs232controller.cpp @@ -390,6 +390,37 @@ int GS232Controller::webapiReportGet( return 200; } +int GS232Controller::webapiActionsPost( + const QStringList& featureActionsKeys, + SWGSDRangel::SWGFeatureActions& query, + QString& errorMessage) +{ + SWGSDRangel::SWGGS232ControllerActions *swgGS232ControllerActions = query.getGs232ControllerActions(); + + if (swgGS232ControllerActions) + { + if (featureActionsKeys.contains("run")) + { + bool featureRun = swgGS232ControllerActions->getRun() != 0; + + MsgStartStop *msg = MsgStartStop::create(featureRun); + getInputMessageQueue()->push(msg); + + return 202; + } + else + { + errorMessage = "Unknown action"; + return 400; + } + } + else + { + errorMessage = "Missing GS232ControllerActions in query"; + return 400; + } +} + void GS232Controller::webapiFormatFeatureSettings( SWGSDRangel::SWGFeatureSettings& response, const GS232ControllerSettings& settings) diff --git a/plugins/feature/gs232controller/gs232controller.h b/plugins/feature/gs232controller/gs232controller.h index eba2cd173..20c3f0cde 100644 --- a/plugins/feature/gs232controller/gs232controller.h +++ b/plugins/feature/gs232controller/gs232controller.h @@ -130,6 +130,11 @@ public: SWGSDRangel::SWGFeatureReport& response, QString& errorMessage); + virtual int webapiActionsPost( + const QStringList& featureActionsKeys, + SWGSDRangel::SWGFeatureActions& query, + QString& errorMessage); + static void webapiFormatFeatureSettings( SWGSDRangel::SWGFeatureSettings& response, const GS232ControllerSettings& settings); diff --git a/plugins/feature/map/map.cpp b/plugins/feature/map/map.cpp index 2cf0b1a07..10b179a1c 100644 --- a/plugins/feature/map/map.cpp +++ b/plugins/feature/map/map.cpp @@ -217,11 +217,17 @@ int Map::webapiActionsPost( { QString id = *swgMapActions->getFind(); - if (getMessageQueueToGUI()) + if (getMessageQueueToGUI()) { getMessageQueueToGUI()->push(MsgFind::create(id)); - } + } - return 202; + return 202; + } + else + { + errorMessage = "Unknown action"; + return 400; + } } else { diff --git a/plugins/feature/pertester/pertester.cpp b/plugins/feature/pertester/pertester.cpp index e6e38fec7..400a7e1b0 100644 --- a/plugins/feature/pertester/pertester.cpp +++ b/plugins/feature/pertester/pertester.cpp @@ -486,10 +486,23 @@ int PERTester::webapiActionsPost( if (swgPERTesterActions) { + bool unknownAction = true; + + if (featureActionsKeys.contains("run")) + { + bool featureRun = swgPERTesterActions->getRun() != 0; + unknownAction = false; + MsgStartStop *msg = MsgStartStop::create(featureRun); + + getInputMessageQueue()->push(msg); + } + if (featureActionsKeys.contains("aos")) { SWGSDRangel::SWGPERTesterActions_aos* aos = swgPERTesterActions->getAos(); + unknownAction = false; QString *satelliteName = aos->getSatelliteName(); + if (satelliteName != nullptr) { if (m_settings.m_satellites.contains(*satelliteName)) @@ -512,8 +525,6 @@ int PERTester::webapiActionsPost( }); } } - - return 202; } else { @@ -521,11 +532,16 @@ int PERTester::webapiActionsPost( return 400; } } - else + + if (unknownAction) { errorMessage = "Unknown action"; return 400; } + else + { + return 202; + } } else { diff --git a/plugins/feature/rigctlserver/rigctlserver.cpp b/plugins/feature/rigctlserver/rigctlserver.cpp index 3214ebb24..d38b3cee5 100644 --- a/plugins/feature/rigctlserver/rigctlserver.cpp +++ b/plugins/feature/rigctlserver/rigctlserver.cpp @@ -257,6 +257,35 @@ int RigCtlServer::webapiSettingsPutPatch( return 200; } +int RigCtlServer::webapiActionsPost( + const QStringList& featureActionsKeys, + SWGSDRangel::SWGFeatureActions& query, + QString& errorMessage) +{ + SWGSDRangel::SWGRigCtlServerActions *swgRigCtlServerActions = query.getRigCtlServerActions(); + + if (swgRigCtlServerActions) + { + if (featureActionsKeys.contains("run")) + { + bool featureRun = swgRigCtlServerActions->getRun() != 0; + MsgStartStop *msg = MsgStartStop::create(featureRun); + getInputMessageQueue()->push(msg); + return 202; + } + else + { + errorMessage = "Unknown action"; + return 400; + } + } + else + { + errorMessage = "Missing RigCtlServerActions in query"; + return 400; + } +} + void RigCtlServer::webapiFormatFeatureSettings( SWGSDRangel::SWGFeatureSettings& response, const RigCtlServerSettings& settings) diff --git a/plugins/feature/rigctlserver/rigctlserver.h b/plugins/feature/rigctlserver/rigctlserver.h index 335846d3f..f802fb4b3 100644 --- a/plugins/feature/rigctlserver/rigctlserver.h +++ b/plugins/feature/rigctlserver/rigctlserver.h @@ -106,6 +106,11 @@ public: SWGSDRangel::SWGFeatureSettings& response, QString& errorMessage); + virtual int webapiActionsPost( + const QStringList& featureActionsKeys, + SWGSDRangel::SWGFeatureActions& query, + QString& errorMessage); + static void webapiFormatFeatureSettings( SWGSDRangel::SWGFeatureSettings& response, const RigCtlServerSettings& settings); diff --git a/plugins/feature/satellitetracker/satellitetracker.cpp b/plugins/feature/satellitetracker/satellitetracker.cpp index e5825eaf1..4a33b6fed 100644 --- a/plugins/feature/satellitetracker/satellitetracker.cpp +++ b/plugins/feature/satellitetracker/satellitetracker.cpp @@ -370,6 +370,35 @@ int SatelliteTracker::webapiSettingsPutPatch( return 200; } +int SatelliteTracker::webapiActionsPost( + const QStringList& featureActionsKeys, + SWGSDRangel::SWGFeatureActions& query, + QString& errorMessage) +{ + SWGSDRangel::SWGSatelliteTrackerActions *swgSatelliteTrackerActions = query.getSatelliteTrackerActions(); + + if (swgSatelliteTrackerActions) + { + if (featureActionsKeys.contains("run")) + { + bool featureRun = swgSatelliteTrackerActions->getRun() != 0; + MsgStartStop *msg = MsgStartStop::create(featureRun); + getInputMessageQueue()->push(msg); + return 202; + } + else + { + errorMessage = "Unknown action"; + return 400; + } + } + else + { + errorMessage = "Missing SWGSatelliteTrackerActions in query"; + return 400; + } +} + static QList *convertStringListToPtrs(QStringList listIn) { QList *listOut = new QList(); diff --git a/plugins/feature/satellitetracker/satellitetracker.h b/plugins/feature/satellitetracker/satellitetracker.h index b952fddfb..86bf4782d 100644 --- a/plugins/feature/satellitetracker/satellitetracker.h +++ b/plugins/feature/satellitetracker/satellitetracker.h @@ -144,6 +144,11 @@ public: SWGSDRangel::SWGFeatureSettings& response, QString& errorMessage); + virtual int webapiActionsPost( + const QStringList& featureActionsKeys, + SWGSDRangel::SWGFeatureActions& query, + QString& errorMessage); + static void webapiFormatFeatureSettings( SWGSDRangel::SWGFeatureSettings& response, const SatelliteTrackerSettings& settings); diff --git a/plugins/feature/simpleptt/simpleptt.cpp b/plugins/feature/simpleptt/simpleptt.cpp index 550648ff1..103433772 100644 --- a/plugins/feature/simpleptt/simpleptt.cpp +++ b/plugins/feature/simpleptt/simpleptt.cpp @@ -263,11 +263,22 @@ int SimplePTT::webapiActionsPost( if (swgSimplePTTActions) { + bool unknownAction = true; + + if (featureActionsKeys.contains("run")) + { + bool featureRun = swgSimplePTTActions->getRun() != 0; + unknownAction = false; + MsgStartStop *msg = MsgStartStop::create(featureRun); + getInputMessageQueue()->push(msg); + } + if (featureActionsKeys.contains("ptt")) { bool ptt = swgSimplePTTActions->getPtt() != 0; - + unknownAction = false; MsgPTT *msg = MsgPTT::create(ptt); + getInputMessageQueue()->push(msg); if (getMessageQueueToGUI()) @@ -277,7 +288,15 @@ int SimplePTT::webapiActionsPost( } } - return 202; + if (unknownAction) + { + errorMessage = "Unknown action"; + return 400; + } + else + { + return 202; + } } else { diff --git a/plugins/feature/startracker/startracker.cpp b/plugins/feature/startracker/startracker.cpp index 908d810c8..5e0fea49c 100644 --- a/plugins/feature/startracker/startracker.cpp +++ b/plugins/feature/startracker/startracker.cpp @@ -392,6 +392,35 @@ int StarTracker::webapiSettingsPutPatch( return 200; } +int StarTracker::webapiActionsPost( + const QStringList& featureActionsKeys, + SWGSDRangel::SWGFeatureActions& query, + QString& errorMessage) +{ + SWGSDRangel::SWGStarTrackerActions *swgSWGStarTrackerActions = query.getStarTrackerActions(); + + if (swgSWGStarTrackerActions) + { + if (featureActionsKeys.contains("run")) + { + bool featureRun = swgSWGStarTrackerActions->getRun() != 0; + MsgStartStop *msg = MsgStartStop::create(featureRun); + getInputMessageQueue()->push(msg); + return 202; + } + else + { + errorMessage = "Unknown action"; + return 400; + } + } + else + { + errorMessage = "Missing StarTrackerActions in query"; + return 400; + } +} + void StarTracker::webapiFormatFeatureSettings( SWGSDRangel::SWGFeatureSettings& response, const StarTrackerSettings& settings) diff --git a/plugins/feature/startracker/startracker.h b/plugins/feature/startracker/startracker.h index 7c3ae763e..82719e0df 100644 --- a/plugins/feature/startracker/startracker.h +++ b/plugins/feature/startracker/startracker.h @@ -128,6 +128,11 @@ public: SWGSDRangel::SWGFeatureSettings& response, QString& errorMessage) override; + virtual int webapiActionsPost( + const QStringList& featureActionsKeys, + SWGSDRangel::SWGFeatureActions& query, + QString& errorMessage); + static void webapiFormatFeatureSettings( SWGSDRangel::SWGFeatureSettings& response, const StarTrackerSettings& settings); diff --git a/plugins/feature/vorlocalizer/vorlocalizer.cpp b/plugins/feature/vorlocalizer/vorlocalizer.cpp index 6aec80ae6..9caa601d3 100644 --- a/plugins/feature/vorlocalizer/vorlocalizer.cpp +++ b/plugins/feature/vorlocalizer/vorlocalizer.cpp @@ -449,6 +449,35 @@ int VORLocalizer::webapiSettingsPutPatch( return 200; } +int VORLocalizer::webapiActionsPost( + const QStringList& featureActionsKeys, + SWGSDRangel::SWGFeatureActions& query, + QString& errorMessage) +{ + SWGSDRangel::SWGVORLocalizerActions *swgVORLocalizerActions = query.getVorLocalizerActions(); + + if (swgVORLocalizerActions) + { + if (featureActionsKeys.contains("run")) + { + bool featureRun = swgVORLocalizerActions->getRun() != 0; + MsgStartStop *msg = MsgStartStop::create(featureRun); + getInputMessageQueue()->push(msg); + return 202; + } + else + { + errorMessage = "Unknown action"; + return 400; + } + } + else + { + errorMessage = "Missing VORLocalizerActions in query"; + return 400; + } +} + void VORLocalizer::webapiFormatFeatureSettings( SWGSDRangel::SWGFeatureSettings& response, const VORLocalizerSettings& settings) diff --git a/plugins/feature/vorlocalizer/vorlocalizer.h b/plugins/feature/vorlocalizer/vorlocalizer.h index dc3381684..47072ad55 100644 --- a/plugins/feature/vorlocalizer/vorlocalizer.h +++ b/plugins/feature/vorlocalizer/vorlocalizer.h @@ -158,6 +158,11 @@ public: SWGSDRangel::SWGFeatureSettings& response, QString& errorMessage); + virtual int webapiActionsPost( + const QStringList& featureActionsKeys, + SWGSDRangel::SWGFeatureActions& query, + QString& errorMessage); + static void webapiFormatFeatureSettings( SWGSDRangel::SWGFeatureSettings& response, const VORLocalizerSettings& settings); diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 8f1b80c20..e973c98ff 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -779,6 +779,10 @@ margin-bottom: 20px; }; defs.AFCActions = { "properties" : { + "run" : { + "type" : "integer", + "description" : "Set the plugin running state\n * 0 - idle\n * 1 - run\n" + }, "deviceTrack" : { "type" : "integer", "description" : "(Re)initialize tracker target frequency adjustment\n * 0 - release\n * 1 - engage\n" @@ -4807,14 +4811,29 @@ margin-bottom: 20px; "AFCActions" : { "$ref" : "#/definitions/AFCActions" }, + "GS232ControllerActions" : { + "$ref" : "#/definitions/GS232ControllerActions" + }, "MapActions" : { "$ref" : "#/definitions/MapActions" }, "PERTesterActions" : { "$ref" : "#/definitions/PERTesterActions" }, + "RigCtlServerActions" : { + "$ref" : "#/definitions/RigCtlServerActions" + }, + "SatelliteTrackerActions" : { + "$ref" : "#/definitions/SatelliteTrackerActions" + }, "SimplePTTActions" : { "$ref" : "#/definitions/SimplePTTActions" + }, + "StarTrackerActions" : { + "$ref" : "#/definitions/StarTrackerActions" + }, + "VORLocalizerActions" : { + "$ref" : "#/definitions/VORLocalizerActions" } }, "description" : "Base feature actions. Only the feature actions corresponding to the feature specified in the featureType field is or should be present." @@ -5793,6 +5812,15 @@ margin-bottom: 20px; } }, "description" : "GLSpectrumGUI settings" +}; + defs.GS232ControllerActions = { + "properties" : { + "run" : { + "type" : "integer", + "description" : "Set the plugin running state\n * 0 - idle\n * 1 - run\n" + } + }, + "description" : "GS-232 Controller actions" }; defs.GS232ControllerReport = { "properties" : { @@ -7880,6 +7908,10 @@ margin-bottom: 20px; }; defs.PERTesterActions = { "properties" : { + "run" : { + "type" : "integer", + "description" : "Set the plugin running state\n * 0 - idle\n * 1 - run\n" + }, "aos" : { "$ref" : "#/definitions/PERTesterActions_aos" } @@ -9572,6 +9604,15 @@ margin-bottom: 20px; } }, "description" : "Remote channel source settings" +}; + defs.RigCtlServerActions = { + "properties" : { + "run" : { + "type" : "integer", + "description" : "Set the plugin running state\n * 0 - idle\n * 1 - run\n" + } + }, + "description" : "RigCtl server actions" }; defs.RigCtlServerSettings = { "properties" : { @@ -10239,6 +10280,15 @@ margin-bottom: 20px; } }, "description" : "List of device set settings for a satellite" +}; + defs.SatelliteTrackerActions = { + "properties" : { + "run" : { + "type" : "integer", + "description" : "Set the plugin running state\n * 0 - idle\n * 1 - run\n" + } + }, + "description" : "Satellite Tracker actions" }; defs.SatelliteTrackerSettings = { "properties" : { @@ -10635,6 +10685,10 @@ margin-bottom: 20px; }; defs.SimplePTTActions = { "properties" : { + "run" : { + "type" : "integer", + "description" : "Set the plugin running state\n * 0 - idle\n * 1 - run\n" + }, "ptt" : { "type" : "integer", "description" : "PTT action\n * 0 - release\n * 1 - engage\n" @@ -11021,6 +11075,15 @@ margin-bottom: 20px; "type" : "integer" } } +}; + defs.StarTrackerActions = { + "properties" : { + "run" : { + "type" : "integer", + "description" : "Set the plugin running state\n * 0 - idle\n * 1 - run\n" + } + }, + "description" : "Star Tracker actions" }; defs.StarTrackerDisplayLoSSettings = { "properties" : { @@ -12311,6 +12374,15 @@ margin-bottom: 20px; } }, "description" : "VORDemod" +}; + defs.VORLocalizerActions = { + "properties" : { + "run" : { + "type" : "integer", + "description" : "Set the plugin running state\n * 0 - idle\n * 1 - run\n" + } + }, + "description" : "VORLocalizer" }; defs.VORLocalizerSettings = { "properties" : { @@ -51018,7 +51090,7 @@ except ApiException as e:
- Generated 2021-10-19T22:10:34.002+02:00 + Generated 2021-10-22T01:02:48.375+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/AFC.yaml b/sdrbase/resources/webapi/doc/swagger/include/AFC.yaml index 32c9fc356..68d3fd0c8 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/AFC.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/AFC.yaml @@ -62,6 +62,12 @@ AFCReport: AFCActions: description: "AFC actions" properties: + run: + type: integer + description: > + Set the plugin running state + * 0 - idle + * 1 - run deviceTrack: type: integer description: > diff --git a/sdrbase/resources/webapi/doc/swagger/include/FeatureActions.yaml b/sdrbase/resources/webapi/doc/swagger/include/FeatureActions.yaml index e48f153d4..f1ee424cd 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/FeatureActions.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/FeatureActions.yaml @@ -15,9 +15,19 @@ FeatureActions: type: integer AFCActions: $ref: "/doc/swagger/include/AFC.yaml#/AFCActions" + GS232ControllerActions: + $ref: "/doc/swagger/include/GS232Controller.yaml#/GS232ControllerActions" MapActions: $ref: "/doc/swagger/include/Map.yaml#/MapActions" PERTesterActions: $ref: "/doc/swagger/include/PERTester.yaml#/PERTesterActions" + RigCtlServerActions: + $ref: "/doc/swagger/include/RigCtlServer.yaml#/RigCtlServerActions" + SatelliteTrackerActions: + $ref: "/doc/swagger/include/SatelliteTracker.yaml#/SatelliteTrackerActions" SimplePTTActions: $ref: "/doc/swagger/include/SimplePTT.yaml#/SimplePTTActions" + StarTrackerActions: + $ref: "/doc/swagger/include/StarTracker.yaml#/StarTrackerActions" + VORLocalizerActions: + $ref: "/doc/swagger/include/VORLocalizer.yaml#/VORLocalizerActions" diff --git a/sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml b/sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml index 36b4659a8..10282371d 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml @@ -94,3 +94,13 @@ GS232ControllerReport: onTarget: description: "Indicates whether the rotator is pointing at the current target within the set tolerance" type: integer + +GS232ControllerActions: + description: "GS-232 Controller actions" + properties: + run: + type: integer + description: > + Set the plugin running state + * 0 - idle + * 1 - run diff --git a/sdrbase/resources/webapi/doc/swagger/include/PERTester.yaml b/sdrbase/resources/webapi/doc/swagger/include/PERTester.yaml index 17daecba7..f384f7c51 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/PERTester.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/PERTester.yaml @@ -52,6 +52,12 @@ PERTesterSettings: PERTesterActions: description: PERTester properties: + run: + type: integer + description: > + Set the plugin running state + * 0 - idle + * 1 - run aos: description: "Acquisition of signal" type: object diff --git a/sdrbase/resources/webapi/doc/swagger/include/RigCtlServer.yaml b/sdrbase/resources/webapi/doc/swagger/include/RigCtlServer.yaml index 4bee4eab0..ba531829b 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/RigCtlServer.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/RigCtlServer.yaml @@ -33,3 +33,13 @@ RigCtlServerSettings: type: integer reverseAPIFeatureIndex: type: integer + +RigCtlServerActions: + description: RigCtl server actions + properties: + run: + type: integer + description: > + Set the plugin running state + * 0 - idle + * 1 - run diff --git a/sdrbase/resources/webapi/doc/swagger/include/SatelliteTracker.yaml b/sdrbase/resources/webapi/doc/swagger/include/SatelliteTracker.yaml index ffcb4951a..f611ca5a3 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SatelliteTracker.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SatelliteTracker.yaml @@ -165,3 +165,13 @@ SatelliteDeviceSettings: losCommand: description: "Command to execute on LOS" type: string + +SatelliteTrackerActions: + description: "Satellite Tracker actions" + properties: + run: + type: integer + description: > + Set the plugin running state + * 0 - idle + * 1 - run diff --git a/sdrbase/resources/webapi/doc/swagger/include/SimplePTT.yaml b/sdrbase/resources/webapi/doc/swagger/include/SimplePTT.yaml index 8396ca861..3cecb876d 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SimplePTT.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SimplePTT.yaml @@ -42,6 +42,12 @@ SimplePTTReport: SimplePTTActions: description: "Simple PTT actions" properties: + run: + type: integer + description: > + Set the plugin running state + * 0 - idle + * 1 - run ptt: type: integer description: > diff --git a/sdrbase/resources/webapi/doc/swagger/include/StarTracker.yaml b/sdrbase/resources/webapi/doc/swagger/include/StarTracker.yaml index 1646aa65d..f7876bfa7 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/StarTracker.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/StarTracker.yaml @@ -201,3 +201,13 @@ StarTrackerDisplayLoSSettings: descrption: "Distance to object from Sun in kpc" type: number format: float + +StarTrackerActions: + description: "Star Tracker actions" + properties: + run: + type: integer + description: > + Set the plugin running state + * 0 - idle + * 1 - run diff --git a/sdrbase/resources/webapi/doc/swagger/include/VORLocalizer.yaml b/sdrbase/resources/webapi/doc/swagger/include/VORLocalizer.yaml index e8cd2bc93..b4dcaef85 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/VORLocalizer.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/VORLocalizer.yaml @@ -31,3 +31,13 @@ VORLocalizerSettings: centerShift: description: Shift of center frequency in Hz type: integer + +VORLocalizerActions: + description: VORLocalizer + properties: + run: + type: integer + description: > + Set the plugin running state + * 0 - idle + * 1 - run diff --git a/sdrbase/webapi/webapirequestmapper.cpp b/sdrbase/webapi/webapirequestmapper.cpp index 493510878..47439fdcf 100644 --- a/sdrbase/webapi/webapirequestmapper.cpp +++ b/sdrbase/webapi/webapirequestmapper.cpp @@ -4873,17 +4873,53 @@ bool WebAPIRequestMapper::getFeatureActions( { QJsonObject actionsJsonObject = featureActionsJson[featureActionsKey].toObject(); featureActionsKeys = actionsJsonObject.keys(); + qDebug("WebAPIRequestMapper::getFeatureActions: %s", qPrintable(featureActionsKey)); - if (featureActionsKey == "MapActions") + if (featureActionsKey == "AFCActions") + { + featureActions->setAfcActions(new SWGSDRangel::SWGAFCActions()); + featureActions->getAfcActions()->fromJsonObject(actionsJsonObject); + } + else if (featureActionsKey == "GS232ControllerActions") + { + featureActions->setGs232ControllerActions(new SWGSDRangel::SWGGS232ControllerActions()); + featureActions->getGs232ControllerActions()->fromJsonObject(actionsJsonObject); + } + else if (featureActionsKey == "MapActions") { featureActions->setMapActions(new SWGSDRangel::SWGMapActions()); featureActions->getMapActions()->fromJsonObject(actionsJsonObject); } + else if (featureActionsKey == "PERTesterActions") + { + featureActions->setPerTesterActions(new SWGSDRangel::SWGPERTesterActions()); + featureActions->getPerTesterActions()->fromJsonObject(actionsJsonObject); + } + else if (featureActionsKey == "RigCtlServerActions") + { + featureActions->setRigCtlServerActions(new SWGSDRangel::SWGRigCtlServerActions()); + featureActions->getRigCtlServerActions()->fromJsonObject(actionsJsonObject); + } + else if (featureActionsKey == "SatelliteTrackerActions") + { + featureActions->setSatelliteTrackerActions(new SWGSDRangel::SWGSatelliteTrackerActions()); + featureActions->getSatelliteTrackerActions()->fromJsonObject(actionsJsonObject); + } else if (featureActionsKey == "SimplePTTActions") { featureActions->setSimplePttActions(new SWGSDRangel::SWGSimplePTTActions()); featureActions->getSimplePttActions()->fromJsonObject(actionsJsonObject); } + else if (featureActionsKey == "StarTrackerActions") + { + featureActions->setStarTrackerActions(new SWGSDRangel::SWGStarTrackerActions()); + featureActions->getStarTrackerActions()->fromJsonObject(actionsJsonObject); + } + else if (featureActionsKey == "VORLocalizerActions") + { + featureActions->setVorLocalizerActions(new SWGSDRangel::SWGVORLocalizerActions()); + featureActions->getVorLocalizerActions()->fromJsonObject(actionsJsonObject); + } else { return false; diff --git a/sdrbase/webapi/webapiutils.cpp b/sdrbase/webapi/webapiutils.cpp index f05f84e8b..323d03c37 100644 --- a/sdrbase/webapi/webapiutils.cpp +++ b/sdrbase/webapi/webapiutils.cpp @@ -277,8 +277,15 @@ const QMap WebAPIUtils::m_featureTypeToSettingsKey = { }; const QMap WebAPIUtils::m_featureTypeToActionsKey = { + {"AFC", "AFCActions"}, + {"GS232Controller", "GS232ControllerActions"}, {"Map", "MapActions"}, - {"SimplePTT", "SimplePTTActions"} + {"PERTester", "PERTesterActions"}, + {"RigCtlServer", "RigCtlServerActions"}, + {"SatelliteTracker", "SatelliteTrackerActions"}, + {"SimplePTT", "SimplePTTActions"}, + {"StarTracker", "StarTrackerActions"}, + {"VORLocalizer", "VORLocalizerActions"} }; const QMap WebAPIUtils::m_featureURIToSettingsKey = { diff --git a/swagger/sdrangel/api/swagger/include/AFC.yaml b/swagger/sdrangel/api/swagger/include/AFC.yaml index 32c9fc356..68d3fd0c8 100644 --- a/swagger/sdrangel/api/swagger/include/AFC.yaml +++ b/swagger/sdrangel/api/swagger/include/AFC.yaml @@ -62,6 +62,12 @@ AFCReport: AFCActions: description: "AFC actions" properties: + run: + type: integer + description: > + Set the plugin running state + * 0 - idle + * 1 - run deviceTrack: type: integer description: > diff --git a/swagger/sdrangel/api/swagger/include/FeatureActions.yaml b/swagger/sdrangel/api/swagger/include/FeatureActions.yaml index 32a5fc094..153399011 100644 --- a/swagger/sdrangel/api/swagger/include/FeatureActions.yaml +++ b/swagger/sdrangel/api/swagger/include/FeatureActions.yaml @@ -15,9 +15,19 @@ FeatureActions: type: integer AFCActions: $ref: "http://swgserver:8081/api/swagger/include/AFC.yaml#/AFCActions" + GS232ControllerActions: + $ref: "http://swgserver:8081/api/swagger/include/GS232Controller.yaml#/GS232ControllerActions" MapActions: $ref: "http://swgserver:8081/api/swagger/include/Map.yaml#/MapActions" PERTesterActions: $ref: "http://swgserver:8081/api/swagger/include/PERTester.yaml#/PERTesterActions" + RigCtlServerActions: + $ref: "http://swgserver:8081/api/swagger/include/RigCtlServer.yaml#/RigCtlServerActions" + SatelliteTrackerActions: + $ref: "http://swgserver:8081/api/swagger/include/SatelliteTracker.yaml#/SatelliteTrackerActions" SimplePTTActions: $ref: "http://swgserver:8081/api/swagger/include/SimplePTT.yaml#/SimplePTTActions" + StarTrackerActions: + $ref: "http://swgserver:8081/api/swagger/include/StarTracker.yaml#/StarTrackerActions" + VORLocalizerActions: + $ref: "http://swgserver:8081/api/swagger/include/VORLocalizer.yaml#/VORLocalizerActions" diff --git a/swagger/sdrangel/api/swagger/include/GS232Controller.yaml b/swagger/sdrangel/api/swagger/include/GS232Controller.yaml index 36b4659a8..10282371d 100644 --- a/swagger/sdrangel/api/swagger/include/GS232Controller.yaml +++ b/swagger/sdrangel/api/swagger/include/GS232Controller.yaml @@ -94,3 +94,13 @@ GS232ControllerReport: onTarget: description: "Indicates whether the rotator is pointing at the current target within the set tolerance" type: integer + +GS232ControllerActions: + description: "GS-232 Controller actions" + properties: + run: + type: integer + description: > + Set the plugin running state + * 0 - idle + * 1 - run diff --git a/swagger/sdrangel/api/swagger/include/PERTester.yaml b/swagger/sdrangel/api/swagger/include/PERTester.yaml index 17daecba7..f384f7c51 100644 --- a/swagger/sdrangel/api/swagger/include/PERTester.yaml +++ b/swagger/sdrangel/api/swagger/include/PERTester.yaml @@ -52,6 +52,12 @@ PERTesterSettings: PERTesterActions: description: PERTester properties: + run: + type: integer + description: > + Set the plugin running state + * 0 - idle + * 1 - run aos: description: "Acquisition of signal" type: object diff --git a/swagger/sdrangel/api/swagger/include/RigCtlServer.yaml b/swagger/sdrangel/api/swagger/include/RigCtlServer.yaml index 4bee4eab0..ba531829b 100644 --- a/swagger/sdrangel/api/swagger/include/RigCtlServer.yaml +++ b/swagger/sdrangel/api/swagger/include/RigCtlServer.yaml @@ -33,3 +33,13 @@ RigCtlServerSettings: type: integer reverseAPIFeatureIndex: type: integer + +RigCtlServerActions: + description: RigCtl server actions + properties: + run: + type: integer + description: > + Set the plugin running state + * 0 - idle + * 1 - run diff --git a/swagger/sdrangel/api/swagger/include/SatelliteTracker.yaml b/swagger/sdrangel/api/swagger/include/SatelliteTracker.yaml index 5b6a20376..9ec7f2d53 100644 --- a/swagger/sdrangel/api/swagger/include/SatelliteTracker.yaml +++ b/swagger/sdrangel/api/swagger/include/SatelliteTracker.yaml @@ -165,3 +165,13 @@ SatelliteDeviceSettings: losCommand: description: "Command to execute on LOS" type: string + +SatelliteTrackerActions: + description: "Satellite Tracker actions" + properties: + run: + type: integer + description: > + Set the plugin running state + * 0 - idle + * 1 - run diff --git a/swagger/sdrangel/api/swagger/include/SimplePTT.yaml b/swagger/sdrangel/api/swagger/include/SimplePTT.yaml index 8396ca861..3cecb876d 100644 --- a/swagger/sdrangel/api/swagger/include/SimplePTT.yaml +++ b/swagger/sdrangel/api/swagger/include/SimplePTT.yaml @@ -42,6 +42,12 @@ SimplePTTReport: SimplePTTActions: description: "Simple PTT actions" properties: + run: + type: integer + description: > + Set the plugin running state + * 0 - idle + * 1 - run ptt: type: integer description: > diff --git a/swagger/sdrangel/api/swagger/include/StarTracker.yaml b/swagger/sdrangel/api/swagger/include/StarTracker.yaml index 1646aa65d..f7876bfa7 100644 --- a/swagger/sdrangel/api/swagger/include/StarTracker.yaml +++ b/swagger/sdrangel/api/swagger/include/StarTracker.yaml @@ -201,3 +201,13 @@ StarTrackerDisplayLoSSettings: descrption: "Distance to object from Sun in kpc" type: number format: float + +StarTrackerActions: + description: "Star Tracker actions" + properties: + run: + type: integer + description: > + Set the plugin running state + * 0 - idle + * 1 - run diff --git a/swagger/sdrangel/api/swagger/include/VORLocalizer.yaml b/swagger/sdrangel/api/swagger/include/VORLocalizer.yaml index e8cd2bc93..b4dcaef85 100644 --- a/swagger/sdrangel/api/swagger/include/VORLocalizer.yaml +++ b/swagger/sdrangel/api/swagger/include/VORLocalizer.yaml @@ -31,3 +31,13 @@ VORLocalizerSettings: centerShift: description: Shift of center frequency in Hz type: integer + +VORLocalizerActions: + description: VORLocalizer + properties: + run: + type: integer + description: > + Set the plugin running state + * 0 - idle + * 1 - run diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 8f1b80c20..e973c98ff 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -779,6 +779,10 @@ margin-bottom: 20px; }; defs.AFCActions = { "properties" : { + "run" : { + "type" : "integer", + "description" : "Set the plugin running state\n * 0 - idle\n * 1 - run\n" + }, "deviceTrack" : { "type" : "integer", "description" : "(Re)initialize tracker target frequency adjustment\n * 0 - release\n * 1 - engage\n" @@ -4807,14 +4811,29 @@ margin-bottom: 20px; "AFCActions" : { "$ref" : "#/definitions/AFCActions" }, + "GS232ControllerActions" : { + "$ref" : "#/definitions/GS232ControllerActions" + }, "MapActions" : { "$ref" : "#/definitions/MapActions" }, "PERTesterActions" : { "$ref" : "#/definitions/PERTesterActions" }, + "RigCtlServerActions" : { + "$ref" : "#/definitions/RigCtlServerActions" + }, + "SatelliteTrackerActions" : { + "$ref" : "#/definitions/SatelliteTrackerActions" + }, "SimplePTTActions" : { "$ref" : "#/definitions/SimplePTTActions" + }, + "StarTrackerActions" : { + "$ref" : "#/definitions/StarTrackerActions" + }, + "VORLocalizerActions" : { + "$ref" : "#/definitions/VORLocalizerActions" } }, "description" : "Base feature actions. Only the feature actions corresponding to the feature specified in the featureType field is or should be present." @@ -5793,6 +5812,15 @@ margin-bottom: 20px; } }, "description" : "GLSpectrumGUI settings" +}; + defs.GS232ControllerActions = { + "properties" : { + "run" : { + "type" : "integer", + "description" : "Set the plugin running state\n * 0 - idle\n * 1 - run\n" + } + }, + "description" : "GS-232 Controller actions" }; defs.GS232ControllerReport = { "properties" : { @@ -7880,6 +7908,10 @@ margin-bottom: 20px; }; defs.PERTesterActions = { "properties" : { + "run" : { + "type" : "integer", + "description" : "Set the plugin running state\n * 0 - idle\n * 1 - run\n" + }, "aos" : { "$ref" : "#/definitions/PERTesterActions_aos" } @@ -9572,6 +9604,15 @@ margin-bottom: 20px; } }, "description" : "Remote channel source settings" +}; + defs.RigCtlServerActions = { + "properties" : { + "run" : { + "type" : "integer", + "description" : "Set the plugin running state\n * 0 - idle\n * 1 - run\n" + } + }, + "description" : "RigCtl server actions" }; defs.RigCtlServerSettings = { "properties" : { @@ -10239,6 +10280,15 @@ margin-bottom: 20px; } }, "description" : "List of device set settings for a satellite" +}; + defs.SatelliteTrackerActions = { + "properties" : { + "run" : { + "type" : "integer", + "description" : "Set the plugin running state\n * 0 - idle\n * 1 - run\n" + } + }, + "description" : "Satellite Tracker actions" }; defs.SatelliteTrackerSettings = { "properties" : { @@ -10635,6 +10685,10 @@ margin-bottom: 20px; }; defs.SimplePTTActions = { "properties" : { + "run" : { + "type" : "integer", + "description" : "Set the plugin running state\n * 0 - idle\n * 1 - run\n" + }, "ptt" : { "type" : "integer", "description" : "PTT action\n * 0 - release\n * 1 - engage\n" @@ -11021,6 +11075,15 @@ margin-bottom: 20px; "type" : "integer" } } +}; + defs.StarTrackerActions = { + "properties" : { + "run" : { + "type" : "integer", + "description" : "Set the plugin running state\n * 0 - idle\n * 1 - run\n" + } + }, + "description" : "Star Tracker actions" }; defs.StarTrackerDisplayLoSSettings = { "properties" : { @@ -12311,6 +12374,15 @@ margin-bottom: 20px; } }, "description" : "VORDemod" +}; + defs.VORLocalizerActions = { + "properties" : { + "run" : { + "type" : "integer", + "description" : "Set the plugin running state\n * 0 - idle\n * 1 - run\n" + } + }, + "description" : "VORLocalizer" }; defs.VORLocalizerSettings = { "properties" : { @@ -51018,7 +51090,7 @@ except ApiException as e:
- Generated 2021-10-19T22:10:34.002+02:00 + Generated 2021-10-22T01:02:48.375+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGAFCActions.cpp b/swagger/sdrangel/code/qt5/client/SWGAFCActions.cpp index 3aacf35c7..c553ae4d6 100644 --- a/swagger/sdrangel/code/qt5/client/SWGAFCActions.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGAFCActions.cpp @@ -28,6 +28,8 @@ SWGAFCActions::SWGAFCActions(QString* json) { } SWGAFCActions::SWGAFCActions() { + run = 0; + m_run_isSet = false; device_track = 0; m_device_track_isSet = false; devices_apply = 0; @@ -40,6 +42,8 @@ SWGAFCActions::~SWGAFCActions() { void SWGAFCActions::init() { + run = 0; + m_run_isSet = false; device_track = 0; m_device_track_isSet = false; devices_apply = 0; @@ -50,6 +54,7 @@ void SWGAFCActions::cleanup() { + } SWGAFCActions* @@ -63,6 +68,8 @@ SWGAFCActions::fromJson(QString &json) { void SWGAFCActions::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&run, pJson["run"], "qint32", ""); + ::SWGSDRangel::setValue(&device_track, pJson["deviceTrack"], "qint32", ""); ::SWGSDRangel::setValue(&devices_apply, pJson["devicesApply"], "qint32", ""); @@ -83,6 +90,9 @@ SWGAFCActions::asJson () QJsonObject* SWGAFCActions::asJsonObject() { QJsonObject* obj = new QJsonObject(); + if(m_run_isSet){ + obj->insert("run", QJsonValue(run)); + } if(m_device_track_isSet){ obj->insert("deviceTrack", QJsonValue(device_track)); } @@ -93,6 +103,16 @@ SWGAFCActions::asJsonObject() { return obj; } +qint32 +SWGAFCActions::getRun() { + return run; +} +void +SWGAFCActions::setRun(qint32 run) { + this->run = run; + this->m_run_isSet = true; +} + qint32 SWGAFCActions::getDeviceTrack() { return device_track; @@ -118,6 +138,9 @@ bool SWGAFCActions::isSet(){ bool isObjectUpdated = false; do{ + if(m_run_isSet){ + isObjectUpdated = true; break; + } if(m_device_track_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGAFCActions.h b/swagger/sdrangel/code/qt5/client/SWGAFCActions.h index 7aaa17e7d..348ef5b5d 100644 --- a/swagger/sdrangel/code/qt5/client/SWGAFCActions.h +++ b/swagger/sdrangel/code/qt5/client/SWGAFCActions.h @@ -41,6 +41,9 @@ public: virtual void fromJsonObject(QJsonObject &json) override; virtual SWGAFCActions* fromJson(QString &jsonString) override; + qint32 getRun(); + void setRun(qint32 run); + qint32 getDeviceTrack(); void setDeviceTrack(qint32 device_track); @@ -51,6 +54,9 @@ public: virtual bool isSet() override; private: + qint32 run; + bool m_run_isSet; + qint32 device_track; bool m_device_track_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGFeatureActions.cpp b/swagger/sdrangel/code/qt5/client/SWGFeatureActions.cpp index d61db2da1..b4466a52b 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFeatureActions.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGFeatureActions.cpp @@ -36,12 +36,22 @@ SWGFeatureActions::SWGFeatureActions() { m_originator_feature_index_isSet = false; afc_actions = nullptr; m_afc_actions_isSet = false; + gs232_controller_actions = nullptr; + m_gs232_controller_actions_isSet = false; map_actions = nullptr; m_map_actions_isSet = false; per_tester_actions = nullptr; m_per_tester_actions_isSet = false; + rig_ctl_server_actions = nullptr; + m_rig_ctl_server_actions_isSet = false; + satellite_tracker_actions = nullptr; + m_satellite_tracker_actions_isSet = false; simple_ptt_actions = nullptr; m_simple_ptt_actions_isSet = false; + star_tracker_actions = nullptr; + m_star_tracker_actions_isSet = false; + vor_localizer_actions = nullptr; + m_vor_localizer_actions_isSet = false; } SWGFeatureActions::~SWGFeatureActions() { @@ -58,12 +68,22 @@ SWGFeatureActions::init() { m_originator_feature_index_isSet = false; afc_actions = new SWGAFCActions(); m_afc_actions_isSet = false; + gs232_controller_actions = new SWGGS232ControllerActions(); + m_gs232_controller_actions_isSet = false; map_actions = new SWGMapActions(); m_map_actions_isSet = false; per_tester_actions = new SWGPERTesterActions(); m_per_tester_actions_isSet = false; + rig_ctl_server_actions = new SWGRigCtlServerActions(); + m_rig_ctl_server_actions_isSet = false; + satellite_tracker_actions = new SWGSatelliteTrackerActions(); + m_satellite_tracker_actions_isSet = false; simple_ptt_actions = new SWGSimplePTTActions(); m_simple_ptt_actions_isSet = false; + star_tracker_actions = new SWGStarTrackerActions(); + m_star_tracker_actions_isSet = false; + vor_localizer_actions = new SWGVORLocalizerActions(); + m_vor_localizer_actions_isSet = false; } void @@ -76,15 +96,30 @@ SWGFeatureActions::cleanup() { if(afc_actions != nullptr) { delete afc_actions; } + if(gs232_controller_actions != nullptr) { + delete gs232_controller_actions; + } if(map_actions != nullptr) { delete map_actions; } if(per_tester_actions != nullptr) { delete per_tester_actions; } + if(rig_ctl_server_actions != nullptr) { + delete rig_ctl_server_actions; + } + if(satellite_tracker_actions != nullptr) { + delete satellite_tracker_actions; + } if(simple_ptt_actions != nullptr) { delete simple_ptt_actions; } + if(star_tracker_actions != nullptr) { + delete star_tracker_actions; + } + if(vor_localizer_actions != nullptr) { + delete vor_localizer_actions; + } } SWGFeatureActions* @@ -106,12 +141,22 @@ SWGFeatureActions::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&afc_actions, pJson["AFCActions"], "SWGAFCActions", "SWGAFCActions"); + ::SWGSDRangel::setValue(&gs232_controller_actions, pJson["GS232ControllerActions"], "SWGGS232ControllerActions", "SWGGS232ControllerActions"); + ::SWGSDRangel::setValue(&map_actions, pJson["MapActions"], "SWGMapActions", "SWGMapActions"); ::SWGSDRangel::setValue(&per_tester_actions, pJson["PERTesterActions"], "SWGPERTesterActions", "SWGPERTesterActions"); + ::SWGSDRangel::setValue(&rig_ctl_server_actions, pJson["RigCtlServerActions"], "SWGRigCtlServerActions", "SWGRigCtlServerActions"); + + ::SWGSDRangel::setValue(&satellite_tracker_actions, pJson["SatelliteTrackerActions"], "SWGSatelliteTrackerActions", "SWGSatelliteTrackerActions"); + ::SWGSDRangel::setValue(&simple_ptt_actions, pJson["SimplePTTActions"], "SWGSimplePTTActions", "SWGSimplePTTActions"); + ::SWGSDRangel::setValue(&star_tracker_actions, pJson["StarTrackerActions"], "SWGStarTrackerActions", "SWGStarTrackerActions"); + + ::SWGSDRangel::setValue(&vor_localizer_actions, pJson["VORLocalizerActions"], "SWGVORLocalizerActions", "SWGVORLocalizerActions"); + } QString @@ -140,15 +185,30 @@ SWGFeatureActions::asJsonObject() { if((afc_actions != nullptr) && (afc_actions->isSet())){ toJsonValue(QString("AFCActions"), afc_actions, obj, QString("SWGAFCActions")); } + if((gs232_controller_actions != nullptr) && (gs232_controller_actions->isSet())){ + toJsonValue(QString("GS232ControllerActions"), gs232_controller_actions, obj, QString("SWGGS232ControllerActions")); + } if((map_actions != nullptr) && (map_actions->isSet())){ toJsonValue(QString("MapActions"), map_actions, obj, QString("SWGMapActions")); } if((per_tester_actions != nullptr) && (per_tester_actions->isSet())){ toJsonValue(QString("PERTesterActions"), per_tester_actions, obj, QString("SWGPERTesterActions")); } + if((rig_ctl_server_actions != nullptr) && (rig_ctl_server_actions->isSet())){ + toJsonValue(QString("RigCtlServerActions"), rig_ctl_server_actions, obj, QString("SWGRigCtlServerActions")); + } + if((satellite_tracker_actions != nullptr) && (satellite_tracker_actions->isSet())){ + toJsonValue(QString("SatelliteTrackerActions"), satellite_tracker_actions, obj, QString("SWGSatelliteTrackerActions")); + } if((simple_ptt_actions != nullptr) && (simple_ptt_actions->isSet())){ toJsonValue(QString("SimplePTTActions"), simple_ptt_actions, obj, QString("SWGSimplePTTActions")); } + if((star_tracker_actions != nullptr) && (star_tracker_actions->isSet())){ + toJsonValue(QString("StarTrackerActions"), star_tracker_actions, obj, QString("SWGStarTrackerActions")); + } + if((vor_localizer_actions != nullptr) && (vor_localizer_actions->isSet())){ + toJsonValue(QString("VORLocalizerActions"), vor_localizer_actions, obj, QString("SWGVORLocalizerActions")); + } return obj; } @@ -193,6 +253,16 @@ SWGFeatureActions::setAfcActions(SWGAFCActions* afc_actions) { this->m_afc_actions_isSet = true; } +SWGGS232ControllerActions* +SWGFeatureActions::getGs232ControllerActions() { + return gs232_controller_actions; +} +void +SWGFeatureActions::setGs232ControllerActions(SWGGS232ControllerActions* gs232_controller_actions) { + this->gs232_controller_actions = gs232_controller_actions; + this->m_gs232_controller_actions_isSet = true; +} + SWGMapActions* SWGFeatureActions::getMapActions() { return map_actions; @@ -213,6 +283,26 @@ SWGFeatureActions::setPerTesterActions(SWGPERTesterActions* per_tester_actions) this->m_per_tester_actions_isSet = true; } +SWGRigCtlServerActions* +SWGFeatureActions::getRigCtlServerActions() { + return rig_ctl_server_actions; +} +void +SWGFeatureActions::setRigCtlServerActions(SWGRigCtlServerActions* rig_ctl_server_actions) { + this->rig_ctl_server_actions = rig_ctl_server_actions; + this->m_rig_ctl_server_actions_isSet = true; +} + +SWGSatelliteTrackerActions* +SWGFeatureActions::getSatelliteTrackerActions() { + return satellite_tracker_actions; +} +void +SWGFeatureActions::setSatelliteTrackerActions(SWGSatelliteTrackerActions* satellite_tracker_actions) { + this->satellite_tracker_actions = satellite_tracker_actions; + this->m_satellite_tracker_actions_isSet = true; +} + SWGSimplePTTActions* SWGFeatureActions::getSimplePttActions() { return simple_ptt_actions; @@ -223,6 +313,26 @@ SWGFeatureActions::setSimplePttActions(SWGSimplePTTActions* simple_ptt_actions) this->m_simple_ptt_actions_isSet = true; } +SWGStarTrackerActions* +SWGFeatureActions::getStarTrackerActions() { + return star_tracker_actions; +} +void +SWGFeatureActions::setStarTrackerActions(SWGStarTrackerActions* star_tracker_actions) { + this->star_tracker_actions = star_tracker_actions; + this->m_star_tracker_actions_isSet = true; +} + +SWGVORLocalizerActions* +SWGFeatureActions::getVorLocalizerActions() { + return vor_localizer_actions; +} +void +SWGFeatureActions::setVorLocalizerActions(SWGVORLocalizerActions* vor_localizer_actions) { + this->vor_localizer_actions = vor_localizer_actions; + this->m_vor_localizer_actions_isSet = true; +} + bool SWGFeatureActions::isSet(){ @@ -240,15 +350,30 @@ SWGFeatureActions::isSet(){ if(afc_actions && afc_actions->isSet()){ isObjectUpdated = true; break; } + if(gs232_controller_actions && gs232_controller_actions->isSet()){ + isObjectUpdated = true; break; + } if(map_actions && map_actions->isSet()){ isObjectUpdated = true; break; } if(per_tester_actions && per_tester_actions->isSet()){ isObjectUpdated = true; break; } + if(rig_ctl_server_actions && rig_ctl_server_actions->isSet()){ + isObjectUpdated = true; break; + } + if(satellite_tracker_actions && satellite_tracker_actions->isSet()){ + isObjectUpdated = true; break; + } if(simple_ptt_actions && simple_ptt_actions->isSet()){ isObjectUpdated = true; break; } + if(star_tracker_actions && star_tracker_actions->isSet()){ + isObjectUpdated = true; break; + } + if(vor_localizer_actions && vor_localizer_actions->isSet()){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFeatureActions.h b/swagger/sdrangel/code/qt5/client/SWGFeatureActions.h index 9c047f7b9..70fb376c9 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFeatureActions.h +++ b/swagger/sdrangel/code/qt5/client/SWGFeatureActions.h @@ -23,9 +23,14 @@ #include "SWGAFCActions.h" +#include "SWGGS232ControllerActions.h" #include "SWGMapActions.h" #include "SWGPERTesterActions.h" +#include "SWGRigCtlServerActions.h" +#include "SWGSatelliteTrackerActions.h" #include "SWGSimplePTTActions.h" +#include "SWGStarTrackerActions.h" +#include "SWGVORLocalizerActions.h" #include #include "SWGObject.h" @@ -58,15 +63,30 @@ public: SWGAFCActions* getAfcActions(); void setAfcActions(SWGAFCActions* afc_actions); + SWGGS232ControllerActions* getGs232ControllerActions(); + void setGs232ControllerActions(SWGGS232ControllerActions* gs232_controller_actions); + SWGMapActions* getMapActions(); void setMapActions(SWGMapActions* map_actions); SWGPERTesterActions* getPerTesterActions(); void setPerTesterActions(SWGPERTesterActions* per_tester_actions); + SWGRigCtlServerActions* getRigCtlServerActions(); + void setRigCtlServerActions(SWGRigCtlServerActions* rig_ctl_server_actions); + + SWGSatelliteTrackerActions* getSatelliteTrackerActions(); + void setSatelliteTrackerActions(SWGSatelliteTrackerActions* satellite_tracker_actions); + SWGSimplePTTActions* getSimplePttActions(); void setSimplePttActions(SWGSimplePTTActions* simple_ptt_actions); + SWGStarTrackerActions* getStarTrackerActions(); + void setStarTrackerActions(SWGStarTrackerActions* star_tracker_actions); + + SWGVORLocalizerActions* getVorLocalizerActions(); + void setVorLocalizerActions(SWGVORLocalizerActions* vor_localizer_actions); + virtual bool isSet() override; @@ -83,15 +103,30 @@ private: SWGAFCActions* afc_actions; bool m_afc_actions_isSet; + SWGGS232ControllerActions* gs232_controller_actions; + bool m_gs232_controller_actions_isSet; + SWGMapActions* map_actions; bool m_map_actions_isSet; SWGPERTesterActions* per_tester_actions; bool m_per_tester_actions_isSet; + SWGRigCtlServerActions* rig_ctl_server_actions; + bool m_rig_ctl_server_actions_isSet; + + SWGSatelliteTrackerActions* satellite_tracker_actions; + bool m_satellite_tracker_actions_isSet; + SWGSimplePTTActions* simple_ptt_actions; bool m_simple_ptt_actions_isSet; + SWGStarTrackerActions* star_tracker_actions; + bool m_star_tracker_actions_isSet; + + SWGVORLocalizerActions* vor_localizer_actions; + bool m_vor_localizer_actions_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGGS232ControllerActions.cpp b/swagger/sdrangel/code/qt5/client/SWGGS232ControllerActions.cpp new file mode 100644 index 000000000..3b2c9ddb2 --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGGS232ControllerActions.cpp @@ -0,0 +1,108 @@ +/** + * SDRangel + * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- + * + * OpenAPI spec version: 6.0.0 + * Contact: f4exb06@gmail.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + +#include "SWGGS232ControllerActions.h" + +#include "SWGHelpers.h" + +#include +#include +#include +#include + +namespace SWGSDRangel { + +SWGGS232ControllerActions::SWGGS232ControllerActions(QString* json) { + init(); + this->fromJson(*json); +} + +SWGGS232ControllerActions::SWGGS232ControllerActions() { + run = 0; + m_run_isSet = false; +} + +SWGGS232ControllerActions::~SWGGS232ControllerActions() { + this->cleanup(); +} + +void +SWGGS232ControllerActions::init() { + run = 0; + m_run_isSet = false; +} + +void +SWGGS232ControllerActions::cleanup() { + +} + +SWGGS232ControllerActions* +SWGGS232ControllerActions::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; +} + +void +SWGGS232ControllerActions::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&run, pJson["run"], "qint32", ""); + +} + +QString +SWGGS232ControllerActions::asJson () +{ + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + delete obj; + return QString(bytes); +} + +QJsonObject* +SWGGS232ControllerActions::asJsonObject() { + QJsonObject* obj = new QJsonObject(); + if(m_run_isSet){ + obj->insert("run", QJsonValue(run)); + } + + return obj; +} + +qint32 +SWGGS232ControllerActions::getRun() { + return run; +} +void +SWGGS232ControllerActions::setRun(qint32 run) { + this->run = run; + this->m_run_isSet = true; +} + + +bool +SWGGS232ControllerActions::isSet(){ + bool isObjectUpdated = false; + do{ + if(m_run_isSet){ + isObjectUpdated = true; break; + } + }while(false); + return isObjectUpdated; +} +} + diff --git a/swagger/sdrangel/code/qt5/client/SWGGS232ControllerActions.h b/swagger/sdrangel/code/qt5/client/SWGGS232ControllerActions.h new file mode 100644 index 000000000..583a49efd --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGGS232ControllerActions.h @@ -0,0 +1,58 @@ +/** + * SDRangel + * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- + * + * OpenAPI spec version: 6.0.0 + * Contact: f4exb06@gmail.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +/* + * SWGGS232ControllerActions.h + * + * GS-232 Controller actions + */ + +#ifndef SWGGS232ControllerActions_H_ +#define SWGGS232ControllerActions_H_ + +#include + + + +#include "SWGObject.h" +#include "export.h" + +namespace SWGSDRangel { + +class SWG_API SWGGS232ControllerActions: public SWGObject { +public: + SWGGS232ControllerActions(); + SWGGS232ControllerActions(QString* json); + virtual ~SWGGS232ControllerActions(); + void init(); + void cleanup(); + + virtual QString asJson () override; + virtual QJsonObject* asJsonObject() override; + virtual void fromJsonObject(QJsonObject &json) override; + virtual SWGGS232ControllerActions* fromJson(QString &jsonString) override; + + qint32 getRun(); + void setRun(qint32 run); + + + virtual bool isSet() override; + +private: + qint32 run; + bool m_run_isSet; + +}; + +} + +#endif /* SWGGS232ControllerActions_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h index 902208ad4..c76530fa3 100644 --- a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h +++ b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h @@ -133,6 +133,7 @@ #include "SWGFrequencyRange.h" #include "SWGGLScope.h" #include "SWGGLSpectrum.h" +#include "SWGGS232ControllerActions.h" #include "SWGGS232ControllerReport.h" #include "SWGGS232ControllerSettings.h" #include "SWGGain.h" @@ -224,6 +225,7 @@ #include "SWGRemoteSinkSettings.h" #include "SWGRemoteSourceReport.h" #include "SWGRemoteSourceSettings.h" +#include "SWGRigCtlServerActions.h" #include "SWGRigCtlServerSettings.h" #include "SWGRtlSdrReport.h" #include "SWGRtlSdrSettings.h" @@ -239,6 +241,7 @@ #include "SWGSamplingDevice.h" #include "SWGSatelliteDeviceSettings.h" #include "SWGSatelliteDeviceSettingsList.h" +#include "SWGSatelliteTrackerActions.h" #include "SWGSatelliteTrackerSettings.h" #include "SWGSigMFFileInputActions.h" #include "SWGSigMFFileInputReport.h" @@ -256,6 +259,7 @@ #include "SWGSoapySDRReport.h" #include "SWGSpectrumServer.h" #include "SWGSpectrumServer_clients.h" +#include "SWGStarTrackerActions.h" #include "SWGStarTrackerDisplayLoSSettings.h" #include "SWGStarTrackerDisplayLoSSettings_2.h" #include "SWGStarTrackerDisplaySettings.h" @@ -283,6 +287,7 @@ #include "SWGVORDemodSCReport.h" #include "SWGVORDemodSCSettings.h" #include "SWGVORDemodSettings.h" +#include "SWGVORLocalizerActions.h" #include "SWGVORLocalizerSettings.h" #include "SWGWFMDemodReport.h" #include "SWGWFMDemodSettings.h" @@ -893,6 +898,11 @@ namespace SWGSDRangel { obj->init(); return obj; } + if(QString("SWGGS232ControllerActions").compare(type) == 0) { + SWGGS232ControllerActions *obj = new SWGGS232ControllerActions(); + obj->init(); + return obj; + } if(QString("SWGGS232ControllerReport").compare(type) == 0) { SWGGS232ControllerReport *obj = new SWGGS232ControllerReport(); obj->init(); @@ -1348,6 +1358,11 @@ namespace SWGSDRangel { obj->init(); return obj; } + if(QString("SWGRigCtlServerActions").compare(type) == 0) { + SWGRigCtlServerActions *obj = new SWGRigCtlServerActions(); + obj->init(); + return obj; + } if(QString("SWGRigCtlServerSettings").compare(type) == 0) { SWGRigCtlServerSettings *obj = new SWGRigCtlServerSettings(); obj->init(); @@ -1423,6 +1438,11 @@ namespace SWGSDRangel { obj->init(); return obj; } + if(QString("SWGSatelliteTrackerActions").compare(type) == 0) { + SWGSatelliteTrackerActions *obj = new SWGSatelliteTrackerActions(); + obj->init(); + return obj; + } if(QString("SWGSatelliteTrackerSettings").compare(type) == 0) { SWGSatelliteTrackerSettings *obj = new SWGSatelliteTrackerSettings(); obj->init(); @@ -1508,6 +1528,11 @@ namespace SWGSDRangel { obj->init(); return obj; } + if(QString("SWGStarTrackerActions").compare(type) == 0) { + SWGStarTrackerActions *obj = new SWGStarTrackerActions(); + obj->init(); + return obj; + } if(QString("SWGStarTrackerDisplayLoSSettings").compare(type) == 0) { SWGStarTrackerDisplayLoSSettings *obj = new SWGStarTrackerDisplayLoSSettings(); obj->init(); @@ -1643,6 +1668,11 @@ namespace SWGSDRangel { obj->init(); return obj; } + if(QString("SWGVORLocalizerActions").compare(type) == 0) { + SWGVORLocalizerActions *obj = new SWGVORLocalizerActions(); + obj->init(); + return obj; + } if(QString("SWGVORLocalizerSettings").compare(type) == 0) { SWGVORLocalizerSettings *obj = new SWGVORLocalizerSettings(); obj->init(); diff --git a/swagger/sdrangel/code/qt5/client/SWGPERTesterActions.cpp b/swagger/sdrangel/code/qt5/client/SWGPERTesterActions.cpp index 268f21859..d524b7c6d 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPERTesterActions.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGPERTesterActions.cpp @@ -28,6 +28,8 @@ SWGPERTesterActions::SWGPERTesterActions(QString* json) { } SWGPERTesterActions::SWGPERTesterActions() { + run = 0; + m_run_isSet = false; aos = nullptr; m_aos_isSet = false; } @@ -38,12 +40,15 @@ SWGPERTesterActions::~SWGPERTesterActions() { void SWGPERTesterActions::init() { + run = 0; + m_run_isSet = false; aos = new SWGPERTesterActions_aos(); m_aos_isSet = false; } void SWGPERTesterActions::cleanup() { + if(aos != nullptr) { delete aos; } @@ -60,6 +65,8 @@ SWGPERTesterActions::fromJson(QString &json) { void SWGPERTesterActions::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&run, pJson["run"], "qint32", ""); + ::SWGSDRangel::setValue(&aos, pJson["aos"], "SWGPERTesterActions_aos", "SWGPERTesterActions_aos"); } @@ -78,6 +85,9 @@ SWGPERTesterActions::asJson () QJsonObject* SWGPERTesterActions::asJsonObject() { QJsonObject* obj = new QJsonObject(); + if(m_run_isSet){ + obj->insert("run", QJsonValue(run)); + } if((aos != nullptr) && (aos->isSet())){ toJsonValue(QString("aos"), aos, obj, QString("SWGPERTesterActions_aos")); } @@ -85,6 +95,16 @@ SWGPERTesterActions::asJsonObject() { return obj; } +qint32 +SWGPERTesterActions::getRun() { + return run; +} +void +SWGPERTesterActions::setRun(qint32 run) { + this->run = run; + this->m_run_isSet = true; +} + SWGPERTesterActions_aos* SWGPERTesterActions::getAos() { return aos; @@ -100,6 +120,9 @@ bool SWGPERTesterActions::isSet(){ bool isObjectUpdated = false; do{ + if(m_run_isSet){ + isObjectUpdated = true; break; + } if(aos && aos->isSet()){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGPERTesterActions.h b/swagger/sdrangel/code/qt5/client/SWGPERTesterActions.h index c7418b74a..460d81715 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPERTesterActions.h +++ b/swagger/sdrangel/code/qt5/client/SWGPERTesterActions.h @@ -42,6 +42,9 @@ public: virtual void fromJsonObject(QJsonObject &json) override; virtual SWGPERTesterActions* fromJson(QString &jsonString) override; + qint32 getRun(); + void setRun(qint32 run); + SWGPERTesterActions_aos* getAos(); void setAos(SWGPERTesterActions_aos* aos); @@ -49,6 +52,9 @@ public: virtual bool isSet() override; private: + qint32 run; + bool m_run_isSet; + SWGPERTesterActions_aos* aos; bool m_aos_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGRigCtlServerActions.cpp b/swagger/sdrangel/code/qt5/client/SWGRigCtlServerActions.cpp new file mode 100644 index 000000000..e1b7f5856 --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGRigCtlServerActions.cpp @@ -0,0 +1,108 @@ +/** + * SDRangel + * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- + * + * OpenAPI spec version: 6.0.0 + * Contact: f4exb06@gmail.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + +#include "SWGRigCtlServerActions.h" + +#include "SWGHelpers.h" + +#include +#include +#include +#include + +namespace SWGSDRangel { + +SWGRigCtlServerActions::SWGRigCtlServerActions(QString* json) { + init(); + this->fromJson(*json); +} + +SWGRigCtlServerActions::SWGRigCtlServerActions() { + run = 0; + m_run_isSet = false; +} + +SWGRigCtlServerActions::~SWGRigCtlServerActions() { + this->cleanup(); +} + +void +SWGRigCtlServerActions::init() { + run = 0; + m_run_isSet = false; +} + +void +SWGRigCtlServerActions::cleanup() { + +} + +SWGRigCtlServerActions* +SWGRigCtlServerActions::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; +} + +void +SWGRigCtlServerActions::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&run, pJson["run"], "qint32", ""); + +} + +QString +SWGRigCtlServerActions::asJson () +{ + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + delete obj; + return QString(bytes); +} + +QJsonObject* +SWGRigCtlServerActions::asJsonObject() { + QJsonObject* obj = new QJsonObject(); + if(m_run_isSet){ + obj->insert("run", QJsonValue(run)); + } + + return obj; +} + +qint32 +SWGRigCtlServerActions::getRun() { + return run; +} +void +SWGRigCtlServerActions::setRun(qint32 run) { + this->run = run; + this->m_run_isSet = true; +} + + +bool +SWGRigCtlServerActions::isSet(){ + bool isObjectUpdated = false; + do{ + if(m_run_isSet){ + isObjectUpdated = true; break; + } + }while(false); + return isObjectUpdated; +} +} + diff --git a/swagger/sdrangel/code/qt5/client/SWGRigCtlServerActions.h b/swagger/sdrangel/code/qt5/client/SWGRigCtlServerActions.h new file mode 100644 index 000000000..f90d82e51 --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGRigCtlServerActions.h @@ -0,0 +1,58 @@ +/** + * SDRangel + * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- + * + * OpenAPI spec version: 6.0.0 + * Contact: f4exb06@gmail.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +/* + * SWGRigCtlServerActions.h + * + * RigCtl server actions + */ + +#ifndef SWGRigCtlServerActions_H_ +#define SWGRigCtlServerActions_H_ + +#include + + + +#include "SWGObject.h" +#include "export.h" + +namespace SWGSDRangel { + +class SWG_API SWGRigCtlServerActions: public SWGObject { +public: + SWGRigCtlServerActions(); + SWGRigCtlServerActions(QString* json); + virtual ~SWGRigCtlServerActions(); + void init(); + void cleanup(); + + virtual QString asJson () override; + virtual QJsonObject* asJsonObject() override; + virtual void fromJsonObject(QJsonObject &json) override; + virtual SWGRigCtlServerActions* fromJson(QString &jsonString) override; + + qint32 getRun(); + void setRun(qint32 run); + + + virtual bool isSet() override; + +private: + qint32 run; + bool m_run_isSet; + +}; + +} + +#endif /* SWGRigCtlServerActions_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerActions.cpp b/swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerActions.cpp new file mode 100644 index 000000000..0f27814d2 --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerActions.cpp @@ -0,0 +1,108 @@ +/** + * SDRangel + * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- + * + * OpenAPI spec version: 6.0.0 + * Contact: f4exb06@gmail.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + +#include "SWGSatelliteTrackerActions.h" + +#include "SWGHelpers.h" + +#include +#include +#include +#include + +namespace SWGSDRangel { + +SWGSatelliteTrackerActions::SWGSatelliteTrackerActions(QString* json) { + init(); + this->fromJson(*json); +} + +SWGSatelliteTrackerActions::SWGSatelliteTrackerActions() { + run = 0; + m_run_isSet = false; +} + +SWGSatelliteTrackerActions::~SWGSatelliteTrackerActions() { + this->cleanup(); +} + +void +SWGSatelliteTrackerActions::init() { + run = 0; + m_run_isSet = false; +} + +void +SWGSatelliteTrackerActions::cleanup() { + +} + +SWGSatelliteTrackerActions* +SWGSatelliteTrackerActions::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; +} + +void +SWGSatelliteTrackerActions::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&run, pJson["run"], "qint32", ""); + +} + +QString +SWGSatelliteTrackerActions::asJson () +{ + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + delete obj; + return QString(bytes); +} + +QJsonObject* +SWGSatelliteTrackerActions::asJsonObject() { + QJsonObject* obj = new QJsonObject(); + if(m_run_isSet){ + obj->insert("run", QJsonValue(run)); + } + + return obj; +} + +qint32 +SWGSatelliteTrackerActions::getRun() { + return run; +} +void +SWGSatelliteTrackerActions::setRun(qint32 run) { + this->run = run; + this->m_run_isSet = true; +} + + +bool +SWGSatelliteTrackerActions::isSet(){ + bool isObjectUpdated = false; + do{ + if(m_run_isSet){ + isObjectUpdated = true; break; + } + }while(false); + return isObjectUpdated; +} +} + diff --git a/swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerActions.h b/swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerActions.h new file mode 100644 index 000000000..24cc44389 --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerActions.h @@ -0,0 +1,58 @@ +/** + * SDRangel + * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- + * + * OpenAPI spec version: 6.0.0 + * Contact: f4exb06@gmail.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +/* + * SWGSatelliteTrackerActions.h + * + * Satellite Tracker actions + */ + +#ifndef SWGSatelliteTrackerActions_H_ +#define SWGSatelliteTrackerActions_H_ + +#include + + + +#include "SWGObject.h" +#include "export.h" + +namespace SWGSDRangel { + +class SWG_API SWGSatelliteTrackerActions: public SWGObject { +public: + SWGSatelliteTrackerActions(); + SWGSatelliteTrackerActions(QString* json); + virtual ~SWGSatelliteTrackerActions(); + void init(); + void cleanup(); + + virtual QString asJson () override; + virtual QJsonObject* asJsonObject() override; + virtual void fromJsonObject(QJsonObject &json) override; + virtual SWGSatelliteTrackerActions* fromJson(QString &jsonString) override; + + qint32 getRun(); + void setRun(qint32 run); + + + virtual bool isSet() override; + +private: + qint32 run; + bool m_run_isSet; + +}; + +} + +#endif /* SWGSatelliteTrackerActions_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGSimplePTTActions.cpp b/swagger/sdrangel/code/qt5/client/SWGSimplePTTActions.cpp index 2d7930dc0..afb4e69d8 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSimplePTTActions.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGSimplePTTActions.cpp @@ -28,6 +28,8 @@ SWGSimplePTTActions::SWGSimplePTTActions(QString* json) { } SWGSimplePTTActions::SWGSimplePTTActions() { + run = 0; + m_run_isSet = false; ptt = 0; m_ptt_isSet = false; } @@ -38,6 +40,8 @@ SWGSimplePTTActions::~SWGSimplePTTActions() { void SWGSimplePTTActions::init() { + run = 0; + m_run_isSet = false; ptt = 0; m_ptt_isSet = false; } @@ -45,6 +49,7 @@ SWGSimplePTTActions::init() { void SWGSimplePTTActions::cleanup() { + } SWGSimplePTTActions* @@ -58,6 +63,8 @@ SWGSimplePTTActions::fromJson(QString &json) { void SWGSimplePTTActions::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&run, pJson["run"], "qint32", ""); + ::SWGSDRangel::setValue(&ptt, pJson["ptt"], "qint32", ""); } @@ -76,6 +83,9 @@ SWGSimplePTTActions::asJson () QJsonObject* SWGSimplePTTActions::asJsonObject() { QJsonObject* obj = new QJsonObject(); + if(m_run_isSet){ + obj->insert("run", QJsonValue(run)); + } if(m_ptt_isSet){ obj->insert("ptt", QJsonValue(ptt)); } @@ -83,6 +93,16 @@ SWGSimplePTTActions::asJsonObject() { return obj; } +qint32 +SWGSimplePTTActions::getRun() { + return run; +} +void +SWGSimplePTTActions::setRun(qint32 run) { + this->run = run; + this->m_run_isSet = true; +} + qint32 SWGSimplePTTActions::getPtt() { return ptt; @@ -98,6 +118,9 @@ bool SWGSimplePTTActions::isSet(){ bool isObjectUpdated = false; do{ + if(m_run_isSet){ + isObjectUpdated = true; break; + } if(m_ptt_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSimplePTTActions.h b/swagger/sdrangel/code/qt5/client/SWGSimplePTTActions.h index 945c7835a..3ae2a544c 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSimplePTTActions.h +++ b/swagger/sdrangel/code/qt5/client/SWGSimplePTTActions.h @@ -41,6 +41,9 @@ public: virtual void fromJsonObject(QJsonObject &json) override; virtual SWGSimplePTTActions* fromJson(QString &jsonString) override; + qint32 getRun(); + void setRun(qint32 run); + qint32 getPtt(); void setPtt(qint32 ptt); @@ -48,6 +51,9 @@ public: virtual bool isSet() override; private: + qint32 run; + bool m_run_isSet; + qint32 ptt; bool m_ptt_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGStarTrackerActions.cpp b/swagger/sdrangel/code/qt5/client/SWGStarTrackerActions.cpp new file mode 100644 index 000000000..b664b302f --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGStarTrackerActions.cpp @@ -0,0 +1,108 @@ +/** + * SDRangel + * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- + * + * OpenAPI spec version: 6.0.0 + * Contact: f4exb06@gmail.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + +#include "SWGStarTrackerActions.h" + +#include "SWGHelpers.h" + +#include +#include +#include +#include + +namespace SWGSDRangel { + +SWGStarTrackerActions::SWGStarTrackerActions(QString* json) { + init(); + this->fromJson(*json); +} + +SWGStarTrackerActions::SWGStarTrackerActions() { + run = 0; + m_run_isSet = false; +} + +SWGStarTrackerActions::~SWGStarTrackerActions() { + this->cleanup(); +} + +void +SWGStarTrackerActions::init() { + run = 0; + m_run_isSet = false; +} + +void +SWGStarTrackerActions::cleanup() { + +} + +SWGStarTrackerActions* +SWGStarTrackerActions::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; +} + +void +SWGStarTrackerActions::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&run, pJson["run"], "qint32", ""); + +} + +QString +SWGStarTrackerActions::asJson () +{ + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + delete obj; + return QString(bytes); +} + +QJsonObject* +SWGStarTrackerActions::asJsonObject() { + QJsonObject* obj = new QJsonObject(); + if(m_run_isSet){ + obj->insert("run", QJsonValue(run)); + } + + return obj; +} + +qint32 +SWGStarTrackerActions::getRun() { + return run; +} +void +SWGStarTrackerActions::setRun(qint32 run) { + this->run = run; + this->m_run_isSet = true; +} + + +bool +SWGStarTrackerActions::isSet(){ + bool isObjectUpdated = false; + do{ + if(m_run_isSet){ + isObjectUpdated = true; break; + } + }while(false); + return isObjectUpdated; +} +} + diff --git a/swagger/sdrangel/code/qt5/client/SWGStarTrackerActions.h b/swagger/sdrangel/code/qt5/client/SWGStarTrackerActions.h new file mode 100644 index 000000000..ef535cf13 --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGStarTrackerActions.h @@ -0,0 +1,58 @@ +/** + * SDRangel + * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- + * + * OpenAPI spec version: 6.0.0 + * Contact: f4exb06@gmail.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +/* + * SWGStarTrackerActions.h + * + * Star Tracker actions + */ + +#ifndef SWGStarTrackerActions_H_ +#define SWGStarTrackerActions_H_ + +#include + + + +#include "SWGObject.h" +#include "export.h" + +namespace SWGSDRangel { + +class SWG_API SWGStarTrackerActions: public SWGObject { +public: + SWGStarTrackerActions(); + SWGStarTrackerActions(QString* json); + virtual ~SWGStarTrackerActions(); + void init(); + void cleanup(); + + virtual QString asJson () override; + virtual QJsonObject* asJsonObject() override; + virtual void fromJsonObject(QJsonObject &json) override; + virtual SWGStarTrackerActions* fromJson(QString &jsonString) override; + + qint32 getRun(); + void setRun(qint32 run); + + + virtual bool isSet() override; + +private: + qint32 run; + bool m_run_isSet; + +}; + +} + +#endif /* SWGStarTrackerActions_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGVORLocalizerActions.cpp b/swagger/sdrangel/code/qt5/client/SWGVORLocalizerActions.cpp new file mode 100644 index 000000000..6c55f5b6d --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGVORLocalizerActions.cpp @@ -0,0 +1,108 @@ +/** + * SDRangel + * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- + * + * OpenAPI spec version: 6.0.0 + * Contact: f4exb06@gmail.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + +#include "SWGVORLocalizerActions.h" + +#include "SWGHelpers.h" + +#include +#include +#include +#include + +namespace SWGSDRangel { + +SWGVORLocalizerActions::SWGVORLocalizerActions(QString* json) { + init(); + this->fromJson(*json); +} + +SWGVORLocalizerActions::SWGVORLocalizerActions() { + run = 0; + m_run_isSet = false; +} + +SWGVORLocalizerActions::~SWGVORLocalizerActions() { + this->cleanup(); +} + +void +SWGVORLocalizerActions::init() { + run = 0; + m_run_isSet = false; +} + +void +SWGVORLocalizerActions::cleanup() { + +} + +SWGVORLocalizerActions* +SWGVORLocalizerActions::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; +} + +void +SWGVORLocalizerActions::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&run, pJson["run"], "qint32", ""); + +} + +QString +SWGVORLocalizerActions::asJson () +{ + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + delete obj; + return QString(bytes); +} + +QJsonObject* +SWGVORLocalizerActions::asJsonObject() { + QJsonObject* obj = new QJsonObject(); + if(m_run_isSet){ + obj->insert("run", QJsonValue(run)); + } + + return obj; +} + +qint32 +SWGVORLocalizerActions::getRun() { + return run; +} +void +SWGVORLocalizerActions::setRun(qint32 run) { + this->run = run; + this->m_run_isSet = true; +} + + +bool +SWGVORLocalizerActions::isSet(){ + bool isObjectUpdated = false; + do{ + if(m_run_isSet){ + isObjectUpdated = true; break; + } + }while(false); + return isObjectUpdated; +} +} + diff --git a/swagger/sdrangel/code/qt5/client/SWGVORLocalizerActions.h b/swagger/sdrangel/code/qt5/client/SWGVORLocalizerActions.h new file mode 100644 index 000000000..78fcd62d1 --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGVORLocalizerActions.h @@ -0,0 +1,58 @@ +/** + * SDRangel + * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- + * + * OpenAPI spec version: 6.0.0 + * Contact: f4exb06@gmail.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +/* + * SWGVORLocalizerActions.h + * + * VORLocalizer + */ + +#ifndef SWGVORLocalizerActions_H_ +#define SWGVORLocalizerActions_H_ + +#include + + + +#include "SWGObject.h" +#include "export.h" + +namespace SWGSDRangel { + +class SWG_API SWGVORLocalizerActions: public SWGObject { +public: + SWGVORLocalizerActions(); + SWGVORLocalizerActions(QString* json); + virtual ~SWGVORLocalizerActions(); + void init(); + void cleanup(); + + virtual QString asJson () override; + virtual QJsonObject* asJsonObject() override; + virtual void fromJsonObject(QJsonObject &json) override; + virtual SWGVORLocalizerActions* fromJson(QString &jsonString) override; + + qint32 getRun(); + void setRun(qint32 run); + + + virtual bool isSet() override; + +private: + qint32 run; + bool m_run_isSet; + +}; + +} + +#endif /* SWGVORLocalizerActions_H_ */