From 2a64ee2b7190c98f9ea7b10da2269646811d177b Mon Sep 17 00:00:00 2001 From: srcejon Date: Wed, 22 Apr 2026 16:18:52 +0100 Subject: [PATCH] Generate swagger files for FreqDisplay --- sdrbase/resources/webapi/doc/html2/index.html | 86 ++- .../doc/swagger/include/FeatureReport.yaml | 2 + .../doc/swagger/include/FeatureSettings.yaml | 2 + .../doc/swagger/include/FreqDisplay.yaml | 57 ++ .../api/swagger/include/FeatureReport.yaml | 2 + .../api/swagger/include/FeatureSettings.yaml | 2 + .../api/swagger/include/FreqDisplay.yaml | 57 ++ swagger/sdrangel/code/html2/index.html | 86 ++- .../code/qt5/client/SWGFeatureReport.cpp | 25 + .../code/qt5/client/SWGFeatureReport.h | 7 + .../code/qt5/client/SWGFeatureSettings.cpp | 25 + .../code/qt5/client/SWGFeatureSettings.h | 7 + .../code/qt5/client/SWGFreqDisplayReport.cpp | 131 +++++ .../code/qt5/client/SWGFreqDisplayReport.h | 64 +++ .../qt5/client/SWGFreqDisplaySettings.cpp | 509 ++++++++++++++++++ .../code/qt5/client/SWGFreqDisplaySettings.h | 162 ++++++ .../code/qt5/client/SWGModelFactory.h | 12 + 17 files changed, 1234 insertions(+), 2 deletions(-) create mode 100644 sdrbase/resources/webapi/doc/swagger/include/FreqDisplay.yaml create mode 100644 swagger/sdrangel/api/swagger/include/FreqDisplay.yaml create mode 100644 swagger/sdrangel/code/qt5/client/SWGFreqDisplayReport.cpp create mode 100644 swagger/sdrangel/code/qt5/client/SWGFreqDisplayReport.h create mode 100644 swagger/sdrangel/code/qt5/client/SWGFreqDisplaySettings.cpp create mode 100644 swagger/sdrangel/code/qt5/client/SWGFreqDisplaySettings.h diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index b2572adbc..10506f7b2 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -6777,6 +6777,9 @@ margin-bottom: 20px; "AMBEReport" : { "$ref" : "#/definitions/AMBEReport" }, + "FreqDisplayReport" : { + "$ref" : "#/definitions/FreqDisplayReport" + }, "GS232ControllerReport" : { "$ref" : "#/definitions/GS232ControllerReport" }, @@ -6884,6 +6887,9 @@ margin-bottom: 20px; "JogdialControllerSettings" : { "$ref" : "#/definitions/JogdialControllerSettings" }, + "FreqDisplaySettings" : { + "$ref" : "#/definitions/FreqDisplaySettings" + }, "GS232ControllerSettings" : { "$ref" : "#/definitions/GS232ControllerSettings" }, @@ -7436,6 +7442,84 @@ margin-bottom: 20px; } }, "description" : "FreeDVMod" +}; + defs.FreqDisplayReport = { + "properties" : { + "frequency" : { + "type" : "integer", + "format" : "int64", + "description" : "Channel center frequency in Hz" + }, + "power" : { + "type" : "number", + "format" : "float", + "description" : "Channel power in dB" + } + }, + "description" : "Frequency Display report" +}; + defs.FreqDisplaySettings = { + "properties" : { + "selectedChannel" : { + "type" : "string", + "description" : "Channel to display frequency/power for" + }, + "fontName" : { + "type" : "string" + }, + "transparentBackground" : { + "type" : "integer" + }, + "displayMode" : { + "type" : "integer", + "description" : "(0 Frequency, 1 Power, 2 Frequency and Power)" + }, + "speechEnabled" : { + "type" : "integer" + }, + "frequencyUnits" : { + "type" : "integer", + "description" : "(0 Hz, 1 kHz, 2 MHz, 3 GHz)" + }, + "showUnits" : { + "type" : "integer" + }, + "powerDecimalPlaces" : { + "type" : "integer" + }, + "textcolor" : { + "type" : "integer" + }, + "dropShadowEnabled" : { + "type" : "integer" + }, + "title" : { + "type" : "string" + }, + "rgbColor" : { + "type" : "integer" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIFeatureSetIndex" : { + "type" : "integer" + }, + "reverseAPIFeatureIndex" : { + "type" : "integer" + }, + "rollupState" : { + "$ref" : "#/definitions/RollupState" + } + }, + "description" : "Frequency Display settings" }; defs.FreqScannerActions = { "properties" : { @@ -60312,7 +60396,7 @@ except ApiException as e:
- Generated 2026-03-22T19:58:59.376+01:00 + Generated 2026-04-22T17:17:14.302+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/FeatureReport.yaml b/sdrbase/resources/webapi/doc/swagger/include/FeatureReport.yaml index 20cfbd37e..b0dee8339 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/FeatureReport.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/FeatureReport.yaml @@ -11,6 +11,8 @@ FeatureReport: $ref: "/doc/swagger/include/AFC.yaml#/AFCReport" AMBEReport: $ref: "/doc/swagger/include/AMBE.yaml#/AMBEReport" + FreqDisplayReport: + $ref: "/doc/swagger/include/FreqDisplay.yaml#/FreqDisplayReport" GS232ControllerReport: $ref: "/doc/swagger/include/GS232Controller.yaml#/GS232ControllerReport" LimeRFEReport: diff --git a/sdrbase/resources/webapi/doc/swagger/include/FeatureSettings.yaml b/sdrbase/resources/webapi/doc/swagger/include/FeatureSettings.yaml index 1058a0f3f..948159a8e 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/FeatureSettings.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/FeatureSettings.yaml @@ -29,6 +29,8 @@ FeatureSettings: $ref: "/doc/swagger/include/Denoiser.yaml#/DenoiserSettings" JogdialControllerSettings: $ref: "/doc/swagger/include/JogdialController.yaml#/JogdialControllerSettings" + FreqDisplaySettings: + $ref: "/doc/swagger/include/FreqDisplay.yaml#/FreqDisplaySettings" GS232ControllerSettings: $ref: "/doc/swagger/include/GS232Controller.yaml#/GS232ControllerSettings" LimeRFESettings: diff --git a/sdrbase/resources/webapi/doc/swagger/include/FreqDisplay.yaml b/sdrbase/resources/webapi/doc/swagger/include/FreqDisplay.yaml new file mode 100644 index 000000000..f346537dd --- /dev/null +++ b/sdrbase/resources/webapi/doc/swagger/include/FreqDisplay.yaml @@ -0,0 +1,57 @@ +FreqDisplaySettings: + description: "Frequency Display settings" + properties: + selectedChannel: + description: Channel to display frequency/power for + type: string + fontName: + type: string + transparentBackground: + type: integer + displayMode: + description: (0 Frequency, 1 Power, 2 Frequency and Power) + type: integer + speechEnabled: + type: integer + frequencyUnits: + description: (0 Hz, 1 kHz, 2 MHz, 3 GHz) + type: integer + showUnits: + type: integer + freqDecimalPlaces: + type; integer + powerDecimalPlaces: + type: integer + textcolor: + type: integer + dropShadowEnabled: + type: integer + title: + type: string + rgbColor: + type: integer + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIFeatureSetIndex: + type: integer + reverseAPIFeatureIndex: + type: integer + rollupState: + $ref: "/doc/swagger/include/RollupState.yaml#/RollupState" + +FreqDisplayReport: + description: "Frequency Display report" + properties: + frequency: + description: "Channel center frequency in Hz" + type: integer + format: int64 + power: + description: "Channel power in dB" + type: number + format: float diff --git a/swagger/sdrangel/api/swagger/include/FeatureReport.yaml b/swagger/sdrangel/api/swagger/include/FeatureReport.yaml index 67e19d0ea..baa6bae95 100644 --- a/swagger/sdrangel/api/swagger/include/FeatureReport.yaml +++ b/swagger/sdrangel/api/swagger/include/FeatureReport.yaml @@ -11,6 +11,8 @@ FeatureReport: $ref: "http://swgserver:8081/api/swagger/include/AFC.yaml#/AFCReport" AMBEReport: $ref: "http://swgserver:8081/api/swagger/include/AMBE.yaml#/AMBEReport" + FreqDisplayReport: + $ref: "http://swgserver:8081/api/swagger/include/FreqDisplay.yaml#/FreqDisplayReport" GS232ControllerReport: $ref: "http://swgserver:8081/api/swagger/include/GS232Controller.yaml#/GS232ControllerReport" LimeRFEReport: diff --git a/swagger/sdrangel/api/swagger/include/FeatureSettings.yaml b/swagger/sdrangel/api/swagger/include/FeatureSettings.yaml index 991e60db5..8540bd5f4 100644 --- a/swagger/sdrangel/api/swagger/include/FeatureSettings.yaml +++ b/swagger/sdrangel/api/swagger/include/FeatureSettings.yaml @@ -29,6 +29,8 @@ FeatureSettings: $ref: "http://swgserver:8081/api/swagger/include/Denoiser.yaml#/DenoiserSettings" JogdialControllerSettings: $ref: "http://swgserver:8081/api/swagger/include/JogdialController.yaml#/JogdialControllerSettings" + FreqDisplaySettings: + $ref: "http://swgserver:8081/api/swagger/include/FreqDisplay.yaml#/FreqDisplaySettings" GS232ControllerSettings: $ref: "http://swgserver:8081/api/swagger/include/GS232Controller.yaml#/GS232ControllerSettings" LimeRFESettings: diff --git a/swagger/sdrangel/api/swagger/include/FreqDisplay.yaml b/swagger/sdrangel/api/swagger/include/FreqDisplay.yaml new file mode 100644 index 000000000..ea38d2efd --- /dev/null +++ b/swagger/sdrangel/api/swagger/include/FreqDisplay.yaml @@ -0,0 +1,57 @@ +FreqDisplaySettings: + description: "Frequency Display settings" + properties: + selectedChannel: + description: Channel to display frequency/power for + type: string + fontName: + type: string + transparentBackground: + type: integer + displayMode: + description: (0 Frequency, 1 Power, 2 Frequency and Power) + type: integer + speechEnabled: + type: integer + frequencyUnits: + description: (0 Hz, 1 kHz, 2 MHz, 3 GHz) + type: integer + showUnits: + type: integer + freqDecimalPlaces: + type; integer + powerDecimalPlaces: + type: integer + textcolor: + type: integer + dropShadowEnabled: + type: integer + title: + type: string + rgbColor: + type: integer + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIFeatureSetIndex: + type: integer + reverseAPIFeatureIndex: + type: integer + rollupState: + $ref: "http://swgserver:8081/api/swagger/include/RollupState.yaml#/RollupState" + +FreqDisplayReport: + description: "Frequency Display report" + properties: + frequency: + description: "Channel center frequency in Hz" + type: integer + format: int64 + power: + description: "Channel power in dB" + type: number + format: float diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index b2572adbc..10506f7b2 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -6777,6 +6777,9 @@ margin-bottom: 20px; "AMBEReport" : { "$ref" : "#/definitions/AMBEReport" }, + "FreqDisplayReport" : { + "$ref" : "#/definitions/FreqDisplayReport" + }, "GS232ControllerReport" : { "$ref" : "#/definitions/GS232ControllerReport" }, @@ -6884,6 +6887,9 @@ margin-bottom: 20px; "JogdialControllerSettings" : { "$ref" : "#/definitions/JogdialControllerSettings" }, + "FreqDisplaySettings" : { + "$ref" : "#/definitions/FreqDisplaySettings" + }, "GS232ControllerSettings" : { "$ref" : "#/definitions/GS232ControllerSettings" }, @@ -7436,6 +7442,84 @@ margin-bottom: 20px; } }, "description" : "FreeDVMod" +}; + defs.FreqDisplayReport = { + "properties" : { + "frequency" : { + "type" : "integer", + "format" : "int64", + "description" : "Channel center frequency in Hz" + }, + "power" : { + "type" : "number", + "format" : "float", + "description" : "Channel power in dB" + } + }, + "description" : "Frequency Display report" +}; + defs.FreqDisplaySettings = { + "properties" : { + "selectedChannel" : { + "type" : "string", + "description" : "Channel to display frequency/power for" + }, + "fontName" : { + "type" : "string" + }, + "transparentBackground" : { + "type" : "integer" + }, + "displayMode" : { + "type" : "integer", + "description" : "(0 Frequency, 1 Power, 2 Frequency and Power)" + }, + "speechEnabled" : { + "type" : "integer" + }, + "frequencyUnits" : { + "type" : "integer", + "description" : "(0 Hz, 1 kHz, 2 MHz, 3 GHz)" + }, + "showUnits" : { + "type" : "integer" + }, + "powerDecimalPlaces" : { + "type" : "integer" + }, + "textcolor" : { + "type" : "integer" + }, + "dropShadowEnabled" : { + "type" : "integer" + }, + "title" : { + "type" : "string" + }, + "rgbColor" : { + "type" : "integer" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIFeatureSetIndex" : { + "type" : "integer" + }, + "reverseAPIFeatureIndex" : { + "type" : "integer" + }, + "rollupState" : { + "$ref" : "#/definitions/RollupState" + } + }, + "description" : "Frequency Display settings" }; defs.FreqScannerActions = { "properties" : { @@ -60312,7 +60396,7 @@ except ApiException as e:
- Generated 2026-03-22T19:58:59.376+01:00 + Generated 2026-04-22T17:17:14.302+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGFeatureReport.cpp b/swagger/sdrangel/code/qt5/client/SWGFeatureReport.cpp index 05da233d8..5bb59653b 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFeatureReport.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGFeatureReport.cpp @@ -34,6 +34,8 @@ SWGFeatureReport::SWGFeatureReport() { m_afc_report_isSet = false; ambe_report = nullptr; m_ambe_report_isSet = false; + freq_display_report = nullptr; + m_freq_display_report_isSet = false; gs232_controller_report = nullptr; m_gs232_controller_report_isSet = false; lime_rfe_report = nullptr; @@ -68,6 +70,8 @@ SWGFeatureReport::init() { m_afc_report_isSet = false; ambe_report = new SWGAMBEReport(); m_ambe_report_isSet = false; + freq_display_report = new SWGFreqDisplayReport(); + m_freq_display_report_isSet = false; gs232_controller_report = new SWGGS232ControllerReport(); m_gs232_controller_report_isSet = false; lime_rfe_report = new SWGLimeRFEReport(); @@ -101,6 +105,9 @@ SWGFeatureReport::cleanup() { if(ambe_report != nullptr) { delete ambe_report; } + if(freq_display_report != nullptr) { + delete freq_display_report; + } if(gs232_controller_report != nullptr) { delete gs232_controller_report; } @@ -150,6 +157,8 @@ SWGFeatureReport::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&ambe_report, pJson["AMBEReport"], "SWGAMBEReport", "SWGAMBEReport"); + ::SWGSDRangel::setValue(&freq_display_report, pJson["FreqDisplayReport"], "SWGFreqDisplayReport", "SWGFreqDisplayReport"); + ::SWGSDRangel::setValue(&gs232_controller_report, pJson["GS232ControllerReport"], "SWGGS232ControllerReport", "SWGGS232ControllerReport"); ::SWGSDRangel::setValue(&lime_rfe_report, pJson["LimeRFEReport"], "SWGLimeRFEReport", "SWGLimeRFEReport"); @@ -195,6 +204,9 @@ SWGFeatureReport::asJsonObject() { if((ambe_report != nullptr) && (ambe_report->isSet())){ toJsonValue(QString("AMBEReport"), ambe_report, obj, QString("SWGAMBEReport")); } + if((freq_display_report != nullptr) && (freq_display_report->isSet())){ + toJsonValue(QString("FreqDisplayReport"), freq_display_report, obj, QString("SWGFreqDisplayReport")); + } if((gs232_controller_report != nullptr) && (gs232_controller_report->isSet())){ toJsonValue(QString("GS232ControllerReport"), gs232_controller_report, obj, QString("SWGGS232ControllerReport")); } @@ -259,6 +271,16 @@ SWGFeatureReport::setAmbeReport(SWGAMBEReport* ambe_report) { this->m_ambe_report_isSet = true; } +SWGFreqDisplayReport* +SWGFeatureReport::getFreqDisplayReport() { + return freq_display_report; +} +void +SWGFeatureReport::setFreqDisplayReport(SWGFreqDisplayReport* freq_display_report) { + this->freq_display_report = freq_display_report; + this->m_freq_display_report_isSet = true; +} + SWGGS232ControllerReport* SWGFeatureReport::getGs232ControllerReport() { return gs232_controller_report; @@ -373,6 +395,9 @@ SWGFeatureReport::isSet(){ if(ambe_report && ambe_report->isSet()){ isObjectUpdated = true; break; } + if(freq_display_report && freq_display_report->isSet()){ + isObjectUpdated = true; break; + } if(gs232_controller_report && gs232_controller_report->isSet()){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFeatureReport.h b/swagger/sdrangel/code/qt5/client/SWGFeatureReport.h index d30819af9..8d6c9dec2 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFeatureReport.h +++ b/swagger/sdrangel/code/qt5/client/SWGFeatureReport.h @@ -24,6 +24,7 @@ #include "SWGAFCReport.h" #include "SWGAMBEReport.h" +#include "SWGFreqDisplayReport.h" #include "SWGGS232ControllerReport.h" #include "SWGLimeRFEReport.h" #include "SWGMapReport.h" @@ -63,6 +64,9 @@ public: SWGAMBEReport* getAmbeReport(); void setAmbeReport(SWGAMBEReport* ambe_report); + SWGFreqDisplayReport* getFreqDisplayReport(); + void setFreqDisplayReport(SWGFreqDisplayReport* freq_display_report); + SWGGS232ControllerReport* getGs232ControllerReport(); void setGs232ControllerReport(SWGGS232ControllerReport* gs232_controller_report); @@ -106,6 +110,9 @@ private: SWGAMBEReport* ambe_report; bool m_ambe_report_isSet; + SWGFreqDisplayReport* freq_display_report; + bool m_freq_display_report_isSet; + SWGGS232ControllerReport* gs232_controller_report; bool m_gs232_controller_report_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGFeatureSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFeatureSettings.cpp index bbaf36643..91f135b8f 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFeatureSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGFeatureSettings.cpp @@ -50,6 +50,8 @@ SWGFeatureSettings::SWGFeatureSettings() { m_denoiser_settings_isSet = false; jogdial_controller_settings = nullptr; m_jogdial_controller_settings_isSet = false; + freq_display_settings = nullptr; + m_freq_display_settings_isSet = false; gs232_controller_settings = nullptr; m_gs232_controller_settings_isSet = false; lime_rfe_settings = nullptr; @@ -106,6 +108,8 @@ SWGFeatureSettings::init() { m_denoiser_settings_isSet = false; jogdial_controller_settings = new SWGJogdialControllerSettings(); m_jogdial_controller_settings_isSet = false; + freq_display_settings = new SWGFreqDisplaySettings(); + m_freq_display_settings_isSet = false; gs232_controller_settings = new SWGGS232ControllerSettings(); m_gs232_controller_settings_isSet = false; lime_rfe_settings = new SWGLimeRFESettings(); @@ -165,6 +169,9 @@ SWGFeatureSettings::cleanup() { if(jogdial_controller_settings != nullptr) { delete jogdial_controller_settings; } + if(freq_display_settings != nullptr) { + delete freq_display_settings; + } if(gs232_controller_settings != nullptr) { delete gs232_controller_settings; } @@ -239,6 +246,8 @@ SWGFeatureSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&jogdial_controller_settings, pJson["JogdialControllerSettings"], "SWGJogdialControllerSettings", "SWGJogdialControllerSettings"); + ::SWGSDRangel::setValue(&freq_display_settings, pJson["FreqDisplaySettings"], "SWGFreqDisplaySettings", "SWGFreqDisplaySettings"); + ::SWGSDRangel::setValue(&gs232_controller_settings, pJson["GS232ControllerSettings"], "SWGGS232ControllerSettings", "SWGGS232ControllerSettings"); ::SWGSDRangel::setValue(&lime_rfe_settings, pJson["LimeRFESettings"], "SWGLimeRFESettings", "SWGLimeRFESettings"); @@ -314,6 +323,9 @@ SWGFeatureSettings::asJsonObject() { if((jogdial_controller_settings != nullptr) && (jogdial_controller_settings->isSet())){ toJsonValue(QString("JogdialControllerSettings"), jogdial_controller_settings, obj, QString("SWGJogdialControllerSettings")); } + if((freq_display_settings != nullptr) && (freq_display_settings->isSet())){ + toJsonValue(QString("FreqDisplaySettings"), freq_display_settings, obj, QString("SWGFreqDisplaySettings")); + } if((gs232_controller_settings != nullptr) && (gs232_controller_settings->isSet())){ toJsonValue(QString("GS232ControllerSettings"), gs232_controller_settings, obj, QString("SWGGS232ControllerSettings")); } @@ -467,6 +479,16 @@ SWGFeatureSettings::setJogdialControllerSettings(SWGJogdialControllerSettings* j this->m_jogdial_controller_settings_isSet = true; } +SWGFreqDisplaySettings* +SWGFeatureSettings::getFreqDisplaySettings() { + return freq_display_settings; +} +void +SWGFeatureSettings::setFreqDisplaySettings(SWGFreqDisplaySettings* freq_display_settings) { + this->freq_display_settings = freq_display_settings; + this->m_freq_display_settings_isSet = true; +} + SWGGS232ControllerSettings* SWGFeatureSettings::getGs232ControllerSettings() { return gs232_controller_settings; @@ -635,6 +657,9 @@ SWGFeatureSettings::isSet(){ if(jogdial_controller_settings && jogdial_controller_settings->isSet()){ isObjectUpdated = true; break; } + if(freq_display_settings && freq_display_settings->isSet()){ + isObjectUpdated = true; break; + } if(gs232_controller_settings && gs232_controller_settings->isSet()){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFeatureSettings.h b/swagger/sdrangel/code/qt5/client/SWGFeatureSettings.h index 41e1b5823..a03955bdb 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFeatureSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGFeatureSettings.h @@ -29,6 +29,7 @@ #include "SWGAntennaToolsSettings.h" #include "SWGDemodAnalyzerSettings.h" #include "SWGDenoiserSettings.h" +#include "SWGFreqDisplaySettings.h" #include "SWGGS232ControllerSettings.h" #include "SWGJogdialControllerSettings.h" #include "SWGLimeRFESettings.h" @@ -96,6 +97,9 @@ public: SWGJogdialControllerSettings* getJogdialControllerSettings(); void setJogdialControllerSettings(SWGJogdialControllerSettings* jogdial_controller_settings); + SWGFreqDisplaySettings* getFreqDisplaySettings(); + void setFreqDisplaySettings(SWGFreqDisplaySettings* freq_display_settings); + SWGGS232ControllerSettings* getGs232ControllerSettings(); void setGs232ControllerSettings(SWGGS232ControllerSettings* gs232_controller_settings); @@ -172,6 +176,9 @@ private: SWGJogdialControllerSettings* jogdial_controller_settings; bool m_jogdial_controller_settings_isSet; + SWGFreqDisplaySettings* freq_display_settings; + bool m_freq_display_settings_isSet; + SWGGS232ControllerSettings* gs232_controller_settings; bool m_gs232_controller_settings_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGFreqDisplayReport.cpp b/swagger/sdrangel/code/qt5/client/SWGFreqDisplayReport.cpp new file mode 100644 index 000000000..3eec10c9f --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGFreqDisplayReport.cpp @@ -0,0 +1,131 @@ +/** + * 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: 7.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 "SWGFreqDisplayReport.h" + +#include "SWGHelpers.h" + +#include +#include +#include +#include + +namespace SWGSDRangel { + +SWGFreqDisplayReport::SWGFreqDisplayReport(QString* json) { + init(); + this->fromJson(*json); +} + +SWGFreqDisplayReport::SWGFreqDisplayReport() { + frequency = 0L; + m_frequency_isSet = false; + power = 0.0f; + m_power_isSet = false; +} + +SWGFreqDisplayReport::~SWGFreqDisplayReport() { + this->cleanup(); +} + +void +SWGFreqDisplayReport::init() { + frequency = 0L; + m_frequency_isSet = false; + power = 0.0f; + m_power_isSet = false; +} + +void +SWGFreqDisplayReport::cleanup() { + + +} + +SWGFreqDisplayReport* +SWGFreqDisplayReport::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; +} + +void +SWGFreqDisplayReport::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&frequency, pJson["frequency"], "qint64", ""); + + ::SWGSDRangel::setValue(&power, pJson["power"], "float", ""); + +} + +QString +SWGFreqDisplayReport::asJson () +{ + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + delete obj; + return QString(bytes); +} + +QJsonObject* +SWGFreqDisplayReport::asJsonObject() { + QJsonObject* obj = new QJsonObject(); + if(m_frequency_isSet){ + obj->insert("frequency", QJsonValue(frequency)); + } + if(m_power_isSet){ + obj->insert("power", QJsonValue(power)); + } + + return obj; +} + +qint64 +SWGFreqDisplayReport::getFrequency() { + return frequency; +} +void +SWGFreqDisplayReport::setFrequency(qint64 frequency) { + this->frequency = frequency; + this->m_frequency_isSet = true; +} + +float +SWGFreqDisplayReport::getPower() { + return power; +} +void +SWGFreqDisplayReport::setPower(float power) { + this->power = power; + this->m_power_isSet = true; +} + + +bool +SWGFreqDisplayReport::isSet(){ + bool isObjectUpdated = false; + do{ + if(m_frequency_isSet){ + isObjectUpdated = true; break; + } + if(m_power_isSet){ + isObjectUpdated = true; break; + } + }while(false); + return isObjectUpdated; +} +} + diff --git a/swagger/sdrangel/code/qt5/client/SWGFreqDisplayReport.h b/swagger/sdrangel/code/qt5/client/SWGFreqDisplayReport.h new file mode 100644 index 000000000..e3b6464f7 --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGFreqDisplayReport.h @@ -0,0 +1,64 @@ +/** + * 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: 7.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. + */ + +/* + * SWGFreqDisplayReport.h + * + * Frequency Display report + */ + +#ifndef SWGFreqDisplayReport_H_ +#define SWGFreqDisplayReport_H_ + +#include + + + +#include "SWGObject.h" +#include "export.h" + +namespace SWGSDRangel { + +class SWG_API SWGFreqDisplayReport: public SWGObject { +public: + SWGFreqDisplayReport(); + SWGFreqDisplayReport(QString* json); + virtual ~SWGFreqDisplayReport(); + void init(); + void cleanup(); + + virtual QString asJson () override; + virtual QJsonObject* asJsonObject() override; + virtual void fromJsonObject(QJsonObject &json) override; + virtual SWGFreqDisplayReport* fromJson(QString &jsonString) override; + + qint64 getFrequency(); + void setFrequency(qint64 frequency); + + float getPower(); + void setPower(float power); + + + virtual bool isSet() override; + +private: + qint64 frequency; + bool m_frequency_isSet; + + float power; + bool m_power_isSet; + +}; + +} + +#endif /* SWGFreqDisplayReport_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGFreqDisplaySettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFreqDisplaySettings.cpp new file mode 100644 index 000000000..3a1fbe19d --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGFreqDisplaySettings.cpp @@ -0,0 +1,509 @@ +/** + * 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: 7.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 "SWGFreqDisplaySettings.h" + +#include "SWGHelpers.h" + +#include +#include +#include +#include + +namespace SWGSDRangel { + +SWGFreqDisplaySettings::SWGFreqDisplaySettings(QString* json) { + init(); + this->fromJson(*json); +} + +SWGFreqDisplaySettings::SWGFreqDisplaySettings() { + selected_channel = nullptr; + m_selected_channel_isSet = false; + font_name = nullptr; + m_font_name_isSet = false; + transparent_background = 0; + m_transparent_background_isSet = false; + display_mode = 0; + m_display_mode_isSet = false; + speech_enabled = 0; + m_speech_enabled_isSet = false; + frequency_units = 0; + m_frequency_units_isSet = false; + show_units = 0; + m_show_units_isSet = false; + power_decimal_places = 0; + m_power_decimal_places_isSet = false; + textcolor = 0; + m_textcolor_isSet = false; + drop_shadow_enabled = 0; + m_drop_shadow_enabled_isSet = false; + title = nullptr; + m_title_isSet = false; + rgb_color = 0; + m_rgb_color_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = nullptr; + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_feature_set_index = 0; + m_reverse_api_feature_set_index_isSet = false; + reverse_api_feature_index = 0; + m_reverse_api_feature_index_isSet = false; + rollup_state = nullptr; + m_rollup_state_isSet = false; +} + +SWGFreqDisplaySettings::~SWGFreqDisplaySettings() { + this->cleanup(); +} + +void +SWGFreqDisplaySettings::init() { + selected_channel = new QString(""); + m_selected_channel_isSet = false; + font_name = new QString(""); + m_font_name_isSet = false; + transparent_background = 0; + m_transparent_background_isSet = false; + display_mode = 0; + m_display_mode_isSet = false; + speech_enabled = 0; + m_speech_enabled_isSet = false; + frequency_units = 0; + m_frequency_units_isSet = false; + show_units = 0; + m_show_units_isSet = false; + power_decimal_places = 0; + m_power_decimal_places_isSet = false; + textcolor = 0; + m_textcolor_isSet = false; + drop_shadow_enabled = 0; + m_drop_shadow_enabled_isSet = false; + title = new QString(""); + m_title_isSet = false; + rgb_color = 0; + m_rgb_color_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = new QString(""); + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_feature_set_index = 0; + m_reverse_api_feature_set_index_isSet = false; + reverse_api_feature_index = 0; + m_reverse_api_feature_index_isSet = false; + rollup_state = new SWGRollupState(); + m_rollup_state_isSet = false; +} + +void +SWGFreqDisplaySettings::cleanup() { + if(selected_channel != nullptr) { + delete selected_channel; + } + if(font_name != nullptr) { + delete font_name; + } + + + + + + + + + if(title != nullptr) { + delete title; + } + + + if(reverse_api_address != nullptr) { + delete reverse_api_address; + } + + + + if(rollup_state != nullptr) { + delete rollup_state; + } +} + +SWGFreqDisplaySettings* +SWGFreqDisplaySettings::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; +} + +void +SWGFreqDisplaySettings::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&selected_channel, pJson["selectedChannel"], "QString", "QString"); + + ::SWGSDRangel::setValue(&font_name, pJson["fontName"], "QString", "QString"); + + ::SWGSDRangel::setValue(&transparent_background, pJson["transparentBackground"], "qint32", ""); + + ::SWGSDRangel::setValue(&display_mode, pJson["displayMode"], "qint32", ""); + + ::SWGSDRangel::setValue(&speech_enabled, pJson["speechEnabled"], "qint32", ""); + + ::SWGSDRangel::setValue(&frequency_units, pJson["frequencyUnits"], "qint32", ""); + + ::SWGSDRangel::setValue(&show_units, pJson["showUnits"], "qint32", ""); + + ::SWGSDRangel::setValue(&power_decimal_places, pJson["powerDecimalPlaces"], "qint32", ""); + + ::SWGSDRangel::setValue(&textcolor, pJson["textcolor"], "qint32", ""); + + ::SWGSDRangel::setValue(&drop_shadow_enabled, pJson["dropShadowEnabled"], "qint32", ""); + + ::SWGSDRangel::setValue(&title, pJson["title"], "QString", "QString"); + + ::SWGSDRangel::setValue(&rgb_color, pJson["rgbColor"], "qint32", ""); + + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); + + ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_feature_set_index, pJson["reverseAPIFeatureSetIndex"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_feature_index, pJson["reverseAPIFeatureIndex"], "qint32", ""); + + ::SWGSDRangel::setValue(&rollup_state, pJson["rollupState"], "SWGRollupState", "SWGRollupState"); + +} + +QString +SWGFreqDisplaySettings::asJson () +{ + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + delete obj; + return QString(bytes); +} + +QJsonObject* +SWGFreqDisplaySettings::asJsonObject() { + QJsonObject* obj = new QJsonObject(); + if(selected_channel != nullptr && *selected_channel != QString("")){ + toJsonValue(QString("selectedChannel"), selected_channel, obj, QString("QString")); + } + if(font_name != nullptr && *font_name != QString("")){ + toJsonValue(QString("fontName"), font_name, obj, QString("QString")); + } + if(m_transparent_background_isSet){ + obj->insert("transparentBackground", QJsonValue(transparent_background)); + } + if(m_display_mode_isSet){ + obj->insert("displayMode", QJsonValue(display_mode)); + } + if(m_speech_enabled_isSet){ + obj->insert("speechEnabled", QJsonValue(speech_enabled)); + } + if(m_frequency_units_isSet){ + obj->insert("frequencyUnits", QJsonValue(frequency_units)); + } + if(m_show_units_isSet){ + obj->insert("showUnits", QJsonValue(show_units)); + } + if(m_power_decimal_places_isSet){ + obj->insert("powerDecimalPlaces", QJsonValue(power_decimal_places)); + } + if(m_textcolor_isSet){ + obj->insert("textcolor", QJsonValue(textcolor)); + } + if(m_drop_shadow_enabled_isSet){ + obj->insert("dropShadowEnabled", QJsonValue(drop_shadow_enabled)); + } + if(title != nullptr && *title != QString("")){ + toJsonValue(QString("title"), title, obj, QString("QString")); + } + if(m_rgb_color_isSet){ + obj->insert("rgbColor", QJsonValue(rgb_color)); + } + if(m_use_reverse_api_isSet){ + obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); + } + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ + toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString")); + } + if(m_reverse_api_port_isSet){ + obj->insert("reverseAPIPort", QJsonValue(reverse_api_port)); + } + if(m_reverse_api_feature_set_index_isSet){ + obj->insert("reverseAPIFeatureSetIndex", QJsonValue(reverse_api_feature_set_index)); + } + if(m_reverse_api_feature_index_isSet){ + obj->insert("reverseAPIFeatureIndex", QJsonValue(reverse_api_feature_index)); + } + if((rollup_state != nullptr) && (rollup_state->isSet())){ + toJsonValue(QString("rollupState"), rollup_state, obj, QString("SWGRollupState")); + } + + return obj; +} + +QString* +SWGFreqDisplaySettings::getSelectedChannel() { + return selected_channel; +} +void +SWGFreqDisplaySettings::setSelectedChannel(QString* selected_channel) { + this->selected_channel = selected_channel; + this->m_selected_channel_isSet = true; +} + +QString* +SWGFreqDisplaySettings::getFontName() { + return font_name; +} +void +SWGFreqDisplaySettings::setFontName(QString* font_name) { + this->font_name = font_name; + this->m_font_name_isSet = true; +} + +qint32 +SWGFreqDisplaySettings::getTransparentBackground() { + return transparent_background; +} +void +SWGFreqDisplaySettings::setTransparentBackground(qint32 transparent_background) { + this->transparent_background = transparent_background; + this->m_transparent_background_isSet = true; +} + +qint32 +SWGFreqDisplaySettings::getDisplayMode() { + return display_mode; +} +void +SWGFreqDisplaySettings::setDisplayMode(qint32 display_mode) { + this->display_mode = display_mode; + this->m_display_mode_isSet = true; +} + +qint32 +SWGFreqDisplaySettings::getSpeechEnabled() { + return speech_enabled; +} +void +SWGFreqDisplaySettings::setSpeechEnabled(qint32 speech_enabled) { + this->speech_enabled = speech_enabled; + this->m_speech_enabled_isSet = true; +} + +qint32 +SWGFreqDisplaySettings::getFrequencyUnits() { + return frequency_units; +} +void +SWGFreqDisplaySettings::setFrequencyUnits(qint32 frequency_units) { + this->frequency_units = frequency_units; + this->m_frequency_units_isSet = true; +} + +qint32 +SWGFreqDisplaySettings::getShowUnits() { + return show_units; +} +void +SWGFreqDisplaySettings::setShowUnits(qint32 show_units) { + this->show_units = show_units; + this->m_show_units_isSet = true; +} + +qint32 +SWGFreqDisplaySettings::getPowerDecimalPlaces() { + return power_decimal_places; +} +void +SWGFreqDisplaySettings::setPowerDecimalPlaces(qint32 power_decimal_places) { + this->power_decimal_places = power_decimal_places; + this->m_power_decimal_places_isSet = true; +} + +qint32 +SWGFreqDisplaySettings::getTextcolor() { + return textcolor; +} +void +SWGFreqDisplaySettings::setTextcolor(qint32 textcolor) { + this->textcolor = textcolor; + this->m_textcolor_isSet = true; +} + +qint32 +SWGFreqDisplaySettings::getDropShadowEnabled() { + return drop_shadow_enabled; +} +void +SWGFreqDisplaySettings::setDropShadowEnabled(qint32 drop_shadow_enabled) { + this->drop_shadow_enabled = drop_shadow_enabled; + this->m_drop_shadow_enabled_isSet = true; +} + +QString* +SWGFreqDisplaySettings::getTitle() { + return title; +} +void +SWGFreqDisplaySettings::setTitle(QString* title) { + this->title = title; + this->m_title_isSet = true; +} + +qint32 +SWGFreqDisplaySettings::getRgbColor() { + return rgb_color; +} +void +SWGFreqDisplaySettings::setRgbColor(qint32 rgb_color) { + this->rgb_color = rgb_color; + this->m_rgb_color_isSet = true; +} + +qint32 +SWGFreqDisplaySettings::getUseReverseApi() { + return use_reverse_api; +} +void +SWGFreqDisplaySettings::setUseReverseApi(qint32 use_reverse_api) { + this->use_reverse_api = use_reverse_api; + this->m_use_reverse_api_isSet = true; +} + +QString* +SWGFreqDisplaySettings::getReverseApiAddress() { + return reverse_api_address; +} +void +SWGFreqDisplaySettings::setReverseApiAddress(QString* reverse_api_address) { + this->reverse_api_address = reverse_api_address; + this->m_reverse_api_address_isSet = true; +} + +qint32 +SWGFreqDisplaySettings::getReverseApiPort() { + return reverse_api_port; +} +void +SWGFreqDisplaySettings::setReverseApiPort(qint32 reverse_api_port) { + this->reverse_api_port = reverse_api_port; + this->m_reverse_api_port_isSet = true; +} + +qint32 +SWGFreqDisplaySettings::getReverseApiFeatureSetIndex() { + return reverse_api_feature_set_index; +} +void +SWGFreqDisplaySettings::setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index) { + this->reverse_api_feature_set_index = reverse_api_feature_set_index; + this->m_reverse_api_feature_set_index_isSet = true; +} + +qint32 +SWGFreqDisplaySettings::getReverseApiFeatureIndex() { + return reverse_api_feature_index; +} +void +SWGFreqDisplaySettings::setReverseApiFeatureIndex(qint32 reverse_api_feature_index) { + this->reverse_api_feature_index = reverse_api_feature_index; + this->m_reverse_api_feature_index_isSet = true; +} + +SWGRollupState* +SWGFreqDisplaySettings::getRollupState() { + return rollup_state; +} +void +SWGFreqDisplaySettings::setRollupState(SWGRollupState* rollup_state) { + this->rollup_state = rollup_state; + this->m_rollup_state_isSet = true; +} + + +bool +SWGFreqDisplaySettings::isSet(){ + bool isObjectUpdated = false; + do{ + if(selected_channel && *selected_channel != QString("")){ + isObjectUpdated = true; break; + } + if(font_name && *font_name != QString("")){ + isObjectUpdated = true; break; + } + if(m_transparent_background_isSet){ + isObjectUpdated = true; break; + } + if(m_display_mode_isSet){ + isObjectUpdated = true; break; + } + if(m_speech_enabled_isSet){ + isObjectUpdated = true; break; + } + if(m_frequency_units_isSet){ + isObjectUpdated = true; break; + } + if(m_show_units_isSet){ + isObjectUpdated = true; break; + } + if(m_power_decimal_places_isSet){ + isObjectUpdated = true; break; + } + if(m_textcolor_isSet){ + isObjectUpdated = true; break; + } + if(m_drop_shadow_enabled_isSet){ + isObjectUpdated = true; break; + } + if(title && *title != QString("")){ + isObjectUpdated = true; break; + } + if(m_rgb_color_isSet){ + isObjectUpdated = true; break; + } + if(m_use_reverse_api_isSet){ + isObjectUpdated = true; break; + } + if(reverse_api_address && *reverse_api_address != QString("")){ + isObjectUpdated = true; break; + } + if(m_reverse_api_port_isSet){ + isObjectUpdated = true; break; + } + if(m_reverse_api_feature_set_index_isSet){ + isObjectUpdated = true; break; + } + if(m_reverse_api_feature_index_isSet){ + isObjectUpdated = true; break; + } + if(rollup_state && rollup_state->isSet()){ + isObjectUpdated = true; break; + } + }while(false); + return isObjectUpdated; +} +} + diff --git a/swagger/sdrangel/code/qt5/client/SWGFreqDisplaySettings.h b/swagger/sdrangel/code/qt5/client/SWGFreqDisplaySettings.h new file mode 100644 index 000000000..3cf216de9 --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGFreqDisplaySettings.h @@ -0,0 +1,162 @@ +/** + * 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: 7.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. + */ + +/* + * SWGFreqDisplaySettings.h + * + * Frequency Display settings + */ + +#ifndef SWGFreqDisplaySettings_H_ +#define SWGFreqDisplaySettings_H_ + +#include + + +#include "SWGRollupState.h" +#include + +#include "SWGObject.h" +#include "export.h" + +namespace SWGSDRangel { + +class SWG_API SWGFreqDisplaySettings: public SWGObject { +public: + SWGFreqDisplaySettings(); + SWGFreqDisplaySettings(QString* json); + virtual ~SWGFreqDisplaySettings(); + void init(); + void cleanup(); + + virtual QString asJson () override; + virtual QJsonObject* asJsonObject() override; + virtual void fromJsonObject(QJsonObject &json) override; + virtual SWGFreqDisplaySettings* fromJson(QString &jsonString) override; + + QString* getSelectedChannel(); + void setSelectedChannel(QString* selected_channel); + + QString* getFontName(); + void setFontName(QString* font_name); + + qint32 getTransparentBackground(); + void setTransparentBackground(qint32 transparent_background); + + qint32 getDisplayMode(); + void setDisplayMode(qint32 display_mode); + + qint32 getSpeechEnabled(); + void setSpeechEnabled(qint32 speech_enabled); + + qint32 getFrequencyUnits(); + void setFrequencyUnits(qint32 frequency_units); + + qint32 getShowUnits(); + void setShowUnits(qint32 show_units); + + qint32 getPowerDecimalPlaces(); + void setPowerDecimalPlaces(qint32 power_decimal_places); + + qint32 getTextcolor(); + void setTextcolor(qint32 textcolor); + + qint32 getDropShadowEnabled(); + void setDropShadowEnabled(qint32 drop_shadow_enabled); + + QString* getTitle(); + void setTitle(QString* title); + + qint32 getRgbColor(); + void setRgbColor(qint32 rgb_color); + + qint32 getUseReverseApi(); + void setUseReverseApi(qint32 use_reverse_api); + + QString* getReverseApiAddress(); + void setReverseApiAddress(QString* reverse_api_address); + + qint32 getReverseApiPort(); + void setReverseApiPort(qint32 reverse_api_port); + + qint32 getReverseApiFeatureSetIndex(); + void setReverseApiFeatureSetIndex(qint32 reverse_api_feature_set_index); + + qint32 getReverseApiFeatureIndex(); + void setReverseApiFeatureIndex(qint32 reverse_api_feature_index); + + SWGRollupState* getRollupState(); + void setRollupState(SWGRollupState* rollup_state); + + + virtual bool isSet() override; + +private: + QString* selected_channel; + bool m_selected_channel_isSet; + + QString* font_name; + bool m_font_name_isSet; + + qint32 transparent_background; + bool m_transparent_background_isSet; + + qint32 display_mode; + bool m_display_mode_isSet; + + qint32 speech_enabled; + bool m_speech_enabled_isSet; + + qint32 frequency_units; + bool m_frequency_units_isSet; + + qint32 show_units; + bool m_show_units_isSet; + + qint32 power_decimal_places; + bool m_power_decimal_places_isSet; + + qint32 textcolor; + bool m_textcolor_isSet; + + qint32 drop_shadow_enabled; + bool m_drop_shadow_enabled_isSet; + + QString* title; + bool m_title_isSet; + + qint32 rgb_color; + bool m_rgb_color_isSet; + + qint32 use_reverse_api; + bool m_use_reverse_api_isSet; + + QString* reverse_api_address; + bool m_reverse_api_address_isSet; + + qint32 reverse_api_port; + bool m_reverse_api_port_isSet; + + qint32 reverse_api_feature_set_index; + bool m_reverse_api_feature_set_index_isSet; + + qint32 reverse_api_feature_index; + bool m_reverse_api_feature_index_isSet; + + SWGRollupState* rollup_state; + bool m_rollup_state_isSet; + +}; + +} + +#endif /* SWGFreqDisplaySettings_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h index 4bf9cca40..9e36436a3 100644 --- a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h +++ b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h @@ -159,6 +159,8 @@ #include "SWGFreeDVDemodSettings.h" #include "SWGFreeDVModReport.h" #include "SWGFreeDVModSettings.h" +#include "SWGFreqDisplayReport.h" +#include "SWGFreqDisplaySettings.h" #include "SWGFreqScannerActions.h" #include "SWGFreqScannerChannelState.h" #include "SWGFreqScannerFrequency.h" @@ -1125,6 +1127,16 @@ namespace SWGSDRangel { obj->init(); return obj; } + if(QString("SWGFreqDisplayReport").compare(type) == 0) { + SWGFreqDisplayReport *obj = new SWGFreqDisplayReport(); + obj->init(); + return obj; + } + if(QString("SWGFreqDisplaySettings").compare(type) == 0) { + SWGFreqDisplaySettings *obj = new SWGFreqDisplaySettings(); + obj->init(); + return obj; + } if(QString("SWGFreqScannerActions").compare(type) == 0) { SWGFreqScannerActions *obj = new SWGFreqScannerActions(); obj->init();