From fee2c5065dbcc1e7aa2ecae7c047937bdd519b93 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 23 Oct 2021 21:24:25 +0200 Subject: [PATCH] API: report running state for feature plugins with run action --- plugins/feature/afc/afc.cpp | 1 + .../gs232controller/gs232controller.cpp | 1 + plugins/feature/pertester/pertester.cpp | 16 ++ plugins/feature/pertester/pertester.h | 5 + plugins/feature/rigctlserver/rigctlserver.cpp | 16 ++ plugins/feature/rigctlserver/rigctlserver.h | 5 + .../satellitetracker/satellitetracker.cpp | 16 ++ .../satellitetracker/satellitetracker.h | 5 + plugins/feature/simpleptt/simpleptt.cpp | 1 + plugins/feature/startracker/startracker.cpp | 16 ++ plugins/feature/startracker/startracker.h | 5 + plugins/feature/vorlocalizer/vorlocalizer.cpp | 16 ++ plugins/feature/vorlocalizer/vorlocalizer.h | 5 + sdrbase/resources/webapi/doc/html2/index.html | 78 ++++++++- .../webapi/doc/swagger/include/AFC.yaml | 8 + .../doc/swagger/include/FeatureReport.yaml | 14 +- .../doc/swagger/include/GS232Controller.yaml | 8 + .../webapi/doc/swagger/include/PERTester.yaml | 12 ++ .../doc/swagger/include/RigCtlServer.yaml | 12 ++ .../doc/swagger/include/SatelliteTracker.yaml | 12 ++ .../webapi/doc/swagger/include/SimplePTT.yaml | 8 + .../doc/swagger/include/StarTracker.yaml | 12 ++ .../doc/swagger/include/VORLocalizer.yaml | 12 ++ swagger/sdrangel/api/swagger/include/AFC.yaml | 8 + .../api/swagger/include/FeatureReport.yaml | 14 +- .../api/swagger/include/GS232Controller.yaml | 8 + .../api/swagger/include/PERTester.yaml | 12 ++ .../api/swagger/include/RigCtlServer.yaml | 12 ++ .../api/swagger/include/SatelliteTracker.yaml | 12 ++ .../api/swagger/include/SimplePTT.yaml | 8 + .../api/swagger/include/StarTracker.yaml | 12 ++ .../api/swagger/include/VORLocalizer.yaml | 12 ++ swagger/sdrangel/code/html2/index.html | 78 ++++++++- .../sdrangel/code/qt5/client/SWGAFCReport.cpp | 23 +++ .../sdrangel/code/qt5/client/SWGAFCReport.h | 6 + .../code/qt5/client/SWGFeatureReport.cpp | 157 ++++++++++++++++-- .../code/qt5/client/SWGFeatureReport.h | 43 ++++- .../qt5/client/SWGGS232ControllerReport.cpp | 23 +++ .../qt5/client/SWGGS232ControllerReport.h | 6 + .../code/qt5/client/SWGModelFactory.h | 30 ++++ .../code/qt5/client/SWGPERTesterReport.cpp | 108 ++++++++++++ .../code/qt5/client/SWGPERTesterReport.h | 58 +++++++ .../code/qt5/client/SWGRigCtlServerReport.cpp | 108 ++++++++++++ .../code/qt5/client/SWGRigCtlServerReport.h | 58 +++++++ .../qt5/client/SWGSatelliteTrackerReport.cpp | 108 ++++++++++++ .../qt5/client/SWGSatelliteTrackerReport.h | 58 +++++++ .../code/qt5/client/SWGSimplePTTReport.cpp | 23 +++ .../code/qt5/client/SWGSimplePTTReport.h | 6 + .../code/qt5/client/SWGStarTrackerReport.cpp | 108 ++++++++++++ .../code/qt5/client/SWGStarTrackerReport.h | 58 +++++++ .../code/qt5/client/SWGVORLocalizerReport.cpp | 108 ++++++++++++ .../code/qt5/client/SWGVORLocalizerReport.h | 58 +++++++ 52 files changed, 1577 insertions(+), 30 deletions(-) create mode 100644 swagger/sdrangel/code/qt5/client/SWGPERTesterReport.cpp create mode 100644 swagger/sdrangel/code/qt5/client/SWGPERTesterReport.h create mode 100644 swagger/sdrangel/code/qt5/client/SWGRigCtlServerReport.cpp create mode 100644 swagger/sdrangel/code/qt5/client/SWGRigCtlServerReport.h create mode 100644 swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerReport.cpp create mode 100644 swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerReport.h create mode 100644 swagger/sdrangel/code/qt5/client/SWGStarTrackerReport.cpp create mode 100644 swagger/sdrangel/code/qt5/client/SWGStarTrackerReport.h create mode 100644 swagger/sdrangel/code/qt5/client/SWGVORLocalizerReport.cpp create mode 100644 swagger/sdrangel/code/qt5/client/SWGVORLocalizerReport.h diff --git a/plugins/feature/afc/afc.cpp b/plugins/feature/afc/afc.cpp index c971a6a01..a8f647f55 100644 --- a/plugins/feature/afc/afc.cpp +++ b/plugins/feature/afc/afc.cpp @@ -472,6 +472,7 @@ void AFC::webapiFormatFeatureReport(SWGSDRangel::SWGFeatureReport& response) response.getAfcReport()->setTrackerChannelIndex(m_trackerIndexInDeviceSet); response.getAfcReport()->setTrackerDeviceFrequency(m_worker->getTrackerDeviceFrequency()); response.getAfcReport()->setTrackerChannelOffset(m_worker->getTrackerChannelOffset()); + response.getAfcReport()->setRunningState(getState()); } void AFC::webapiReverseSendSettings(QList& channelSettingsKeys, const AFCSettings& settings, bool force) diff --git a/plugins/feature/gs232controller/gs232controller.cpp b/plugins/feature/gs232controller/gs232controller.cpp index 810903869..37a299469 100644 --- a/plugins/feature/gs232controller/gs232controller.cpp +++ b/plugins/feature/gs232controller/gs232controller.cpp @@ -633,6 +633,7 @@ void GS232Controller::webapiFormatFeatureReport(SWGSDRangel::SWGFeatureReport& r response.getGs232ControllerReport()->setCurrentAzimuth(m_currentAzimuth); response.getGs232ControllerReport()->setCurrentElevation(m_currentElevation); response.getGs232ControllerReport()->setOnTarget(getOnTarget()); + response.getGs232ControllerReport()->setRunningState(getState()); } void GS232Controller::networkManagerFinished(QNetworkReply *reply) diff --git a/plugins/feature/pertester/pertester.cpp b/plugins/feature/pertester/pertester.cpp index d0843bf7a..365ad3dc5 100644 --- a/plugins/feature/pertester/pertester.cpp +++ b/plugins/feature/pertester/pertester.cpp @@ -477,6 +477,22 @@ void PERTester::webapiReverseSendSettings(QList& featureSettingsKeys, c delete swgFeatureSettings; } +int PERTester::webapiReportGet( + SWGSDRangel::SWGFeatureReport& response, + QString& errorMessage) +{ + (void) errorMessage; + response.setPerTesterReport(new SWGSDRangel::SWGPERTesterReport()); + response.getPerTesterReport()->init(); + webapiFormatFeatureReport(response); + return 200; +} + +void PERTester::webapiFormatFeatureReport(SWGSDRangel::SWGFeatureReport& response) +{ + response.getPerTesterReport()->setRunningState(getState()); +} + int PERTester::webapiActionsPost( const QStringList& featureActionsKeys, SWGSDRangel::SWGFeatureActions& query, diff --git a/plugins/feature/pertester/pertester.h b/plugins/feature/pertester/pertester.h index 2732b79b2..3b7cb89a7 100644 --- a/plugins/feature/pertester/pertester.h +++ b/plugins/feature/pertester/pertester.h @@ -141,6 +141,10 @@ public: SWGSDRangel::SWGFeatureSettings& response, QString& errorMessage); + virtual int webapiReportGet( + SWGSDRangel::SWGFeatureReport& response, + QString& errorMessage); + virtual int webapiActionsPost( const QStringList& featureActionsKeys, SWGSDRangel::SWGFeatureActions& query, @@ -170,6 +174,7 @@ private: void stop(); void applySettings(const PERTesterSettings& settings, bool force = false); void webapiReverseSendSettings(QList& featureSettingsKeys, const PERTesterSettings& settings, bool force); + void webapiFormatFeatureReport(SWGSDRangel::SWGFeatureReport& response); private slots: void networkManagerFinished(QNetworkReply *reply); diff --git a/plugins/feature/rigctlserver/rigctlserver.cpp b/plugins/feature/rigctlserver/rigctlserver.cpp index d38b3cee5..001955497 100644 --- a/plugins/feature/rigctlserver/rigctlserver.cpp +++ b/plugins/feature/rigctlserver/rigctlserver.cpp @@ -257,6 +257,22 @@ int RigCtlServer::webapiSettingsPutPatch( return 200; } +int RigCtlServer::webapiReportGet( + SWGSDRangel::SWGFeatureReport& response, + QString& errorMessage) +{ + (void) errorMessage; + response.setRigCtlServerReport(new SWGSDRangel::SWGRigCtlServerReport()); + response.getRigCtlServerReport()->init(); + webapiFormatFeatureReport(response); + return 200; +} + +void RigCtlServer::webapiFormatFeatureReport(SWGSDRangel::SWGFeatureReport& response) +{ + response.getRigCtlServerReport()->setRunningState(getState()); +} + int RigCtlServer::webapiActionsPost( const QStringList& featureActionsKeys, SWGSDRangel::SWGFeatureActions& query, diff --git a/plugins/feature/rigctlserver/rigctlserver.h b/plugins/feature/rigctlserver/rigctlserver.h index f802fb4b3..6f6313a95 100644 --- a/plugins/feature/rigctlserver/rigctlserver.h +++ b/plugins/feature/rigctlserver/rigctlserver.h @@ -106,6 +106,10 @@ public: SWGSDRangel::SWGFeatureSettings& response, QString& errorMessage); + virtual int webapiReportGet( + SWGSDRangel::SWGFeatureReport& response, + QString& errorMessage); + virtual int webapiActionsPost( const QStringList& featureActionsKeys, SWGSDRangel::SWGFeatureActions& query, @@ -135,6 +139,7 @@ private: void stop(); void applySettings(const RigCtlServerSettings& settings, bool force = false); void webapiReverseSendSettings(QList& featureSettingsKeys, const RigCtlServerSettings& settings, bool force); + void webapiFormatFeatureReport(SWGSDRangel::SWGFeatureReport& response); private slots: void networkManagerFinished(QNetworkReply *reply); diff --git a/plugins/feature/satellitetracker/satellitetracker.cpp b/plugins/feature/satellitetracker/satellitetracker.cpp index 4a33b6fed..979ec1637 100644 --- a/plugins/feature/satellitetracker/satellitetracker.cpp +++ b/plugins/feature/satellitetracker/satellitetracker.cpp @@ -370,6 +370,17 @@ int SatelliteTracker::webapiSettingsPutPatch( return 200; } +int SatelliteTracker::webapiReportGet( + SWGSDRangel::SWGFeatureReport& response, + QString& errorMessage) +{ + (void) errorMessage; + response.setSatelliteTrackerReport(new SWGSDRangel::SWGSatelliteTrackerReport()); + response.getSatelliteTrackerReport()->init(); + webapiFormatFeatureReport(response); + return 200; +} + int SatelliteTracker::webapiActionsPost( const QStringList& featureActionsKeys, SWGSDRangel::SWGFeatureActions& query, @@ -800,6 +811,11 @@ void SatelliteTracker::webapiReverseSendSettings(QList& featureSettings delete swgFeatureSettings; } +void SatelliteTracker::webapiFormatFeatureReport(SWGSDRangel::SWGFeatureReport& response) +{ + response.getSatelliteTrackerReport()->setRunningState(getState()); +} + void SatelliteTracker::networkManagerFinished(QNetworkReply *reply) { QNetworkReply::NetworkError replyError = reply->error(); diff --git a/plugins/feature/satellitetracker/satellitetracker.h b/plugins/feature/satellitetracker/satellitetracker.h index 86bf4782d..04bdaf012 100644 --- a/plugins/feature/satellitetracker/satellitetracker.h +++ b/plugins/feature/satellitetracker/satellitetracker.h @@ -144,6 +144,10 @@ public: SWGSDRangel::SWGFeatureSettings& response, QString& errorMessage); + virtual int webapiReportGet( + SWGSDRangel::SWGFeatureReport& response, + QString& errorMessage); + virtual int webapiActionsPost( const QStringList& featureActionsKeys, SWGSDRangel::SWGFeatureActions& query, @@ -185,6 +189,7 @@ private: void start(); void stop(); void applySettings(const SatelliteTrackerSettings& settings, bool force = false); + void webapiFormatFeatureReport(SWGSDRangel::SWGFeatureReport& response); void webapiReverseSendSettings(QList& featureSettingsKeys, const SatelliteTrackerSettings& settings, bool force); QString satNogsSatellitesFilename(); diff --git a/plugins/feature/simpleptt/simpleptt.cpp b/plugins/feature/simpleptt/simpleptt.cpp index 103433772..d8ae88b5f 100644 --- a/plugins/feature/simpleptt/simpleptt.cpp +++ b/plugins/feature/simpleptt/simpleptt.cpp @@ -377,6 +377,7 @@ void SimplePTT::webapiUpdateFeatureSettings( void SimplePTT::webapiFormatFeatureReport(SWGSDRangel::SWGFeatureReport& response) { response.getSimplePttReport()->setPtt(m_ptt ? 1 : 0); + response.getSimplePttReport()->setRunningState(getState()); } void SimplePTT::webapiReverseSendSettings(QList& channelSettingsKeys, const SimplePTTSettings& settings, bool force) diff --git a/plugins/feature/startracker/startracker.cpp b/plugins/feature/startracker/startracker.cpp index 5e0fea49c..0e598f77e 100644 --- a/plugins/feature/startracker/startracker.cpp +++ b/plugins/feature/startracker/startracker.cpp @@ -392,6 +392,22 @@ int StarTracker::webapiSettingsPutPatch( return 200; } +int StarTracker::webapiReportGet( + SWGSDRangel::SWGFeatureReport& response, + QString& errorMessage) +{ + (void) errorMessage; + response.setStarTrackerReport(new SWGSDRangel::SWGStarTrackerReport()); + response.getStarTrackerReport()->init(); + webapiFormatFeatureReport(response); + return 200; +} + +void StarTracker::webapiFormatFeatureReport(SWGSDRangel::SWGFeatureReport& response) +{ + response.getStarTrackerReport()->setRunningState(getState()); +} + int StarTracker::webapiActionsPost( const QStringList& featureActionsKeys, SWGSDRangel::SWGFeatureActions& query, diff --git a/plugins/feature/startracker/startracker.h b/plugins/feature/startracker/startracker.h index 82719e0df..073e44fd4 100644 --- a/plugins/feature/startracker/startracker.h +++ b/plugins/feature/startracker/startracker.h @@ -128,6 +128,10 @@ public: SWGSDRangel::SWGFeatureSettings& response, QString& errorMessage) override; + virtual int webapiReportGet( + SWGSDRangel::SWGFeatureReport& response, + QString& errorMessage); + virtual int webapiActionsPost( const QStringList& featureActionsKeys, SWGSDRangel::SWGFeatureActions& query, @@ -168,6 +172,7 @@ private: void stop(); void applySettings(const StarTrackerSettings& settings, bool force = false); void webapiReverseSendSettings(QList& featureSettingsKeys, const StarTrackerSettings& settings, bool force); + void webapiFormatFeatureReport(SWGSDRangel::SWGFeatureReport& response); double applyBeam(const FITS *fits, double beamwidth, double ra, double dec, int& imgX, int& imgY) const; private slots: diff --git a/plugins/feature/vorlocalizer/vorlocalizer.cpp b/plugins/feature/vorlocalizer/vorlocalizer.cpp index 9caa601d3..7bbfcb638 100644 --- a/plugins/feature/vorlocalizer/vorlocalizer.cpp +++ b/plugins/feature/vorlocalizer/vorlocalizer.cpp @@ -449,6 +449,22 @@ int VORLocalizer::webapiSettingsPutPatch( return 200; } +int VORLocalizer::webapiReportGet( + SWGSDRangel::SWGFeatureReport& response, + QString& errorMessage) +{ + (void) errorMessage; + response.setVorLocalizerReport(new SWGSDRangel::SWGVORLocalizerReport()); + response.getVorLocalizerReport()->init(); + webapiFormatFeatureReport(response); + return 200; +} + +void VORLocalizer::webapiFormatFeatureReport(SWGSDRangel::SWGFeatureReport& response) +{ + response.getVorLocalizerReport()->setRunningState(getState()); +} + int VORLocalizer::webapiActionsPost( const QStringList& featureActionsKeys, SWGSDRangel::SWGFeatureActions& query, diff --git a/plugins/feature/vorlocalizer/vorlocalizer.h b/plugins/feature/vorlocalizer/vorlocalizer.h index 47072ad55..a34d7052c 100644 --- a/plugins/feature/vorlocalizer/vorlocalizer.h +++ b/plugins/feature/vorlocalizer/vorlocalizer.h @@ -158,6 +158,10 @@ public: SWGSDRangel::SWGFeatureSettings& response, QString& errorMessage); + virtual int webapiReportGet( + SWGSDRangel::SWGFeatureReport& response, + QString& errorMessage); + virtual int webapiActionsPost( const QStringList& featureActionsKeys, SWGSDRangel::SWGFeatureActions& query, @@ -209,6 +213,7 @@ private: void applySettings(const VORLocalizerSettings& settings, bool force = false); void updateChannels(); void webapiReverseSendSettings(QList& featureSettingsKeys, const VORLocalizerSettings& settings, bool force); + void webapiFormatFeatureReport(SWGSDRangel::SWGFeatureReport& response); private slots: void networkManagerFinished(QNetworkReply *reply); diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index e973c98ff..952385dcb 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -796,6 +796,10 @@ margin-bottom: 20px; }; defs.AFCReport = { "properties" : { + "runningState" : { + "type" : "integer", + "description" : "Running state\n * 0 - not started\n * 1 - idle\n * 2 - running\n * 3 - error\n" + }, "trackerChannelIndex" : { "type" : "integer", "description" : "Tracker index in device set" @@ -4947,11 +4951,26 @@ margin-bottom: 20px; "AFCReport" : { "$ref" : "#/definitions/AFCReport" }, + "GS232ControllerReport" : { + "$ref" : "#/definitions/GS232ControllerReport" + }, + "PERTesterReport" : { + "$ref" : "#/definitions/PERTesterReport" + }, + "RigCtlServerReport" : { + "$ref" : "#/definitions/RigCtlServerReport" + }, + "SatelliteTrackerReport" : { + "$ref" : "#/definitions/SatelliteTrackerReport" + }, "SimplePTTReport" : { "$ref" : "#/definitions/SimplePTTReport" }, - "GS232ControllerReport" : { - "$ref" : "#/definitions/GS232ControllerReport" + "StarTrackerReport" : { + "$ref" : "#/definitions/StarTrackerReport" + }, + "VORLocalizerReport" : { + "$ref" : "#/definitions/VORLocalizerReport" } }, "description" : "Base feature report. Only the feature report corresponding to the feature specified in the featureType field is or should be present." @@ -5824,6 +5843,10 @@ margin-bottom: 20px; }; defs.GS232ControllerReport = { "properties" : { + "runningState" : { + "type" : "integer", + "description" : "Running state\n * 0 - not started\n * 1 - idle\n * 2 - running\n * 3 - error\n" + }, "sources" : { "type" : "array", "description" : "Names of pipe sources", @@ -7934,6 +7957,15 @@ margin-bottom: 20px; } }, "description" : "Acquisition of signal" +}; + defs.PERTesterReport = { + "properties" : { + "runningState" : { + "type" : "integer", + "description" : "Running state\n * 0 - not started\n * 1 - idle\n * 2 - running\n * 3 - error\n" + } + }, + "description" : "PERTester" }; defs.PERTesterSettings = { "properties" : { @@ -9613,6 +9645,15 @@ margin-bottom: 20px; } }, "description" : "RigCtl server actions" +}; + defs.RigCtlServerReport = { + "properties" : { + "runningState" : { + "type" : "integer", + "description" : "Running state\n * 0 - not started\n * 1 - idle\n * 2 - running\n * 3 - error\n" + } + }, + "description" : "RigCtl server report" }; defs.RigCtlServerSettings = { "properties" : { @@ -10289,6 +10330,15 @@ margin-bottom: 20px; } }, "description" : "Satellite Tracker actions" +}; + defs.SatelliteTrackerReport = { + "properties" : { + "runningState" : { + "type" : "integer", + "description" : "Running state\n * 0 - not started\n * 1 - idle\n * 2 - running\n * 3 - error\n" + } + }, + "description" : "Satellite Tracker report" }; defs.SatelliteTrackerSettings = { "properties" : { @@ -10698,6 +10748,10 @@ margin-bottom: 20px; }; defs.SimplePTTReport = { "properties" : { + "runningState" : { + "type" : "integer", + "description" : "Running state\n * 0 - not started\n * 1 - idle\n * 2 - running\n * 3 - error\n" + }, "ptt" : { "type" : "integer", "description" : "PTT status\n * 0 - released\n * 1 - engaged\n" @@ -11158,6 +11212,15 @@ margin-bottom: 20px; } }, "description" : "Settings to display in Star Tracker. Can be sent by other plugins to startracker.display message queue." +}; + defs.StarTrackerReport = { + "properties" : { + "runningState" : { + "type" : "integer", + "description" : "Running state\n * 0 - not started\n * 1 - idle\n * 2 - running\n * 3 - error\n" + } + }, + "description" : "RigCtl server report" }; defs.StarTrackerSettings = { "properties" : { @@ -12383,6 +12446,15 @@ margin-bottom: 20px; } }, "description" : "VORLocalizer" +}; + defs.VORLocalizerReport = { + "properties" : { + "runningState" : { + "type" : "integer", + "description" : "Running state\n * 0 - not started\n * 1 - idle\n * 2 - running\n * 3 - error\n" + } + }, + "description" : "VORLocalizers" }; defs.VORLocalizerSettings = { "properties" : { @@ -51090,7 +51162,7 @@ except ApiException as e:
- Generated 2021-10-22T01:02:48.375+02:00 + Generated 2021-10-23T19:53:41.859+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/AFC.yaml b/sdrbase/resources/webapi/doc/swagger/include/AFC.yaml index 68d3fd0c8..4a88f4a95 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/AFC.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/AFC.yaml @@ -48,6 +48,14 @@ AFCSettings: AFCReport: description: "AFC report" properties: + runningState: + type: integer + description: > + Running state + * 0 - not started + * 1 - idle + * 2 - running + * 3 - error trackerChannelIndex: description: Tracker index in device set type: integer diff --git a/sdrbase/resources/webapi/doc/swagger/include/FeatureReport.yaml b/sdrbase/resources/webapi/doc/swagger/include/FeatureReport.yaml index 130cd2335..e942a876b 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/FeatureReport.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/FeatureReport.yaml @@ -9,7 +9,17 @@ FeatureReport: type: string AFCReport: $ref: "/doc/swagger/include/AFC.yaml#/AFCReport" - SimplePTTReport: - $ref: "/doc/swagger/include/SimplePTT.yaml#/SimplePTTReport" GS232ControllerReport: $ref: "/doc/swagger/include/GS232Controller.yaml#/GS232ControllerReport" + PERTesterReport: + $ref: "/doc/swagger/include/PERTester.yaml#/PERTesterReport" + RigCtlServerReport: + $ref: "/doc/swagger/include/RigCtlServer.yaml#/RigCtlServerReport" + SatelliteTrackerReport: + $ref: "/doc/swagger/include/SatelliteTracker.yaml#/SatelliteTrackerReport" + SimplePTTReport: + $ref: "/doc/swagger/include/SimplePTT.yaml#/SimplePTTReport" + StarTrackerReport: + $ref: "/doc/swagger/include/StarTracker.yaml#/StarTrackerReport" + VORLocalizerReport: + $ref: "/doc/swagger/include/VORLocalizer.yaml#/VORLocalizerReport" diff --git a/sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml b/sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml index 10282371d..c6374262e 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml @@ -65,6 +65,14 @@ GS232ControllerSettings: GS232ControllerReport: description: "GS-232 Controller report" properties: + runningState: + type: integer + description: > + Running state + * 0 - not started + * 1 - idle + * 2 - running + * 3 - error sources: description: Names of pipe sources type: array diff --git a/sdrbase/resources/webapi/doc/swagger/include/PERTester.yaml b/sdrbase/resources/webapi/doc/swagger/include/PERTester.yaml index f384f7c51..0747f06eb 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/PERTester.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/PERTester.yaml @@ -49,6 +49,18 @@ PERTesterSettings: reverseAPIFeatureIndex: type: integer +PERTesterReport: + description: PERTester + properties: + runningState: + type: integer + description: > + Running state + * 0 - not started + * 1 - idle + * 2 - running + * 3 - error + PERTesterActions: description: PERTester properties: diff --git a/sdrbase/resources/webapi/doc/swagger/include/RigCtlServer.yaml b/sdrbase/resources/webapi/doc/swagger/include/RigCtlServer.yaml index ba531829b..2466a1434 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/RigCtlServer.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/RigCtlServer.yaml @@ -34,6 +34,18 @@ RigCtlServerSettings: reverseAPIFeatureIndex: type: integer +RigCtlServerReport: + description: RigCtl server report + properties: + runningState: + type: integer + description: > + Running state + * 0 - not started + * 1 - idle + * 2 - running + * 3 - error + RigCtlServerActions: description: RigCtl server actions properties: diff --git a/sdrbase/resources/webapi/doc/swagger/include/SatelliteTracker.yaml b/sdrbase/resources/webapi/doc/swagger/include/SatelliteTracker.yaml index f611ca5a3..7a8a0956a 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SatelliteTracker.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SatelliteTracker.yaml @@ -166,6 +166,18 @@ SatelliteDeviceSettings: description: "Command to execute on LOS" type: string +SatelliteTrackerReport: + description: "Satellite Tracker report" + properties: + runningState: + type: integer + description: > + Running state + * 0 - not started + * 1 - idle + * 2 - running + * 3 - error + SatelliteTrackerActions: description: "Satellite Tracker actions" properties: diff --git a/sdrbase/resources/webapi/doc/swagger/include/SimplePTT.yaml b/sdrbase/resources/webapi/doc/swagger/include/SimplePTT.yaml index 3cecb876d..d8fe6fd35 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SimplePTT.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SimplePTT.yaml @@ -32,6 +32,14 @@ SimplePTTSettings: SimplePTTReport: description: "Simple PTT report" properties: + runningState: + type: integer + description: > + Running state + * 0 - not started + * 1 - idle + * 2 - running + * 3 - error 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 f7876bfa7..908d43df0 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/StarTracker.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/StarTracker.yaml @@ -202,6 +202,18 @@ StarTrackerDisplayLoSSettings: type: number format: float +StarTrackerReport: + description: RigCtl server report + properties: + runningState: + type: integer + description: > + Running state + * 0 - not started + * 1 - idle + * 2 - running + * 3 - error + StarTrackerActions: description: "Star Tracker actions" properties: diff --git a/sdrbase/resources/webapi/doc/swagger/include/VORLocalizer.yaml b/sdrbase/resources/webapi/doc/swagger/include/VORLocalizer.yaml index b4dcaef85..ea708fadb 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/VORLocalizer.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/VORLocalizer.yaml @@ -32,6 +32,18 @@ VORLocalizerSettings: description: Shift of center frequency in Hz type: integer +VORLocalizerReport: + description: VORLocalizers + properties: + runningState: + type: integer + description: > + Running state + * 0 - not started + * 1 - idle + * 2 - running + * 3 - error + VORLocalizerActions: description: VORLocalizer properties: diff --git a/swagger/sdrangel/api/swagger/include/AFC.yaml b/swagger/sdrangel/api/swagger/include/AFC.yaml index 68d3fd0c8..4a88f4a95 100644 --- a/swagger/sdrangel/api/swagger/include/AFC.yaml +++ b/swagger/sdrangel/api/swagger/include/AFC.yaml @@ -48,6 +48,14 @@ AFCSettings: AFCReport: description: "AFC report" properties: + runningState: + type: integer + description: > + Running state + * 0 - not started + * 1 - idle + * 2 - running + * 3 - error trackerChannelIndex: description: Tracker index in device set type: integer diff --git a/swagger/sdrangel/api/swagger/include/FeatureReport.yaml b/swagger/sdrangel/api/swagger/include/FeatureReport.yaml index e0cea63d4..f9b74f849 100644 --- a/swagger/sdrangel/api/swagger/include/FeatureReport.yaml +++ b/swagger/sdrangel/api/swagger/include/FeatureReport.yaml @@ -9,7 +9,17 @@ FeatureReport: type: string AFCReport: $ref: "http://swgserver:8081/api/swagger/include/AFC.yaml#/AFCReport" - SimplePTTReport: - $ref: "http://swgserver:8081/api/swagger/include/SimplePTT.yaml#/SimplePTTReport" GS232ControllerReport: $ref: "http://swgserver:8081/api/swagger/include/GS232Controller.yaml#/GS232ControllerReport" + PERTesterReport: + $ref: "http://swgserver:8081/api/swagger/include/PERTester.yaml#/PERTesterReport" + RigCtlServerReport: + $ref: "http://swgserver:8081/api/swagger/include/RigCtlServer.yaml#/RigCtlServerReport" + SatelliteTrackerReport: + $ref: "http://swgserver:8081/api/swagger/include/SatelliteTracker.yaml#/SatelliteTrackerReport" + SimplePTTReport: + $ref: "http://swgserver:8081/api/swagger/include/SimplePTT.yaml#/SimplePTTReport" + StarTrackerReport: + $ref: "http://swgserver:8081/api/swagger/include/StarTracker.yaml#/StarTrackerReport" + VORLocalizerReport: + $ref: "http://swgserver:8081/api/swagger/include/VORLocalizer.yaml#/VORLocalizerReport" diff --git a/swagger/sdrangel/api/swagger/include/GS232Controller.yaml b/swagger/sdrangel/api/swagger/include/GS232Controller.yaml index 10282371d..c6374262e 100644 --- a/swagger/sdrangel/api/swagger/include/GS232Controller.yaml +++ b/swagger/sdrangel/api/swagger/include/GS232Controller.yaml @@ -65,6 +65,14 @@ GS232ControllerSettings: GS232ControllerReport: description: "GS-232 Controller report" properties: + runningState: + type: integer + description: > + Running state + * 0 - not started + * 1 - idle + * 2 - running + * 3 - error sources: description: Names of pipe sources type: array diff --git a/swagger/sdrangel/api/swagger/include/PERTester.yaml b/swagger/sdrangel/api/swagger/include/PERTester.yaml index f384f7c51..0747f06eb 100644 --- a/swagger/sdrangel/api/swagger/include/PERTester.yaml +++ b/swagger/sdrangel/api/swagger/include/PERTester.yaml @@ -49,6 +49,18 @@ PERTesterSettings: reverseAPIFeatureIndex: type: integer +PERTesterReport: + description: PERTester + properties: + runningState: + type: integer + description: > + Running state + * 0 - not started + * 1 - idle + * 2 - running + * 3 - error + PERTesterActions: description: PERTester properties: diff --git a/swagger/sdrangel/api/swagger/include/RigCtlServer.yaml b/swagger/sdrangel/api/swagger/include/RigCtlServer.yaml index ba531829b..2466a1434 100644 --- a/swagger/sdrangel/api/swagger/include/RigCtlServer.yaml +++ b/swagger/sdrangel/api/swagger/include/RigCtlServer.yaml @@ -34,6 +34,18 @@ RigCtlServerSettings: reverseAPIFeatureIndex: type: integer +RigCtlServerReport: + description: RigCtl server report + properties: + runningState: + type: integer + description: > + Running state + * 0 - not started + * 1 - idle + * 2 - running + * 3 - error + RigCtlServerActions: description: RigCtl server actions properties: diff --git a/swagger/sdrangel/api/swagger/include/SatelliteTracker.yaml b/swagger/sdrangel/api/swagger/include/SatelliteTracker.yaml index 9ec7f2d53..a6c75d9d0 100644 --- a/swagger/sdrangel/api/swagger/include/SatelliteTracker.yaml +++ b/swagger/sdrangel/api/swagger/include/SatelliteTracker.yaml @@ -166,6 +166,18 @@ SatelliteDeviceSettings: description: "Command to execute on LOS" type: string +SatelliteTrackerReport: + description: "Satellite Tracker report" + properties: + runningState: + type: integer + description: > + Running state + * 0 - not started + * 1 - idle + * 2 - running + * 3 - error + SatelliteTrackerActions: description: "Satellite Tracker actions" properties: diff --git a/swagger/sdrangel/api/swagger/include/SimplePTT.yaml b/swagger/sdrangel/api/swagger/include/SimplePTT.yaml index 3cecb876d..d8fe6fd35 100644 --- a/swagger/sdrangel/api/swagger/include/SimplePTT.yaml +++ b/swagger/sdrangel/api/swagger/include/SimplePTT.yaml @@ -32,6 +32,14 @@ SimplePTTSettings: SimplePTTReport: description: "Simple PTT report" properties: + runningState: + type: integer + description: > + Running state + * 0 - not started + * 1 - idle + * 2 - running + * 3 - error ptt: type: integer description: > diff --git a/swagger/sdrangel/api/swagger/include/StarTracker.yaml b/swagger/sdrangel/api/swagger/include/StarTracker.yaml index f7876bfa7..908d43df0 100644 --- a/swagger/sdrangel/api/swagger/include/StarTracker.yaml +++ b/swagger/sdrangel/api/swagger/include/StarTracker.yaml @@ -202,6 +202,18 @@ StarTrackerDisplayLoSSettings: type: number format: float +StarTrackerReport: + description: RigCtl server report + properties: + runningState: + type: integer + description: > + Running state + * 0 - not started + * 1 - idle + * 2 - running + * 3 - error + StarTrackerActions: description: "Star Tracker actions" properties: diff --git a/swagger/sdrangel/api/swagger/include/VORLocalizer.yaml b/swagger/sdrangel/api/swagger/include/VORLocalizer.yaml index b4dcaef85..ea708fadb 100644 --- a/swagger/sdrangel/api/swagger/include/VORLocalizer.yaml +++ b/swagger/sdrangel/api/swagger/include/VORLocalizer.yaml @@ -32,6 +32,18 @@ VORLocalizerSettings: description: Shift of center frequency in Hz type: integer +VORLocalizerReport: + description: VORLocalizers + properties: + runningState: + type: integer + description: > + Running state + * 0 - not started + * 1 - idle + * 2 - running + * 3 - error + VORLocalizerActions: description: VORLocalizer properties: diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index e973c98ff..952385dcb 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -796,6 +796,10 @@ margin-bottom: 20px; }; defs.AFCReport = { "properties" : { + "runningState" : { + "type" : "integer", + "description" : "Running state\n * 0 - not started\n * 1 - idle\n * 2 - running\n * 3 - error\n" + }, "trackerChannelIndex" : { "type" : "integer", "description" : "Tracker index in device set" @@ -4947,11 +4951,26 @@ margin-bottom: 20px; "AFCReport" : { "$ref" : "#/definitions/AFCReport" }, + "GS232ControllerReport" : { + "$ref" : "#/definitions/GS232ControllerReport" + }, + "PERTesterReport" : { + "$ref" : "#/definitions/PERTesterReport" + }, + "RigCtlServerReport" : { + "$ref" : "#/definitions/RigCtlServerReport" + }, + "SatelliteTrackerReport" : { + "$ref" : "#/definitions/SatelliteTrackerReport" + }, "SimplePTTReport" : { "$ref" : "#/definitions/SimplePTTReport" }, - "GS232ControllerReport" : { - "$ref" : "#/definitions/GS232ControllerReport" + "StarTrackerReport" : { + "$ref" : "#/definitions/StarTrackerReport" + }, + "VORLocalizerReport" : { + "$ref" : "#/definitions/VORLocalizerReport" } }, "description" : "Base feature report. Only the feature report corresponding to the feature specified in the featureType field is or should be present." @@ -5824,6 +5843,10 @@ margin-bottom: 20px; }; defs.GS232ControllerReport = { "properties" : { + "runningState" : { + "type" : "integer", + "description" : "Running state\n * 0 - not started\n * 1 - idle\n * 2 - running\n * 3 - error\n" + }, "sources" : { "type" : "array", "description" : "Names of pipe sources", @@ -7934,6 +7957,15 @@ margin-bottom: 20px; } }, "description" : "Acquisition of signal" +}; + defs.PERTesterReport = { + "properties" : { + "runningState" : { + "type" : "integer", + "description" : "Running state\n * 0 - not started\n * 1 - idle\n * 2 - running\n * 3 - error\n" + } + }, + "description" : "PERTester" }; defs.PERTesterSettings = { "properties" : { @@ -9613,6 +9645,15 @@ margin-bottom: 20px; } }, "description" : "RigCtl server actions" +}; + defs.RigCtlServerReport = { + "properties" : { + "runningState" : { + "type" : "integer", + "description" : "Running state\n * 0 - not started\n * 1 - idle\n * 2 - running\n * 3 - error\n" + } + }, + "description" : "RigCtl server report" }; defs.RigCtlServerSettings = { "properties" : { @@ -10289,6 +10330,15 @@ margin-bottom: 20px; } }, "description" : "Satellite Tracker actions" +}; + defs.SatelliteTrackerReport = { + "properties" : { + "runningState" : { + "type" : "integer", + "description" : "Running state\n * 0 - not started\n * 1 - idle\n * 2 - running\n * 3 - error\n" + } + }, + "description" : "Satellite Tracker report" }; defs.SatelliteTrackerSettings = { "properties" : { @@ -10698,6 +10748,10 @@ margin-bottom: 20px; }; defs.SimplePTTReport = { "properties" : { + "runningState" : { + "type" : "integer", + "description" : "Running state\n * 0 - not started\n * 1 - idle\n * 2 - running\n * 3 - error\n" + }, "ptt" : { "type" : "integer", "description" : "PTT status\n * 0 - released\n * 1 - engaged\n" @@ -11158,6 +11212,15 @@ margin-bottom: 20px; } }, "description" : "Settings to display in Star Tracker. Can be sent by other plugins to startracker.display message queue." +}; + defs.StarTrackerReport = { + "properties" : { + "runningState" : { + "type" : "integer", + "description" : "Running state\n * 0 - not started\n * 1 - idle\n * 2 - running\n * 3 - error\n" + } + }, + "description" : "RigCtl server report" }; defs.StarTrackerSettings = { "properties" : { @@ -12383,6 +12446,15 @@ margin-bottom: 20px; } }, "description" : "VORLocalizer" +}; + defs.VORLocalizerReport = { + "properties" : { + "runningState" : { + "type" : "integer", + "description" : "Running state\n * 0 - not started\n * 1 - idle\n * 2 - running\n * 3 - error\n" + } + }, + "description" : "VORLocalizers" }; defs.VORLocalizerSettings = { "properties" : { @@ -51090,7 +51162,7 @@ except ApiException as e:
- Generated 2021-10-22T01:02:48.375+02:00 + Generated 2021-10-23T19:53:41.859+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGAFCReport.cpp b/swagger/sdrangel/code/qt5/client/SWGAFCReport.cpp index fac7dffbc..a4b2a564f 100644 --- a/swagger/sdrangel/code/qt5/client/SWGAFCReport.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGAFCReport.cpp @@ -28,6 +28,8 @@ SWGAFCReport::SWGAFCReport(QString* json) { } SWGAFCReport::SWGAFCReport() { + running_state = 0; + m_running_state_isSet = false; tracker_channel_index = 0; m_tracker_channel_index_isSet = false; tracker_device_frequency = 0L; @@ -42,6 +44,8 @@ SWGAFCReport::~SWGAFCReport() { void SWGAFCReport::init() { + running_state = 0; + m_running_state_isSet = false; tracker_channel_index = 0; m_tracker_channel_index_isSet = false; tracker_device_frequency = 0L; @@ -55,6 +59,7 @@ SWGAFCReport::cleanup() { + } SWGAFCReport* @@ -68,6 +73,8 @@ SWGAFCReport::fromJson(QString &json) { void SWGAFCReport::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&running_state, pJson["runningState"], "qint32", ""); + ::SWGSDRangel::setValue(&tracker_channel_index, pJson["trackerChannelIndex"], "qint32", ""); ::SWGSDRangel::setValue(&tracker_device_frequency, pJson["trackerDeviceFrequency"], "qint64", ""); @@ -90,6 +97,9 @@ SWGAFCReport::asJson () QJsonObject* SWGAFCReport::asJsonObject() { QJsonObject* obj = new QJsonObject(); + if(m_running_state_isSet){ + obj->insert("runningState", QJsonValue(running_state)); + } if(m_tracker_channel_index_isSet){ obj->insert("trackerChannelIndex", QJsonValue(tracker_channel_index)); } @@ -103,6 +113,16 @@ SWGAFCReport::asJsonObject() { return obj; } +qint32 +SWGAFCReport::getRunningState() { + return running_state; +} +void +SWGAFCReport::setRunningState(qint32 running_state) { + this->running_state = running_state; + this->m_running_state_isSet = true; +} + qint32 SWGAFCReport::getTrackerChannelIndex() { return tracker_channel_index; @@ -138,6 +158,9 @@ bool SWGAFCReport::isSet(){ bool isObjectUpdated = false; do{ + if(m_running_state_isSet){ + isObjectUpdated = true; break; + } if(m_tracker_channel_index_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGAFCReport.h b/swagger/sdrangel/code/qt5/client/SWGAFCReport.h index 7352b3aba..7633e5c31 100644 --- a/swagger/sdrangel/code/qt5/client/SWGAFCReport.h +++ b/swagger/sdrangel/code/qt5/client/SWGAFCReport.h @@ -41,6 +41,9 @@ public: virtual void fromJsonObject(QJsonObject &json) override; virtual SWGAFCReport* fromJson(QString &jsonString) override; + qint32 getRunningState(); + void setRunningState(qint32 running_state); + qint32 getTrackerChannelIndex(); void setTrackerChannelIndex(qint32 tracker_channel_index); @@ -54,6 +57,9 @@ public: virtual bool isSet() override; private: + qint32 running_state; + bool m_running_state_isSet; + qint32 tracker_channel_index; bool m_tracker_channel_index_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGFeatureReport.cpp b/swagger/sdrangel/code/qt5/client/SWGFeatureReport.cpp index 5e8e695c2..919ec8b20 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFeatureReport.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGFeatureReport.cpp @@ -32,10 +32,20 @@ SWGFeatureReport::SWGFeatureReport() { m_feature_type_isSet = false; afc_report = nullptr; m_afc_report_isSet = false; - simple_ptt_report = nullptr; - m_simple_ptt_report_isSet = false; gs232_controller_report = nullptr; m_gs232_controller_report_isSet = false; + per_tester_report = nullptr; + m_per_tester_report_isSet = false; + rig_ctl_server_report = nullptr; + m_rig_ctl_server_report_isSet = false; + satellite_tracker_report = nullptr; + m_satellite_tracker_report_isSet = false; + simple_ptt_report = nullptr; + m_simple_ptt_report_isSet = false; + star_tracker_report = nullptr; + m_star_tracker_report_isSet = false; + vor_localizer_report = nullptr; + m_vor_localizer_report_isSet = false; } SWGFeatureReport::~SWGFeatureReport() { @@ -48,10 +58,20 @@ SWGFeatureReport::init() { m_feature_type_isSet = false; afc_report = new SWGAFCReport(); m_afc_report_isSet = false; - simple_ptt_report = new SWGSimplePTTReport(); - m_simple_ptt_report_isSet = false; gs232_controller_report = new SWGGS232ControllerReport(); m_gs232_controller_report_isSet = false; + per_tester_report = new SWGPERTesterReport(); + m_per_tester_report_isSet = false; + rig_ctl_server_report = new SWGRigCtlServerReport(); + m_rig_ctl_server_report_isSet = false; + satellite_tracker_report = new SWGSatelliteTrackerReport(); + m_satellite_tracker_report_isSet = false; + simple_ptt_report = new SWGSimplePTTReport(); + m_simple_ptt_report_isSet = false; + star_tracker_report = new SWGStarTrackerReport(); + m_star_tracker_report_isSet = false; + vor_localizer_report = new SWGVORLocalizerReport(); + m_vor_localizer_report_isSet = false; } void @@ -62,11 +82,26 @@ SWGFeatureReport::cleanup() { if(afc_report != nullptr) { delete afc_report; } + if(gs232_controller_report != nullptr) { + delete gs232_controller_report; + } + if(per_tester_report != nullptr) { + delete per_tester_report; + } + if(rig_ctl_server_report != nullptr) { + delete rig_ctl_server_report; + } + if(satellite_tracker_report != nullptr) { + delete satellite_tracker_report; + } if(simple_ptt_report != nullptr) { delete simple_ptt_report; } - if(gs232_controller_report != nullptr) { - delete gs232_controller_report; + if(star_tracker_report != nullptr) { + delete star_tracker_report; + } + if(vor_localizer_report != nullptr) { + delete vor_localizer_report; } } @@ -85,9 +120,19 @@ SWGFeatureReport::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&afc_report, pJson["AFCReport"], "SWGAFCReport", "SWGAFCReport"); + ::SWGSDRangel::setValue(&gs232_controller_report, pJson["GS232ControllerReport"], "SWGGS232ControllerReport", "SWGGS232ControllerReport"); + + ::SWGSDRangel::setValue(&per_tester_report, pJson["PERTesterReport"], "SWGPERTesterReport", "SWGPERTesterReport"); + + ::SWGSDRangel::setValue(&rig_ctl_server_report, pJson["RigCtlServerReport"], "SWGRigCtlServerReport", "SWGRigCtlServerReport"); + + ::SWGSDRangel::setValue(&satellite_tracker_report, pJson["SatelliteTrackerReport"], "SWGSatelliteTrackerReport", "SWGSatelliteTrackerReport"); + ::SWGSDRangel::setValue(&simple_ptt_report, pJson["SimplePTTReport"], "SWGSimplePTTReport", "SWGSimplePTTReport"); - ::SWGSDRangel::setValue(&gs232_controller_report, pJson["GS232ControllerReport"], "SWGGS232ControllerReport", "SWGGS232ControllerReport"); + ::SWGSDRangel::setValue(&star_tracker_report, pJson["StarTrackerReport"], "SWGStarTrackerReport", "SWGStarTrackerReport"); + + ::SWGSDRangel::setValue(&vor_localizer_report, pJson["VORLocalizerReport"], "SWGVORLocalizerReport", "SWGVORLocalizerReport"); } @@ -111,11 +156,26 @@ SWGFeatureReport::asJsonObject() { if((afc_report != nullptr) && (afc_report->isSet())){ toJsonValue(QString("AFCReport"), afc_report, obj, QString("SWGAFCReport")); } + if((gs232_controller_report != nullptr) && (gs232_controller_report->isSet())){ + toJsonValue(QString("GS232ControllerReport"), gs232_controller_report, obj, QString("SWGGS232ControllerReport")); + } + if((per_tester_report != nullptr) && (per_tester_report->isSet())){ + toJsonValue(QString("PERTesterReport"), per_tester_report, obj, QString("SWGPERTesterReport")); + } + if((rig_ctl_server_report != nullptr) && (rig_ctl_server_report->isSet())){ + toJsonValue(QString("RigCtlServerReport"), rig_ctl_server_report, obj, QString("SWGRigCtlServerReport")); + } + if((satellite_tracker_report != nullptr) && (satellite_tracker_report->isSet())){ + toJsonValue(QString("SatelliteTrackerReport"), satellite_tracker_report, obj, QString("SWGSatelliteTrackerReport")); + } if((simple_ptt_report != nullptr) && (simple_ptt_report->isSet())){ toJsonValue(QString("SimplePTTReport"), simple_ptt_report, obj, QString("SWGSimplePTTReport")); } - if((gs232_controller_report != nullptr) && (gs232_controller_report->isSet())){ - toJsonValue(QString("GS232ControllerReport"), gs232_controller_report, obj, QString("SWGGS232ControllerReport")); + if((star_tracker_report != nullptr) && (star_tracker_report->isSet())){ + toJsonValue(QString("StarTrackerReport"), star_tracker_report, obj, QString("SWGStarTrackerReport")); + } + if((vor_localizer_report != nullptr) && (vor_localizer_report->isSet())){ + toJsonValue(QString("VORLocalizerReport"), vor_localizer_report, obj, QString("SWGVORLocalizerReport")); } return obj; @@ -141,6 +201,46 @@ SWGFeatureReport::setAfcReport(SWGAFCReport* afc_report) { this->m_afc_report_isSet = true; } +SWGGS232ControllerReport* +SWGFeatureReport::getGs232ControllerReport() { + return gs232_controller_report; +} +void +SWGFeatureReport::setGs232ControllerReport(SWGGS232ControllerReport* gs232_controller_report) { + this->gs232_controller_report = gs232_controller_report; + this->m_gs232_controller_report_isSet = true; +} + +SWGPERTesterReport* +SWGFeatureReport::getPerTesterReport() { + return per_tester_report; +} +void +SWGFeatureReport::setPerTesterReport(SWGPERTesterReport* per_tester_report) { + this->per_tester_report = per_tester_report; + this->m_per_tester_report_isSet = true; +} + +SWGRigCtlServerReport* +SWGFeatureReport::getRigCtlServerReport() { + return rig_ctl_server_report; +} +void +SWGFeatureReport::setRigCtlServerReport(SWGRigCtlServerReport* rig_ctl_server_report) { + this->rig_ctl_server_report = rig_ctl_server_report; + this->m_rig_ctl_server_report_isSet = true; +} + +SWGSatelliteTrackerReport* +SWGFeatureReport::getSatelliteTrackerReport() { + return satellite_tracker_report; +} +void +SWGFeatureReport::setSatelliteTrackerReport(SWGSatelliteTrackerReport* satellite_tracker_report) { + this->satellite_tracker_report = satellite_tracker_report; + this->m_satellite_tracker_report_isSet = true; +} + SWGSimplePTTReport* SWGFeatureReport::getSimplePttReport() { return simple_ptt_report; @@ -151,14 +251,24 @@ SWGFeatureReport::setSimplePttReport(SWGSimplePTTReport* simple_ptt_report) { this->m_simple_ptt_report_isSet = true; } -SWGGS232ControllerReport* -SWGFeatureReport::getGs232ControllerReport() { - return gs232_controller_report; +SWGStarTrackerReport* +SWGFeatureReport::getStarTrackerReport() { + return star_tracker_report; } void -SWGFeatureReport::setGs232ControllerReport(SWGGS232ControllerReport* gs232_controller_report) { - this->gs232_controller_report = gs232_controller_report; - this->m_gs232_controller_report_isSet = true; +SWGFeatureReport::setStarTrackerReport(SWGStarTrackerReport* star_tracker_report) { + this->star_tracker_report = star_tracker_report; + this->m_star_tracker_report_isSet = true; +} + +SWGVORLocalizerReport* +SWGFeatureReport::getVorLocalizerReport() { + return vor_localizer_report; +} +void +SWGFeatureReport::setVorLocalizerReport(SWGVORLocalizerReport* vor_localizer_report) { + this->vor_localizer_report = vor_localizer_report; + this->m_vor_localizer_report_isSet = true; } @@ -172,10 +282,25 @@ SWGFeatureReport::isSet(){ if(afc_report && afc_report->isSet()){ isObjectUpdated = true; break; } + if(gs232_controller_report && gs232_controller_report->isSet()){ + isObjectUpdated = true; break; + } + if(per_tester_report && per_tester_report->isSet()){ + isObjectUpdated = true; break; + } + if(rig_ctl_server_report && rig_ctl_server_report->isSet()){ + isObjectUpdated = true; break; + } + if(satellite_tracker_report && satellite_tracker_report->isSet()){ + isObjectUpdated = true; break; + } if(simple_ptt_report && simple_ptt_report->isSet()){ isObjectUpdated = true; break; } - if(gs232_controller_report && gs232_controller_report->isSet()){ + if(star_tracker_report && star_tracker_report->isSet()){ + isObjectUpdated = true; break; + } + if(vor_localizer_report && vor_localizer_report->isSet()){ isObjectUpdated = true; break; } }while(false); diff --git a/swagger/sdrangel/code/qt5/client/SWGFeatureReport.h b/swagger/sdrangel/code/qt5/client/SWGFeatureReport.h index b5cdea96f..4e833a729 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFeatureReport.h +++ b/swagger/sdrangel/code/qt5/client/SWGFeatureReport.h @@ -24,7 +24,12 @@ #include "SWGAFCReport.h" #include "SWGGS232ControllerReport.h" +#include "SWGPERTesterReport.h" +#include "SWGRigCtlServerReport.h" +#include "SWGSatelliteTrackerReport.h" #include "SWGSimplePTTReport.h" +#include "SWGStarTrackerReport.h" +#include "SWGVORLocalizerReport.h" #include #include "SWGObject.h" @@ -51,11 +56,26 @@ public: SWGAFCReport* getAfcReport(); void setAfcReport(SWGAFCReport* afc_report); + SWGGS232ControllerReport* getGs232ControllerReport(); + void setGs232ControllerReport(SWGGS232ControllerReport* gs232_controller_report); + + SWGPERTesterReport* getPerTesterReport(); + void setPerTesterReport(SWGPERTesterReport* per_tester_report); + + SWGRigCtlServerReport* getRigCtlServerReport(); + void setRigCtlServerReport(SWGRigCtlServerReport* rig_ctl_server_report); + + SWGSatelliteTrackerReport* getSatelliteTrackerReport(); + void setSatelliteTrackerReport(SWGSatelliteTrackerReport* satellite_tracker_report); + SWGSimplePTTReport* getSimplePttReport(); void setSimplePttReport(SWGSimplePTTReport* simple_ptt_report); - SWGGS232ControllerReport* getGs232ControllerReport(); - void setGs232ControllerReport(SWGGS232ControllerReport* gs232_controller_report); + SWGStarTrackerReport* getStarTrackerReport(); + void setStarTrackerReport(SWGStarTrackerReport* star_tracker_report); + + SWGVORLocalizerReport* getVorLocalizerReport(); + void setVorLocalizerReport(SWGVORLocalizerReport* vor_localizer_report); virtual bool isSet() override; @@ -67,11 +87,26 @@ private: SWGAFCReport* afc_report; bool m_afc_report_isSet; + SWGGS232ControllerReport* gs232_controller_report; + bool m_gs232_controller_report_isSet; + + SWGPERTesterReport* per_tester_report; + bool m_per_tester_report_isSet; + + SWGRigCtlServerReport* rig_ctl_server_report; + bool m_rig_ctl_server_report_isSet; + + SWGSatelliteTrackerReport* satellite_tracker_report; + bool m_satellite_tracker_report_isSet; + SWGSimplePTTReport* simple_ptt_report; bool m_simple_ptt_report_isSet; - SWGGS232ControllerReport* gs232_controller_report; - bool m_gs232_controller_report_isSet; + SWGStarTrackerReport* star_tracker_report; + bool m_star_tracker_report_isSet; + + SWGVORLocalizerReport* vor_localizer_report; + bool m_vor_localizer_report_isSet; }; diff --git a/swagger/sdrangel/code/qt5/client/SWGGS232ControllerReport.cpp b/swagger/sdrangel/code/qt5/client/SWGGS232ControllerReport.cpp index 322d7c20f..4c26c9600 100644 --- a/swagger/sdrangel/code/qt5/client/SWGGS232ControllerReport.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGGS232ControllerReport.cpp @@ -28,6 +28,8 @@ SWGGS232ControllerReport::SWGGS232ControllerReport(QString* json) { } SWGGS232ControllerReport::SWGGS232ControllerReport() { + running_state = 0; + m_running_state_isSet = false; sources = nullptr; m_sources_isSet = false; serial_ports = nullptr; @@ -50,6 +52,8 @@ SWGGS232ControllerReport::~SWGGS232ControllerReport() { void SWGGS232ControllerReport::init() { + running_state = 0; + m_running_state_isSet = false; sources = new QList(); m_sources_isSet = false; serial_ports = new QList(); @@ -68,6 +72,7 @@ SWGGS232ControllerReport::init() { void SWGGS232ControllerReport::cleanup() { + if(sources != nullptr) { auto arr = sources; for(auto o: *arr) { @@ -100,6 +105,8 @@ SWGGS232ControllerReport::fromJson(QString &json) { void SWGGS232ControllerReport::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&running_state, pJson["runningState"], "qint32", ""); + ::SWGSDRangel::setValue(&sources, pJson["sources"], "QList", "QString"); @@ -130,6 +137,9 @@ SWGGS232ControllerReport::asJson () QJsonObject* SWGGS232ControllerReport::asJsonObject() { QJsonObject* obj = new QJsonObject(); + if(m_running_state_isSet){ + obj->insert("runningState", QJsonValue(running_state)); + } if(sources && sources->size() > 0){ toJsonArray((QList*)sources, obj, "sources", "QString"); } @@ -155,6 +165,16 @@ SWGGS232ControllerReport::asJsonObject() { return obj; } +qint32 +SWGGS232ControllerReport::getRunningState() { + return running_state; +} +void +SWGGS232ControllerReport::setRunningState(qint32 running_state) { + this->running_state = running_state; + this->m_running_state_isSet = true; +} + QList* SWGGS232ControllerReport::getSources() { return sources; @@ -230,6 +250,9 @@ bool SWGGS232ControllerReport::isSet(){ bool isObjectUpdated = false; do{ + if(m_running_state_isSet){ + isObjectUpdated = true; break; + } if(sources && (sources->size() > 0)){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGGS232ControllerReport.h b/swagger/sdrangel/code/qt5/client/SWGGS232ControllerReport.h index 03699bdd9..4b4d4d301 100644 --- a/swagger/sdrangel/code/qt5/client/SWGGS232ControllerReport.h +++ b/swagger/sdrangel/code/qt5/client/SWGGS232ControllerReport.h @@ -43,6 +43,9 @@ public: virtual void fromJsonObject(QJsonObject &json) override; virtual SWGGS232ControllerReport* fromJson(QString &jsonString) override; + qint32 getRunningState(); + void setRunningState(qint32 running_state); + QList* getSources(); void setSources(QList* sources); @@ -68,6 +71,9 @@ public: virtual bool isSet() override; private: + qint32 running_state; + bool m_running_state_isSet; + QList* sources; bool m_sources_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h index c76530fa3..57d1c749f 100644 --- a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h +++ b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h @@ -184,6 +184,7 @@ #include "SWGNoiseFigureSettings.h" #include "SWGPERTesterActions.h" #include "SWGPERTesterActions_aos.h" +#include "SWGPERTesterReport.h" #include "SWGPERTesterSettings.h" #include "SWGPacketDemodSettings.h" #include "SWGPacketModActions.h" @@ -226,6 +227,7 @@ #include "SWGRemoteSourceReport.h" #include "SWGRemoteSourceSettings.h" #include "SWGRigCtlServerActions.h" +#include "SWGRigCtlServerReport.h" #include "SWGRigCtlServerSettings.h" #include "SWGRtlSdrReport.h" #include "SWGRtlSdrSettings.h" @@ -242,6 +244,7 @@ #include "SWGSatelliteDeviceSettings.h" #include "SWGSatelliteDeviceSettingsList.h" #include "SWGSatelliteTrackerActions.h" +#include "SWGSatelliteTrackerReport.h" #include "SWGSatelliteTrackerSettings.h" #include "SWGSigMFFileInputActions.h" #include "SWGSigMFFileInputReport.h" @@ -264,6 +267,7 @@ #include "SWGStarTrackerDisplayLoSSettings_2.h" #include "SWGStarTrackerDisplaySettings.h" #include "SWGStarTrackerDisplaySettings_2.h" +#include "SWGStarTrackerReport.h" #include "SWGStarTrackerSettings.h" #include "SWGStarTrackerTarget.h" #include "SWGStarTrackerTarget_2.h" @@ -288,6 +292,7 @@ #include "SWGVORDemodSCSettings.h" #include "SWGVORDemodSettings.h" #include "SWGVORLocalizerActions.h" +#include "SWGVORLocalizerReport.h" #include "SWGVORLocalizerSettings.h" #include "SWGWFMDemodReport.h" #include "SWGWFMDemodSettings.h" @@ -1153,6 +1158,11 @@ namespace SWGSDRangel { obj->init(); return obj; } + if(QString("SWGPERTesterReport").compare(type) == 0) { + SWGPERTesterReport *obj = new SWGPERTesterReport(); + obj->init(); + return obj; + } if(QString("SWGPERTesterSettings").compare(type) == 0) { SWGPERTesterSettings *obj = new SWGPERTesterSettings(); obj->init(); @@ -1363,6 +1373,11 @@ namespace SWGSDRangel { obj->init(); return obj; } + if(QString("SWGRigCtlServerReport").compare(type) == 0) { + SWGRigCtlServerReport *obj = new SWGRigCtlServerReport(); + obj->init(); + return obj; + } if(QString("SWGRigCtlServerSettings").compare(type) == 0) { SWGRigCtlServerSettings *obj = new SWGRigCtlServerSettings(); obj->init(); @@ -1443,6 +1458,11 @@ namespace SWGSDRangel { obj->init(); return obj; } + if(QString("SWGSatelliteTrackerReport").compare(type) == 0) { + SWGSatelliteTrackerReport *obj = new SWGSatelliteTrackerReport(); + obj->init(); + return obj; + } if(QString("SWGSatelliteTrackerSettings").compare(type) == 0) { SWGSatelliteTrackerSettings *obj = new SWGSatelliteTrackerSettings(); obj->init(); @@ -1553,6 +1573,11 @@ namespace SWGSDRangel { obj->init(); return obj; } + if(QString("SWGStarTrackerReport").compare(type) == 0) { + SWGStarTrackerReport *obj = new SWGStarTrackerReport(); + obj->init(); + return obj; + } if(QString("SWGStarTrackerSettings").compare(type) == 0) { SWGStarTrackerSettings *obj = new SWGStarTrackerSettings(); obj->init(); @@ -1673,6 +1698,11 @@ namespace SWGSDRangel { obj->init(); return obj; } + if(QString("SWGVORLocalizerReport").compare(type) == 0) { + SWGVORLocalizerReport *obj = new SWGVORLocalizerReport(); + obj->init(); + return obj; + } if(QString("SWGVORLocalizerSettings").compare(type) == 0) { SWGVORLocalizerSettings *obj = new SWGVORLocalizerSettings(); obj->init(); diff --git a/swagger/sdrangel/code/qt5/client/SWGPERTesterReport.cpp b/swagger/sdrangel/code/qt5/client/SWGPERTesterReport.cpp new file mode 100644 index 000000000..261c6a2cd --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGPERTesterReport.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 "SWGPERTesterReport.h" + +#include "SWGHelpers.h" + +#include +#include +#include +#include + +namespace SWGSDRangel { + +SWGPERTesterReport::SWGPERTesterReport(QString* json) { + init(); + this->fromJson(*json); +} + +SWGPERTesterReport::SWGPERTesterReport() { + running_state = 0; + m_running_state_isSet = false; +} + +SWGPERTesterReport::~SWGPERTesterReport() { + this->cleanup(); +} + +void +SWGPERTesterReport::init() { + running_state = 0; + m_running_state_isSet = false; +} + +void +SWGPERTesterReport::cleanup() { + +} + +SWGPERTesterReport* +SWGPERTesterReport::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; +} + +void +SWGPERTesterReport::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&running_state, pJson["runningState"], "qint32", ""); + +} + +QString +SWGPERTesterReport::asJson () +{ + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + delete obj; + return QString(bytes); +} + +QJsonObject* +SWGPERTesterReport::asJsonObject() { + QJsonObject* obj = new QJsonObject(); + if(m_running_state_isSet){ + obj->insert("runningState", QJsonValue(running_state)); + } + + return obj; +} + +qint32 +SWGPERTesterReport::getRunningState() { + return running_state; +} +void +SWGPERTesterReport::setRunningState(qint32 running_state) { + this->running_state = running_state; + this->m_running_state_isSet = true; +} + + +bool +SWGPERTesterReport::isSet(){ + bool isObjectUpdated = false; + do{ + if(m_running_state_isSet){ + isObjectUpdated = true; break; + } + }while(false); + return isObjectUpdated; +} +} + diff --git a/swagger/sdrangel/code/qt5/client/SWGPERTesterReport.h b/swagger/sdrangel/code/qt5/client/SWGPERTesterReport.h new file mode 100644 index 000000000..838058ca4 --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGPERTesterReport.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. + */ + +/* + * SWGPERTesterReport.h + * + * PERTester + */ + +#ifndef SWGPERTesterReport_H_ +#define SWGPERTesterReport_H_ + +#include + + + +#include "SWGObject.h" +#include "export.h" + +namespace SWGSDRangel { + +class SWG_API SWGPERTesterReport: public SWGObject { +public: + SWGPERTesterReport(); + SWGPERTesterReport(QString* json); + virtual ~SWGPERTesterReport(); + void init(); + void cleanup(); + + virtual QString asJson () override; + virtual QJsonObject* asJsonObject() override; + virtual void fromJsonObject(QJsonObject &json) override; + virtual SWGPERTesterReport* fromJson(QString &jsonString) override; + + qint32 getRunningState(); + void setRunningState(qint32 running_state); + + + virtual bool isSet() override; + +private: + qint32 running_state; + bool m_running_state_isSet; + +}; + +} + +#endif /* SWGPERTesterReport_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGRigCtlServerReport.cpp b/swagger/sdrangel/code/qt5/client/SWGRigCtlServerReport.cpp new file mode 100644 index 000000000..1e9750594 --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGRigCtlServerReport.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 "SWGRigCtlServerReport.h" + +#include "SWGHelpers.h" + +#include +#include +#include +#include + +namespace SWGSDRangel { + +SWGRigCtlServerReport::SWGRigCtlServerReport(QString* json) { + init(); + this->fromJson(*json); +} + +SWGRigCtlServerReport::SWGRigCtlServerReport() { + running_state = 0; + m_running_state_isSet = false; +} + +SWGRigCtlServerReport::~SWGRigCtlServerReport() { + this->cleanup(); +} + +void +SWGRigCtlServerReport::init() { + running_state = 0; + m_running_state_isSet = false; +} + +void +SWGRigCtlServerReport::cleanup() { + +} + +SWGRigCtlServerReport* +SWGRigCtlServerReport::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; +} + +void +SWGRigCtlServerReport::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&running_state, pJson["runningState"], "qint32", ""); + +} + +QString +SWGRigCtlServerReport::asJson () +{ + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + delete obj; + return QString(bytes); +} + +QJsonObject* +SWGRigCtlServerReport::asJsonObject() { + QJsonObject* obj = new QJsonObject(); + if(m_running_state_isSet){ + obj->insert("runningState", QJsonValue(running_state)); + } + + return obj; +} + +qint32 +SWGRigCtlServerReport::getRunningState() { + return running_state; +} +void +SWGRigCtlServerReport::setRunningState(qint32 running_state) { + this->running_state = running_state; + this->m_running_state_isSet = true; +} + + +bool +SWGRigCtlServerReport::isSet(){ + bool isObjectUpdated = false; + do{ + if(m_running_state_isSet){ + isObjectUpdated = true; break; + } + }while(false); + return isObjectUpdated; +} +} + diff --git a/swagger/sdrangel/code/qt5/client/SWGRigCtlServerReport.h b/swagger/sdrangel/code/qt5/client/SWGRigCtlServerReport.h new file mode 100644 index 000000000..facad0b97 --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGRigCtlServerReport.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. + */ + +/* + * SWGRigCtlServerReport.h + * + * RigCtl server report + */ + +#ifndef SWGRigCtlServerReport_H_ +#define SWGRigCtlServerReport_H_ + +#include + + + +#include "SWGObject.h" +#include "export.h" + +namespace SWGSDRangel { + +class SWG_API SWGRigCtlServerReport: public SWGObject { +public: + SWGRigCtlServerReport(); + SWGRigCtlServerReport(QString* json); + virtual ~SWGRigCtlServerReport(); + void init(); + void cleanup(); + + virtual QString asJson () override; + virtual QJsonObject* asJsonObject() override; + virtual void fromJsonObject(QJsonObject &json) override; + virtual SWGRigCtlServerReport* fromJson(QString &jsonString) override; + + qint32 getRunningState(); + void setRunningState(qint32 running_state); + + + virtual bool isSet() override; + +private: + qint32 running_state; + bool m_running_state_isSet; + +}; + +} + +#endif /* SWGRigCtlServerReport_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerReport.cpp b/swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerReport.cpp new file mode 100644 index 000000000..8f9cbf8f4 --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerReport.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 "SWGSatelliteTrackerReport.h" + +#include "SWGHelpers.h" + +#include +#include +#include +#include + +namespace SWGSDRangel { + +SWGSatelliteTrackerReport::SWGSatelliteTrackerReport(QString* json) { + init(); + this->fromJson(*json); +} + +SWGSatelliteTrackerReport::SWGSatelliteTrackerReport() { + running_state = 0; + m_running_state_isSet = false; +} + +SWGSatelliteTrackerReport::~SWGSatelliteTrackerReport() { + this->cleanup(); +} + +void +SWGSatelliteTrackerReport::init() { + running_state = 0; + m_running_state_isSet = false; +} + +void +SWGSatelliteTrackerReport::cleanup() { + +} + +SWGSatelliteTrackerReport* +SWGSatelliteTrackerReport::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; +} + +void +SWGSatelliteTrackerReport::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&running_state, pJson["runningState"], "qint32", ""); + +} + +QString +SWGSatelliteTrackerReport::asJson () +{ + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + delete obj; + return QString(bytes); +} + +QJsonObject* +SWGSatelliteTrackerReport::asJsonObject() { + QJsonObject* obj = new QJsonObject(); + if(m_running_state_isSet){ + obj->insert("runningState", QJsonValue(running_state)); + } + + return obj; +} + +qint32 +SWGSatelliteTrackerReport::getRunningState() { + return running_state; +} +void +SWGSatelliteTrackerReport::setRunningState(qint32 running_state) { + this->running_state = running_state; + this->m_running_state_isSet = true; +} + + +bool +SWGSatelliteTrackerReport::isSet(){ + bool isObjectUpdated = false; + do{ + if(m_running_state_isSet){ + isObjectUpdated = true; break; + } + }while(false); + return isObjectUpdated; +} +} + diff --git a/swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerReport.h b/swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerReport.h new file mode 100644 index 000000000..71f8f3969 --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGSatelliteTrackerReport.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. + */ + +/* + * SWGSatelliteTrackerReport.h + * + * Satellite Tracker report + */ + +#ifndef SWGSatelliteTrackerReport_H_ +#define SWGSatelliteTrackerReport_H_ + +#include + + + +#include "SWGObject.h" +#include "export.h" + +namespace SWGSDRangel { + +class SWG_API SWGSatelliteTrackerReport: public SWGObject { +public: + SWGSatelliteTrackerReport(); + SWGSatelliteTrackerReport(QString* json); + virtual ~SWGSatelliteTrackerReport(); + void init(); + void cleanup(); + + virtual QString asJson () override; + virtual QJsonObject* asJsonObject() override; + virtual void fromJsonObject(QJsonObject &json) override; + virtual SWGSatelliteTrackerReport* fromJson(QString &jsonString) override; + + qint32 getRunningState(); + void setRunningState(qint32 running_state); + + + virtual bool isSet() override; + +private: + qint32 running_state; + bool m_running_state_isSet; + +}; + +} + +#endif /* SWGSatelliteTrackerReport_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGSimplePTTReport.cpp b/swagger/sdrangel/code/qt5/client/SWGSimplePTTReport.cpp index 6e8398488..84fd4b68a 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSimplePTTReport.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGSimplePTTReport.cpp @@ -28,6 +28,8 @@ SWGSimplePTTReport::SWGSimplePTTReport(QString* json) { } SWGSimplePTTReport::SWGSimplePTTReport() { + running_state = 0; + m_running_state_isSet = false; ptt = 0; m_ptt_isSet = false; } @@ -38,6 +40,8 @@ SWGSimplePTTReport::~SWGSimplePTTReport() { void SWGSimplePTTReport::init() { + running_state = 0; + m_running_state_isSet = false; ptt = 0; m_ptt_isSet = false; } @@ -45,6 +49,7 @@ SWGSimplePTTReport::init() { void SWGSimplePTTReport::cleanup() { + } SWGSimplePTTReport* @@ -58,6 +63,8 @@ SWGSimplePTTReport::fromJson(QString &json) { void SWGSimplePTTReport::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&running_state, pJson["runningState"], "qint32", ""); + ::SWGSDRangel::setValue(&ptt, pJson["ptt"], "qint32", ""); } @@ -76,6 +83,9 @@ SWGSimplePTTReport::asJson () QJsonObject* SWGSimplePTTReport::asJsonObject() { QJsonObject* obj = new QJsonObject(); + if(m_running_state_isSet){ + obj->insert("runningState", QJsonValue(running_state)); + } if(m_ptt_isSet){ obj->insert("ptt", QJsonValue(ptt)); } @@ -83,6 +93,16 @@ SWGSimplePTTReport::asJsonObject() { return obj; } +qint32 +SWGSimplePTTReport::getRunningState() { + return running_state; +} +void +SWGSimplePTTReport::setRunningState(qint32 running_state) { + this->running_state = running_state; + this->m_running_state_isSet = true; +} + qint32 SWGSimplePTTReport::getPtt() { return ptt; @@ -98,6 +118,9 @@ bool SWGSimplePTTReport::isSet(){ bool isObjectUpdated = false; do{ + if(m_running_state_isSet){ + isObjectUpdated = true; break; + } if(m_ptt_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSimplePTTReport.h b/swagger/sdrangel/code/qt5/client/SWGSimplePTTReport.h index 34f68205b..6e7d820c3 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSimplePTTReport.h +++ b/swagger/sdrangel/code/qt5/client/SWGSimplePTTReport.h @@ -41,6 +41,9 @@ public: virtual void fromJsonObject(QJsonObject &json) override; virtual SWGSimplePTTReport* fromJson(QString &jsonString) override; + qint32 getRunningState(); + void setRunningState(qint32 running_state); + qint32 getPtt(); void setPtt(qint32 ptt); @@ -48,6 +51,9 @@ public: virtual bool isSet() override; private: + qint32 running_state; + bool m_running_state_isSet; + qint32 ptt; bool m_ptt_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGStarTrackerReport.cpp b/swagger/sdrangel/code/qt5/client/SWGStarTrackerReport.cpp new file mode 100644 index 000000000..b83a95f0c --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGStarTrackerReport.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 "SWGStarTrackerReport.h" + +#include "SWGHelpers.h" + +#include +#include +#include +#include + +namespace SWGSDRangel { + +SWGStarTrackerReport::SWGStarTrackerReport(QString* json) { + init(); + this->fromJson(*json); +} + +SWGStarTrackerReport::SWGStarTrackerReport() { + running_state = 0; + m_running_state_isSet = false; +} + +SWGStarTrackerReport::~SWGStarTrackerReport() { + this->cleanup(); +} + +void +SWGStarTrackerReport::init() { + running_state = 0; + m_running_state_isSet = false; +} + +void +SWGStarTrackerReport::cleanup() { + +} + +SWGStarTrackerReport* +SWGStarTrackerReport::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; +} + +void +SWGStarTrackerReport::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&running_state, pJson["runningState"], "qint32", ""); + +} + +QString +SWGStarTrackerReport::asJson () +{ + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + delete obj; + return QString(bytes); +} + +QJsonObject* +SWGStarTrackerReport::asJsonObject() { + QJsonObject* obj = new QJsonObject(); + if(m_running_state_isSet){ + obj->insert("runningState", QJsonValue(running_state)); + } + + return obj; +} + +qint32 +SWGStarTrackerReport::getRunningState() { + return running_state; +} +void +SWGStarTrackerReport::setRunningState(qint32 running_state) { + this->running_state = running_state; + this->m_running_state_isSet = true; +} + + +bool +SWGStarTrackerReport::isSet(){ + bool isObjectUpdated = false; + do{ + if(m_running_state_isSet){ + isObjectUpdated = true; break; + } + }while(false); + return isObjectUpdated; +} +} + diff --git a/swagger/sdrangel/code/qt5/client/SWGStarTrackerReport.h b/swagger/sdrangel/code/qt5/client/SWGStarTrackerReport.h new file mode 100644 index 000000000..b3ea4bcbb --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGStarTrackerReport.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. + */ + +/* + * SWGStarTrackerReport.h + * + * RigCtl server report + */ + +#ifndef SWGStarTrackerReport_H_ +#define SWGStarTrackerReport_H_ + +#include + + + +#include "SWGObject.h" +#include "export.h" + +namespace SWGSDRangel { + +class SWG_API SWGStarTrackerReport: public SWGObject { +public: + SWGStarTrackerReport(); + SWGStarTrackerReport(QString* json); + virtual ~SWGStarTrackerReport(); + void init(); + void cleanup(); + + virtual QString asJson () override; + virtual QJsonObject* asJsonObject() override; + virtual void fromJsonObject(QJsonObject &json) override; + virtual SWGStarTrackerReport* fromJson(QString &jsonString) override; + + qint32 getRunningState(); + void setRunningState(qint32 running_state); + + + virtual bool isSet() override; + +private: + qint32 running_state; + bool m_running_state_isSet; + +}; + +} + +#endif /* SWGStarTrackerReport_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGVORLocalizerReport.cpp b/swagger/sdrangel/code/qt5/client/SWGVORLocalizerReport.cpp new file mode 100644 index 000000000..526408e87 --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGVORLocalizerReport.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 "SWGVORLocalizerReport.h" + +#include "SWGHelpers.h" + +#include +#include +#include +#include + +namespace SWGSDRangel { + +SWGVORLocalizerReport::SWGVORLocalizerReport(QString* json) { + init(); + this->fromJson(*json); +} + +SWGVORLocalizerReport::SWGVORLocalizerReport() { + running_state = 0; + m_running_state_isSet = false; +} + +SWGVORLocalizerReport::~SWGVORLocalizerReport() { + this->cleanup(); +} + +void +SWGVORLocalizerReport::init() { + running_state = 0; + m_running_state_isSet = false; +} + +void +SWGVORLocalizerReport::cleanup() { + +} + +SWGVORLocalizerReport* +SWGVORLocalizerReport::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; +} + +void +SWGVORLocalizerReport::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&running_state, pJson["runningState"], "qint32", ""); + +} + +QString +SWGVORLocalizerReport::asJson () +{ + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + delete obj; + return QString(bytes); +} + +QJsonObject* +SWGVORLocalizerReport::asJsonObject() { + QJsonObject* obj = new QJsonObject(); + if(m_running_state_isSet){ + obj->insert("runningState", QJsonValue(running_state)); + } + + return obj; +} + +qint32 +SWGVORLocalizerReport::getRunningState() { + return running_state; +} +void +SWGVORLocalizerReport::setRunningState(qint32 running_state) { + this->running_state = running_state; + this->m_running_state_isSet = true; +} + + +bool +SWGVORLocalizerReport::isSet(){ + bool isObjectUpdated = false; + do{ + if(m_running_state_isSet){ + isObjectUpdated = true; break; + } + }while(false); + return isObjectUpdated; +} +} + diff --git a/swagger/sdrangel/code/qt5/client/SWGVORLocalizerReport.h b/swagger/sdrangel/code/qt5/client/SWGVORLocalizerReport.h new file mode 100644 index 000000000..494364a68 --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGVORLocalizerReport.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. + */ + +/* + * SWGVORLocalizerReport.h + * + * VORLocalizers + */ + +#ifndef SWGVORLocalizerReport_H_ +#define SWGVORLocalizerReport_H_ + +#include + + + +#include "SWGObject.h" +#include "export.h" + +namespace SWGSDRangel { + +class SWG_API SWGVORLocalizerReport: public SWGObject { +public: + SWGVORLocalizerReport(); + SWGVORLocalizerReport(QString* json); + virtual ~SWGVORLocalizerReport(); + void init(); + void cleanup(); + + virtual QString asJson () override; + virtual QJsonObject* asJsonObject() override; + virtual void fromJsonObject(QJsonObject &json) override; + virtual SWGVORLocalizerReport* fromJson(QString &jsonString) override; + + qint32 getRunningState(); + void setRunningState(qint32 running_state); + + + virtual bool isSet() override; + +private: + qint32 running_state; + bool m_running_state_isSet; + +}; + +} + +#endif /* SWGVORLocalizerReport_H_ */