diff --git a/plugins/channelrx/CMakeLists.txt b/plugins/channelrx/CMakeLists.txt index f04fd1fb1..b0b6e106e 100644 --- a/plugins/channelrx/CMakeLists.txt +++ b/plugins/channelrx/CMakeLists.txt @@ -2,7 +2,7 @@ project(demod) if (Qt5Quick_FOUND AND Qt5QuickWidgets_FOUND AND Qt5Positioning_FOUND) add_subdirectory(demodadsb) - add_subdirectory(demodvormc) + # add_subdirectory(demodvormc) endif() add_subdirectory(demodam) diff --git a/sdrbase/resources/webapi.qrc b/sdrbase/resources/webapi.qrc index 4a374828d..219ac5fc7 100644 --- a/sdrbase/resources/webapi.qrc +++ b/sdrbase/resources/webapi.qrc @@ -109,7 +109,6 @@ webapi/doc/swagger/include/USRP.yaml webapi/doc/swagger/include/VORDemod.yaml webapi/doc/swagger/include/VORLocalizer.yaml - webapi/doc/swagger/include/VORDemodSC.yaml webapi/doc/swagger/include/WFMDemod.yaml webapi/doc/swagger/include/WFMMod.yaml webapi/doc/swagger/include/Xtrx.yaml diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 6d00be163..51fc25d47 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -3377,9 +3377,6 @@ margin-bottom: 20px; "UDPSinkReport" : { "$ref" : "#/definitions/UDPSinkReport" }, - "VORDemodMCReport" : { - "$ref" : "#/definitions/VORDemodMCReport" - }, "VORDemodReport" : { "$ref" : "#/definitions/VORDemodReport" }, @@ -3538,9 +3535,6 @@ margin-bottom: 20px; "UDPSinkSettings" : { "$ref" : "#/definitions/UDPSinkSettings" }, - "VORDemodMCSettings" : { - "$ref" : "#/definitions/VORDemodMCSettings" - }, "VORDemodSettings" : { "$ref" : "#/definitions/VORDemodSettings" }, @@ -13615,83 +13609,6 @@ margin-bottom: 20px; } }, "description" : "USRP" -}; - defs.VORDemodMCReport = { - "properties" : { - "channelPowerDB" : { - "type" : "number", - "format" : "float", - "description" : "power received in channel (dB)" - }, - "squelch" : { - "type" : "integer", - "description" : "squelch status (1 if open else 0)" - }, - "audioSampleRate" : { - "type" : "integer" - } - }, - "description" : "VORDemodMC" -}; - defs.VORDemodMCSettings = { - "properties" : { - "squelch" : { - "type" : "number", - "format" : "float", - "description" : "power squelch threshold in decibels" - }, - "volume" : { - "type" : "number", - "format" : "float" - }, - "audioMute" : { - "type" : "integer" - }, - "rgbColor" : { - "type" : "integer" - }, - "title" : { - "type" : "string" - }, - "audioDeviceName" : { - "type" : "string" - }, - "streamIndex" : { - "type" : "integer", - "description" : "MIMO channel. Not relevant when connected to SI (single Rx)." - }, - "useReverseAPI" : { - "type" : "integer", - "description" : "Synchronize with reverse API (1 for yes, 0 for no)" - }, - "reverseAPIAddress" : { - "type" : "string" - }, - "reverseAPIPort" : { - "type" : "integer" - }, - "reverseAPIDeviceIndex" : { - "type" : "integer" - }, - "reverseAPIChannelIndex" : { - "type" : "integer" - }, - "identThreshold" : { - "type" : "integer", - "description" : "Morse code ident threshold (linear SNR)" - }, - "magDecAdjust" : { - "type" : "integer", - "description" : "Adjust radial lines on map for magnetic declination of VOR" - }, - "channelMarker" : { - "$ref" : "#/definitions/ChannelMarker" - }, - "rollupState" : { - "$ref" : "#/definitions/RollupState" - } - }, - "description" : "VORDemodMC" }; defs.VORDemodReport = { "properties" : { @@ -52552,7 +52469,7 @@ except ApiException as e:
- Generated 2022-05-01T11:46:55.368+02:00 + Generated 2022-05-01T22:14:53.451+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml index ffe69ddeb..df8b65951 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml @@ -77,8 +77,8 @@ ChannelReport: $ref: "/doc/swagger/include/UDPSource.yaml#/UDPSourceReport" UDPSinkReport: $ref: "/doc/swagger/include/UDPSink.yaml#/UDPSinkReport" - VORDemodMCReport: - $ref: "/doc/swagger/include/VORDemodMC.yaml#/VORDemodMCReport" + # VORDemodMCReport: + # $ref: "/doc/swagger/include/VORDemodMC.yaml#/VORDemodMCReport" VORDemodReport: $ref: "/doc/swagger/include/VORDemod.yaml#/VORDemodReport" WFMDemodReport: diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml index 6bf8bb473..126328d40 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml @@ -101,8 +101,8 @@ ChannelSettings: $ref: "/doc/swagger/include/UDPSource.yaml#/UDPSourceSettings" UDPSinkSettings: $ref: "/doc/swagger/include/UDPSink.yaml#/UDPSinkSettings" - VORDemodMCSettings: - $ref: "/doc/swagger/include/VORDemodMC.yaml#/VORDemodMCSettings" + # VORDemodMCSettings: + # $ref: "/doc/swagger/include/VORDemodMC.yaml#/VORDemodMCSettings" VORDemodSettings: $ref: "/doc/swagger/include/VORDemod.yaml#/VORDemodSettings" WFMDemodSettings: diff --git a/sdrbase/resources/webapi/doc/swagger/include/VORDemodSC.yaml b/sdrbase/resources/webapi/doc/swagger/include/VORDemodSC.yaml deleted file mode 100644 index 1b47c5c1c..000000000 --- a/sdrbase/resources/webapi/doc/swagger/include/VORDemodSC.yaml +++ /dev/null @@ -1,97 +0,0 @@ -VORDemodSCSettings: - description: VORDemodSC - properties: - inputFrequencyOffset: - type: integer - format: int64 - navId: - description: VOR unique identifier when set by VOR localizer feature - type: integer - squelch: - description: power squelch threshold in decibels - type: number - format: float - volume: - type: number - format: float - audioMute: - type: integer - rgbColor: - type: integer - title: - type: string - audioDeviceName: - type: string - streamIndex: - description: MIMO channel. Not relevant when connected to SI (single Rx). - type: integer - useReverseAPI: - description: Synchronize with reverse API (1 for yes, 0 for no) - type: integer - reverseAPIAddress: - type: string - reverseAPIPort: - type: integer - reverseAPIDeviceIndex: - type: integer - reverseAPIChannelIndex: - type: integer - identThreshold: - description: Morse code ident threshold (linear SNR) - type: integer - channelMarker: - $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" - rollupState: - $ref: "/doc/swagger/include/RollupState.yaml#/RollupState" - -VORDemodSCReport: - description: VORDemodSC - properties: - channelPowerDB: - description: power received in channel (dB) - type: number - format: float - squelch: - description: squelch status (1 if open else 0) - type: integer - audioSampleRate: - type: integer - volume: - type: number - format: float - navId: - description: VOR unique identifier when set by VOR localizer feature - type: integer - radial: - description: current detected radial (degrees) - type: number - format: float - refMag: - description: current reference signal magnitude (dB) - type: number - format: float - varMag: - description: current variable signal magnitude (dB) - type: number - format: float - validRadial: - type: integer - description: > - Radial validity estimation - * 0 - Radial is invalid - * 1 - Radial is valid - validRefMag: - type: integer - description: > - Reference signal magnitude validity - * 0 - Magnitude below threshold - * 1 - Magnitude above threshold - validVarMag: - type: integer - description: > - Variable signal magnitude validity - * 0 - Magnitude below threshold - * 1 - Magnitude above threshold - morseIdent: - description: current identification morse code transcript - type: string diff --git a/sdrbase/webapi/webapirequestmapper.cpp b/sdrbase/webapi/webapirequestmapper.cpp index 05694994b..ad7abb888 100644 --- a/sdrbase/webapi/webapirequestmapper.cpp +++ b/sdrbase/webapi/webapirequestmapper.cpp @@ -4357,11 +4357,11 @@ bool WebAPIRequestMapper::getChannelSettings( channelSettings->setUdpSinkSettings(new SWGSDRangel::SWGUDPSinkSettings()); channelSettings->getUdpSinkSettings()->fromJsonObject(settingsJsonObject); } - else if (channelSettingsKey == "VORDemodMCSettings") - { - channelSettings->setVorDemodMcSettings(new SWGSDRangel::SWGVORDemodMCSettings()); - channelSettings->getVorDemodMcSettings()->fromJsonObject(settingsJsonObject); - } + // else if (channelSettingsKey == "VORDemodMCSettings") + // { + // channelSettings->setVorDemodMcSettings(new SWGSDRangel::SWGVORDemodMCSettings()); + // channelSettings->getVorDemodMcSettings()->fromJsonObject(settingsJsonObject); + // } else if (channelSettingsKey == "VORDemodSettings") { channelSettings->setVorDemodSettings(new SWGSDRangel::SWGVORDemodSettings()); @@ -5082,7 +5082,7 @@ void WebAPIRequestMapper::resetChannelSettings(SWGSDRangel::SWGChannelSettings& channelSettings.setSsbModSettings(nullptr); channelSettings.setUdpSourceSettings(nullptr); channelSettings.setUdpSinkSettings(nullptr); - channelSettings.setVorDemodMcSettings(nullptr); + // channelSettings.setVorDemodMcSettings(nullptr); channelSettings.setVorDemodSettings(nullptr); channelSettings.setWfmDemodSettings(nullptr); channelSettings.setWfmModSettings(nullptr); @@ -5114,7 +5114,7 @@ void WebAPIRequestMapper::resetChannelReport(SWGSDRangel::SWGChannelReport& chan channelReport.setSsbModReport(nullptr); channelReport.setUdpSourceReport(nullptr); channelReport.setUdpSinkReport(nullptr); - channelReport.setVorDemodMcReport(nullptr); + // channelReport.setVorDemodMcReport(nullptr); channelReport.setVorDemodReport(nullptr); channelReport.setWfmDemodReport(nullptr); channelReport.setWfmModReport(nullptr); diff --git a/swagger/sdrangel/api/swagger/include/ChannelReport.yaml b/swagger/sdrangel/api/swagger/include/ChannelReport.yaml index f4fc3ca98..deda36e1b 100644 --- a/swagger/sdrangel/api/swagger/include/ChannelReport.yaml +++ b/swagger/sdrangel/api/swagger/include/ChannelReport.yaml @@ -77,8 +77,8 @@ ChannelReport: $ref: "http://swgserver:8081/api/swagger/include/UDPSource.yaml#/UDPSourceReport" UDPSinkReport: $ref: "http://swgserver:8081/api/swagger/include/UDPSink.yaml#/UDPSinkReport" - VORDemodMCReport: - $ref: "http://swgserver:8081/api/swagger/include/VORDemodMC.yaml#/VORDemodMCReport" + # VORDemodMCReport: + # $ref: "http://swgserver:8081/api/swagger/include/VORDemodMC.yaml#/VORDemodMCReport" VORDemodReport: $ref: "http://swgserver:8081/api/swagger/include/VORDemod.yaml#/VORDemodReport" WFMDemodReport: diff --git a/swagger/sdrangel/api/swagger/include/ChannelSettings.yaml b/swagger/sdrangel/api/swagger/include/ChannelSettings.yaml index 0f9648469..b7c594db1 100644 --- a/swagger/sdrangel/api/swagger/include/ChannelSettings.yaml +++ b/swagger/sdrangel/api/swagger/include/ChannelSettings.yaml @@ -101,8 +101,8 @@ ChannelSettings: $ref: "http://swgserver:8081/api/swagger/include/UDPSource.yaml#/UDPSourceSettings" UDPSinkSettings: $ref: "http://swgserver:8081/api/swagger/include/UDPSink.yaml#/UDPSinkSettings" - VORDemodMCSettings: - $ref: "http://swgserver:8081/api/swagger/include/VORDemodMC.yaml#/VORDemodMCSettings" + # VORDemodMCSettings: + # $ref: "http://swgserver:8081/api/swagger/include/VORDemodMC.yaml#/VORDemodMCSettings" VORDemodSettings: $ref: "http://swgserver:8081/api/swagger/include/VORDemod.yaml#/VORDemodSettings" WFMDemodSettings: diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 6d00be163..51fc25d47 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -3377,9 +3377,6 @@ margin-bottom: 20px; "UDPSinkReport" : { "$ref" : "#/definitions/UDPSinkReport" }, - "VORDemodMCReport" : { - "$ref" : "#/definitions/VORDemodMCReport" - }, "VORDemodReport" : { "$ref" : "#/definitions/VORDemodReport" }, @@ -3538,9 +3535,6 @@ margin-bottom: 20px; "UDPSinkSettings" : { "$ref" : "#/definitions/UDPSinkSettings" }, - "VORDemodMCSettings" : { - "$ref" : "#/definitions/VORDemodMCSettings" - }, "VORDemodSettings" : { "$ref" : "#/definitions/VORDemodSettings" }, @@ -13615,83 +13609,6 @@ margin-bottom: 20px; } }, "description" : "USRP" -}; - defs.VORDemodMCReport = { - "properties" : { - "channelPowerDB" : { - "type" : "number", - "format" : "float", - "description" : "power received in channel (dB)" - }, - "squelch" : { - "type" : "integer", - "description" : "squelch status (1 if open else 0)" - }, - "audioSampleRate" : { - "type" : "integer" - } - }, - "description" : "VORDemodMC" -}; - defs.VORDemodMCSettings = { - "properties" : { - "squelch" : { - "type" : "number", - "format" : "float", - "description" : "power squelch threshold in decibels" - }, - "volume" : { - "type" : "number", - "format" : "float" - }, - "audioMute" : { - "type" : "integer" - }, - "rgbColor" : { - "type" : "integer" - }, - "title" : { - "type" : "string" - }, - "audioDeviceName" : { - "type" : "string" - }, - "streamIndex" : { - "type" : "integer", - "description" : "MIMO channel. Not relevant when connected to SI (single Rx)." - }, - "useReverseAPI" : { - "type" : "integer", - "description" : "Synchronize with reverse API (1 for yes, 0 for no)" - }, - "reverseAPIAddress" : { - "type" : "string" - }, - "reverseAPIPort" : { - "type" : "integer" - }, - "reverseAPIDeviceIndex" : { - "type" : "integer" - }, - "reverseAPIChannelIndex" : { - "type" : "integer" - }, - "identThreshold" : { - "type" : "integer", - "description" : "Morse code ident threshold (linear SNR)" - }, - "magDecAdjust" : { - "type" : "integer", - "description" : "Adjust radial lines on map for magnetic declination of VOR" - }, - "channelMarker" : { - "$ref" : "#/definitions/ChannelMarker" - }, - "rollupState" : { - "$ref" : "#/definitions/RollupState" - } - }, - "description" : "VORDemodMC" }; defs.VORDemodReport = { "properties" : { @@ -52552,7 +52469,7 @@ except ApiException as e:
- Generated 2022-05-01T11:46:55.368+02:00 + Generated 2022-05-01T22:14:53.451+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelReport.cpp b/swagger/sdrangel/code/qt5/client/SWGChannelReport.cpp index e14c302eb..330884bb2 100644 --- a/swagger/sdrangel/code/qt5/client/SWGChannelReport.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGChannelReport.cpp @@ -98,8 +98,6 @@ SWGChannelReport::SWGChannelReport() { m_udp_source_report_isSet = false; udp_sink_report = nullptr; m_udp_sink_report_isSet = false; - vor_demod_mc_report = nullptr; - m_vor_demod_mc_report_isSet = false; vor_demod_report = nullptr; m_vor_demod_report_isSet = false; wfm_demod_report = nullptr; @@ -184,8 +182,6 @@ SWGChannelReport::init() { m_udp_source_report_isSet = false; udp_sink_report = new SWGUDPSinkReport(); m_udp_sink_report_isSet = false; - vor_demod_mc_report = new SWGVORDemodMCReport(); - m_vor_demod_mc_report_isSet = false; vor_demod_report = new SWGVORDemodReport(); m_vor_demod_report_isSet = false; wfm_demod_report = new SWGWFMDemodReport(); @@ -299,9 +295,6 @@ SWGChannelReport::cleanup() { if(udp_sink_report != nullptr) { delete udp_sink_report; } - if(vor_demod_mc_report != nullptr) { - delete vor_demod_mc_report; - } if(vor_demod_report != nullptr) { delete vor_demod_report; } @@ -394,8 +387,6 @@ SWGChannelReport::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&udp_sink_report, pJson["UDPSinkReport"], "SWGUDPSinkReport", "SWGUDPSinkReport"); - ::SWGSDRangel::setValue(&vor_demod_mc_report, pJson["VORDemodMCReport"], "SWGVORDemodMCReport", "SWGVORDemodMCReport"); - ::SWGSDRangel::setValue(&vor_demod_report, pJson["VORDemodReport"], "SWGVORDemodReport", "SWGVORDemodReport"); ::SWGSDRangel::setValue(&wfm_demod_report, pJson["WFMDemodReport"], "SWGWFMDemodReport", "SWGWFMDemodReport"); @@ -523,9 +514,6 @@ SWGChannelReport::asJsonObject() { if((udp_sink_report != nullptr) && (udp_sink_report->isSet())){ toJsonValue(QString("UDPSinkReport"), udp_sink_report, obj, QString("SWGUDPSinkReport")); } - if((vor_demod_mc_report != nullptr) && (vor_demod_mc_report->isSet())){ - toJsonValue(QString("VORDemodMCReport"), vor_demod_mc_report, obj, QString("SWGVORDemodMCReport")); - } if((vor_demod_report != nullptr) && (vor_demod_report->isSet())){ toJsonValue(QString("VORDemodReport"), vor_demod_report, obj, QString("SWGVORDemodReport")); } @@ -889,16 +877,6 @@ SWGChannelReport::setUdpSinkReport(SWGUDPSinkReport* udp_sink_report) { this->m_udp_sink_report_isSet = true; } -SWGVORDemodMCReport* -SWGChannelReport::getVorDemodMcReport() { - return vor_demod_mc_report; -} -void -SWGChannelReport::setVorDemodMcReport(SWGVORDemodMCReport* vor_demod_mc_report) { - this->vor_demod_mc_report = vor_demod_mc_report; - this->m_vor_demod_mc_report_isSet = true; -} - SWGVORDemodReport* SWGChannelReport::getVorDemodReport() { return vor_demod_report; @@ -1039,9 +1017,6 @@ SWGChannelReport::isSet(){ if(udp_sink_report && udp_sink_report->isSet()){ isObjectUpdated = true; break; } - if(vor_demod_mc_report && vor_demod_mc_report->isSet()){ - isObjectUpdated = true; break; - } if(vor_demod_report && vor_demod_report->isSet()){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelReport.h b/swagger/sdrangel/code/qt5/client/SWGChannelReport.h index 023ec6d43..df9bff4a9 100644 --- a/swagger/sdrangel/code/qt5/client/SWGChannelReport.h +++ b/swagger/sdrangel/code/qt5/client/SWGChannelReport.h @@ -55,7 +55,6 @@ #include "SWGSigMFFileSinkReport.h" #include "SWGUDPSinkReport.h" #include "SWGUDPSourceReport.h" -#include "SWGVORDemodMCReport.h" #include "SWGVORDemodReport.h" #include "SWGWFMDemodReport.h" #include "SWGWFMModReport.h" @@ -184,9 +183,6 @@ public: SWGUDPSinkReport* getUdpSinkReport(); void setUdpSinkReport(SWGUDPSinkReport* udp_sink_report); - SWGVORDemodMCReport* getVorDemodMcReport(); - void setVorDemodMcReport(SWGVORDemodMCReport* vor_demod_mc_report); - SWGVORDemodReport* getVorDemodReport(); void setVorDemodReport(SWGVORDemodReport* vor_demod_report); @@ -305,9 +301,6 @@ private: SWGUDPSinkReport* udp_sink_report; bool m_udp_sink_report_isSet; - SWGVORDemodMCReport* vor_demod_mc_report; - bool m_vor_demod_mc_report_isSet; - SWGVORDemodReport* vor_demod_report; bool m_vor_demod_report_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGChannelSettings.cpp index abc0dcd94..6002e8c84 100644 --- a/swagger/sdrangel/code/qt5/client/SWGChannelSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGChannelSettings.cpp @@ -120,8 +120,6 @@ SWGChannelSettings::SWGChannelSettings() { m_udp_source_settings_isSet = false; udp_sink_settings = nullptr; m_udp_sink_settings_isSet = false; - vor_demod_mc_settings = nullptr; - m_vor_demod_mc_settings_isSet = false; vor_demod_settings = nullptr; m_vor_demod_settings_isSet = false; wfm_demod_settings = nullptr; @@ -228,8 +226,6 @@ SWGChannelSettings::init() { m_udp_source_settings_isSet = false; udp_sink_settings = new SWGUDPSinkSettings(); m_udp_sink_settings_isSet = false; - vor_demod_mc_settings = new SWGVORDemodMCSettings(); - m_vor_demod_mc_settings_isSet = false; vor_demod_settings = new SWGVORDemodSettings(); m_vor_demod_settings_isSet = false; wfm_demod_settings = new SWGWFMDemodSettings(); @@ -372,9 +368,6 @@ SWGChannelSettings::cleanup() { if(udp_sink_settings != nullptr) { delete udp_sink_settings; } - if(vor_demod_mc_settings != nullptr) { - delete vor_demod_mc_settings; - } if(vor_demod_settings != nullptr) { delete vor_demod_settings; } @@ -489,8 +482,6 @@ SWGChannelSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&udp_sink_settings, pJson["UDPSinkSettings"], "SWGUDPSinkSettings", "SWGUDPSinkSettings"); - ::SWGSDRangel::setValue(&vor_demod_mc_settings, pJson["VORDemodMCSettings"], "SWGVORDemodMCSettings", "SWGVORDemodMCSettings"); - ::SWGSDRangel::setValue(&vor_demod_settings, pJson["VORDemodSettings"], "SWGVORDemodSettings", "SWGVORDemodSettings"); ::SWGSDRangel::setValue(&wfm_demod_settings, pJson["WFMDemodSettings"], "SWGWFMDemodSettings", "SWGWFMDemodSettings"); @@ -651,9 +642,6 @@ SWGChannelSettings::asJsonObject() { if((udp_sink_settings != nullptr) && (udp_sink_settings->isSet())){ toJsonValue(QString("UDPSinkSettings"), udp_sink_settings, obj, QString("SWGUDPSinkSettings")); } - if((vor_demod_mc_settings != nullptr) && (vor_demod_mc_settings->isSet())){ - toJsonValue(QString("VORDemodMCSettings"), vor_demod_mc_settings, obj, QString("SWGVORDemodMCSettings")); - } if((vor_demod_settings != nullptr) && (vor_demod_settings->isSet())){ toJsonValue(QString("VORDemodSettings"), vor_demod_settings, obj, QString("SWGVORDemodSettings")); } @@ -1127,16 +1115,6 @@ SWGChannelSettings::setUdpSinkSettings(SWGUDPSinkSettings* udp_sink_settings) { this->m_udp_sink_settings_isSet = true; } -SWGVORDemodMCSettings* -SWGChannelSettings::getVorDemodMcSettings() { - return vor_demod_mc_settings; -} -void -SWGChannelSettings::setVorDemodMcSettings(SWGVORDemodMCSettings* vor_demod_mc_settings) { - this->vor_demod_mc_settings = vor_demod_mc_settings; - this->m_vor_demod_mc_settings_isSet = true; -} - SWGVORDemodSettings* SWGChannelSettings::getVorDemodSettings() { return vor_demod_settings; @@ -1310,9 +1288,6 @@ SWGChannelSettings::isSet(){ if(udp_sink_settings && udp_sink_settings->isSet()){ isObjectUpdated = true; break; } - if(vor_demod_mc_settings && vor_demod_mc_settings->isSet()){ - isObjectUpdated = true; break; - } if(vor_demod_settings && vor_demod_settings->isSet()){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelSettings.h b/swagger/sdrangel/code/qt5/client/SWGChannelSettings.h index a87e34202..14960de0b 100644 --- a/swagger/sdrangel/code/qt5/client/SWGChannelSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGChannelSettings.h @@ -64,7 +64,6 @@ #include "SWGSigMFFileSinkSettings.h" #include "SWGUDPSinkSettings.h" #include "SWGUDPSourceSettings.h" -#include "SWGVORDemodMCSettings.h" #include "SWGVORDemodSettings.h" #include "SWGWFMDemodSettings.h" #include "SWGWFMModSettings.h" @@ -226,9 +225,6 @@ public: SWGUDPSinkSettings* getUdpSinkSettings(); void setUdpSinkSettings(SWGUDPSinkSettings* udp_sink_settings); - SWGVORDemodMCSettings* getVorDemodMcSettings(); - void setVorDemodMcSettings(SWGVORDemodMCSettings* vor_demod_mc_settings); - SWGVORDemodSettings* getVorDemodSettings(); void setVorDemodSettings(SWGVORDemodSettings* vor_demod_settings); @@ -380,9 +376,6 @@ private: SWGUDPSinkSettings* udp_sink_settings; bool m_udp_sink_settings_isSet; - SWGVORDemodMCSettings* vor_demod_mc_settings; - bool m_vor_demod_mc_settings_isSet; - SWGVORDemodSettings* vor_demod_settings; bool m_vor_demod_settings_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h index e5f64bc64..6ff46686e 100644 --- a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h +++ b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h @@ -302,8 +302,6 @@ #include "SWGUSRPInputSettings.h" #include "SWGUSRPOutputReport.h" #include "SWGUSRPOutputSettings.h" -#include "SWGVORDemodMCReport.h" -#include "SWGVORDemodMCSettings.h" #include "SWGVORDemodReport.h" #include "SWGVORDemodSettings.h" #include "SWGVORLocalizerActions.h" @@ -1763,16 +1761,6 @@ namespace SWGSDRangel { obj->init(); return obj; } - if(QString("SWGVORDemodMCReport").compare(type) == 0) { - SWGVORDemodMCReport *obj = new SWGVORDemodMCReport(); - obj->init(); - return obj; - } - if(QString("SWGVORDemodMCSettings").compare(type) == 0) { - SWGVORDemodMCSettings *obj = new SWGVORDemodMCSettings(); - obj->init(); - return obj; - } if(QString("SWGVORDemodReport").compare(type) == 0) { SWGVORDemodReport *obj = new SWGVORDemodReport(); obj->init(); diff --git a/swagger/sdrangel/code/qt5/client/SWGVORDemodMCReport.cpp b/swagger/sdrangel/code/qt5/client/SWGVORDemodMCReport.cpp deleted file mode 100644 index b986139f7..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGVORDemodMCReport.cpp +++ /dev/null @@ -1,154 +0,0 @@ -/** - * 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 "SWGVORDemodMCReport.h" - -#include "SWGHelpers.h" - -#include -#include -#include -#include - -namespace SWGSDRangel { - -SWGVORDemodMCReport::SWGVORDemodMCReport(QString* json) { - init(); - this->fromJson(*json); -} - -SWGVORDemodMCReport::SWGVORDemodMCReport() { - channel_power_db = 0.0f; - m_channel_power_db_isSet = false; - squelch = 0; - m_squelch_isSet = false; - audio_sample_rate = 0; - m_audio_sample_rate_isSet = false; -} - -SWGVORDemodMCReport::~SWGVORDemodMCReport() { - this->cleanup(); -} - -void -SWGVORDemodMCReport::init() { - channel_power_db = 0.0f; - m_channel_power_db_isSet = false; - squelch = 0; - m_squelch_isSet = false; - audio_sample_rate = 0; - m_audio_sample_rate_isSet = false; -} - -void -SWGVORDemodMCReport::cleanup() { - - - -} - -SWGVORDemodMCReport* -SWGVORDemodMCReport::fromJson(QString &json) { - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonObject jsonObject = doc.object(); - this->fromJsonObject(jsonObject); - return this; -} - -void -SWGVORDemodMCReport::fromJsonObject(QJsonObject &pJson) { - ::SWGSDRangel::setValue(&channel_power_db, pJson["channelPowerDB"], "float", ""); - - ::SWGSDRangel::setValue(&squelch, pJson["squelch"], "qint32", ""); - - ::SWGSDRangel::setValue(&audio_sample_rate, pJson["audioSampleRate"], "qint32", ""); - -} - -QString -SWGVORDemodMCReport::asJson () -{ - QJsonObject* obj = this->asJsonObject(); - - QJsonDocument doc(*obj); - QByteArray bytes = doc.toJson(); - delete obj; - return QString(bytes); -} - -QJsonObject* -SWGVORDemodMCReport::asJsonObject() { - QJsonObject* obj = new QJsonObject(); - if(m_channel_power_db_isSet){ - obj->insert("channelPowerDB", QJsonValue(channel_power_db)); - } - if(m_squelch_isSet){ - obj->insert("squelch", QJsonValue(squelch)); - } - if(m_audio_sample_rate_isSet){ - obj->insert("audioSampleRate", QJsonValue(audio_sample_rate)); - } - - return obj; -} - -float -SWGVORDemodMCReport::getChannelPowerDb() { - return channel_power_db; -} -void -SWGVORDemodMCReport::setChannelPowerDb(float channel_power_db) { - this->channel_power_db = channel_power_db; - this->m_channel_power_db_isSet = true; -} - -qint32 -SWGVORDemodMCReport::getSquelch() { - return squelch; -} -void -SWGVORDemodMCReport::setSquelch(qint32 squelch) { - this->squelch = squelch; - this->m_squelch_isSet = true; -} - -qint32 -SWGVORDemodMCReport::getAudioSampleRate() { - return audio_sample_rate; -} -void -SWGVORDemodMCReport::setAudioSampleRate(qint32 audio_sample_rate) { - this->audio_sample_rate = audio_sample_rate; - this->m_audio_sample_rate_isSet = true; -} - - -bool -SWGVORDemodMCReport::isSet(){ - bool isObjectUpdated = false; - do{ - if(m_channel_power_db_isSet){ - isObjectUpdated = true; break; - } - if(m_squelch_isSet){ - isObjectUpdated = true; break; - } - if(m_audio_sample_rate_isSet){ - isObjectUpdated = true; break; - } - }while(false); - return isObjectUpdated; -} -} - diff --git a/swagger/sdrangel/code/qt5/client/SWGVORDemodMCReport.h b/swagger/sdrangel/code/qt5/client/SWGVORDemodMCReport.h deleted file mode 100644 index 37927bd75..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGVORDemodMCReport.h +++ /dev/null @@ -1,70 +0,0 @@ -/** - * 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. - */ - -/* - * SWGVORDemodMCReport.h - * - * VORDemodMC - */ - -#ifndef SWGVORDemodMCReport_H_ -#define SWGVORDemodMCReport_H_ - -#include - - - -#include "SWGObject.h" -#include "export.h" - -namespace SWGSDRangel { - -class SWG_API SWGVORDemodMCReport: public SWGObject { -public: - SWGVORDemodMCReport(); - SWGVORDemodMCReport(QString* json); - virtual ~SWGVORDemodMCReport(); - void init(); - void cleanup(); - - virtual QString asJson () override; - virtual QJsonObject* asJsonObject() override; - virtual void fromJsonObject(QJsonObject &json) override; - virtual SWGVORDemodMCReport* fromJson(QString &jsonString) override; - - float getChannelPowerDb(); - void setChannelPowerDb(float channel_power_db); - - qint32 getSquelch(); - void setSquelch(qint32 squelch); - - qint32 getAudioSampleRate(); - void setAudioSampleRate(qint32 audio_sample_rate); - - - virtual bool isSet() override; - -private: - float channel_power_db; - bool m_channel_power_db_isSet; - - qint32 squelch; - bool m_squelch_isSet; - - qint32 audio_sample_rate; - bool m_audio_sample_rate_isSet; - -}; - -} - -#endif /* SWGVORDemodMCReport_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGVORDemodMCSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGVORDemodMCSettings.cpp deleted file mode 100644 index 1e7cc0201..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGVORDemodMCSettings.cpp +++ /dev/null @@ -1,463 +0,0 @@ -/** - * 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 "SWGVORDemodMCSettings.h" - -#include "SWGHelpers.h" - -#include -#include -#include -#include - -namespace SWGSDRangel { - -SWGVORDemodMCSettings::SWGVORDemodMCSettings(QString* json) { - init(); - this->fromJson(*json); -} - -SWGVORDemodMCSettings::SWGVORDemodMCSettings() { - squelch = 0.0f; - m_squelch_isSet = false; - volume = 0.0f; - m_volume_isSet = false; - audio_mute = 0; - m_audio_mute_isSet = false; - rgb_color = 0; - m_rgb_color_isSet = false; - title = nullptr; - m_title_isSet = false; - audio_device_name = nullptr; - m_audio_device_name_isSet = false; - stream_index = 0; - m_stream_index_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_device_index = 0; - m_reverse_api_device_index_isSet = false; - reverse_api_channel_index = 0; - m_reverse_api_channel_index_isSet = false; - ident_threshold = 0; - m_ident_threshold_isSet = false; - mag_dec_adjust = 0; - m_mag_dec_adjust_isSet = false; - channel_marker = nullptr; - m_channel_marker_isSet = false; - rollup_state = nullptr; - m_rollup_state_isSet = false; -} - -SWGVORDemodMCSettings::~SWGVORDemodMCSettings() { - this->cleanup(); -} - -void -SWGVORDemodMCSettings::init() { - squelch = 0.0f; - m_squelch_isSet = false; - volume = 0.0f; - m_volume_isSet = false; - audio_mute = 0; - m_audio_mute_isSet = false; - rgb_color = 0; - m_rgb_color_isSet = false; - title = new QString(""); - m_title_isSet = false; - audio_device_name = new QString(""); - m_audio_device_name_isSet = false; - stream_index = 0; - m_stream_index_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_device_index = 0; - m_reverse_api_device_index_isSet = false; - reverse_api_channel_index = 0; - m_reverse_api_channel_index_isSet = false; - ident_threshold = 0; - m_ident_threshold_isSet = false; - mag_dec_adjust = 0; - m_mag_dec_adjust_isSet = false; - channel_marker = new SWGChannelMarker(); - m_channel_marker_isSet = false; - rollup_state = new SWGRollupState(); - m_rollup_state_isSet = false; -} - -void -SWGVORDemodMCSettings::cleanup() { - - - - - if(title != nullptr) { - delete title; - } - if(audio_device_name != nullptr) { - delete audio_device_name; - } - - - if(reverse_api_address != nullptr) { - delete reverse_api_address; - } - - - - - - if(channel_marker != nullptr) { - delete channel_marker; - } - if(rollup_state != nullptr) { - delete rollup_state; - } -} - -SWGVORDemodMCSettings* -SWGVORDemodMCSettings::fromJson(QString &json) { - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonObject jsonObject = doc.object(); - this->fromJsonObject(jsonObject); - return this; -} - -void -SWGVORDemodMCSettings::fromJsonObject(QJsonObject &pJson) { - ::SWGSDRangel::setValue(&squelch, pJson["squelch"], "float", ""); - - ::SWGSDRangel::setValue(&volume, pJson["volume"], "float", ""); - - ::SWGSDRangel::setValue(&audio_mute, pJson["audioMute"], "qint32", ""); - - ::SWGSDRangel::setValue(&rgb_color, pJson["rgbColor"], "qint32", ""); - - ::SWGSDRangel::setValue(&title, pJson["title"], "QString", "QString"); - - ::SWGSDRangel::setValue(&audio_device_name, pJson["audioDeviceName"], "QString", "QString"); - - ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "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_device_index, pJson["reverseAPIDeviceIndex"], "qint32", ""); - - ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", ""); - - ::SWGSDRangel::setValue(&ident_threshold, pJson["identThreshold"], "qint32", ""); - - ::SWGSDRangel::setValue(&mag_dec_adjust, pJson["magDecAdjust"], "qint32", ""); - - ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); - - ::SWGSDRangel::setValue(&rollup_state, pJson["rollupState"], "SWGRollupState", "SWGRollupState"); - -} - -QString -SWGVORDemodMCSettings::asJson () -{ - QJsonObject* obj = this->asJsonObject(); - - QJsonDocument doc(*obj); - QByteArray bytes = doc.toJson(); - delete obj; - return QString(bytes); -} - -QJsonObject* -SWGVORDemodMCSettings::asJsonObject() { - QJsonObject* obj = new QJsonObject(); - if(m_squelch_isSet){ - obj->insert("squelch", QJsonValue(squelch)); - } - if(m_volume_isSet){ - obj->insert("volume", QJsonValue(volume)); - } - if(m_audio_mute_isSet){ - obj->insert("audioMute", QJsonValue(audio_mute)); - } - if(m_rgb_color_isSet){ - obj->insert("rgbColor", QJsonValue(rgb_color)); - } - if(title != nullptr && *title != QString("")){ - toJsonValue(QString("title"), title, obj, QString("QString")); - } - if(audio_device_name != nullptr && *audio_device_name != QString("")){ - toJsonValue(QString("audioDeviceName"), audio_device_name, obj, QString("QString")); - } - if(m_stream_index_isSet){ - obj->insert("streamIndex", QJsonValue(stream_index)); - } - 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_device_index_isSet){ - obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index)); - } - if(m_reverse_api_channel_index_isSet){ - obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index)); - } - if(m_ident_threshold_isSet){ - obj->insert("identThreshold", QJsonValue(ident_threshold)); - } - if(m_mag_dec_adjust_isSet){ - obj->insert("magDecAdjust", QJsonValue(mag_dec_adjust)); - } - if((channel_marker != nullptr) && (channel_marker->isSet())){ - toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); - } - if((rollup_state != nullptr) && (rollup_state->isSet())){ - toJsonValue(QString("rollupState"), rollup_state, obj, QString("SWGRollupState")); - } - - return obj; -} - -float -SWGVORDemodMCSettings::getSquelch() { - return squelch; -} -void -SWGVORDemodMCSettings::setSquelch(float squelch) { - this->squelch = squelch; - this->m_squelch_isSet = true; -} - -float -SWGVORDemodMCSettings::getVolume() { - return volume; -} -void -SWGVORDemodMCSettings::setVolume(float volume) { - this->volume = volume; - this->m_volume_isSet = true; -} - -qint32 -SWGVORDemodMCSettings::getAudioMute() { - return audio_mute; -} -void -SWGVORDemodMCSettings::setAudioMute(qint32 audio_mute) { - this->audio_mute = audio_mute; - this->m_audio_mute_isSet = true; -} - -qint32 -SWGVORDemodMCSettings::getRgbColor() { - return rgb_color; -} -void -SWGVORDemodMCSettings::setRgbColor(qint32 rgb_color) { - this->rgb_color = rgb_color; - this->m_rgb_color_isSet = true; -} - -QString* -SWGVORDemodMCSettings::getTitle() { - return title; -} -void -SWGVORDemodMCSettings::setTitle(QString* title) { - this->title = title; - this->m_title_isSet = true; -} - -QString* -SWGVORDemodMCSettings::getAudioDeviceName() { - return audio_device_name; -} -void -SWGVORDemodMCSettings::setAudioDeviceName(QString* audio_device_name) { - this->audio_device_name = audio_device_name; - this->m_audio_device_name_isSet = true; -} - -qint32 -SWGVORDemodMCSettings::getStreamIndex() { - return stream_index; -} -void -SWGVORDemodMCSettings::setStreamIndex(qint32 stream_index) { - this->stream_index = stream_index; - this->m_stream_index_isSet = true; -} - -qint32 -SWGVORDemodMCSettings::getUseReverseApi() { - return use_reverse_api; -} -void -SWGVORDemodMCSettings::setUseReverseApi(qint32 use_reverse_api) { - this->use_reverse_api = use_reverse_api; - this->m_use_reverse_api_isSet = true; -} - -QString* -SWGVORDemodMCSettings::getReverseApiAddress() { - return reverse_api_address; -} -void -SWGVORDemodMCSettings::setReverseApiAddress(QString* reverse_api_address) { - this->reverse_api_address = reverse_api_address; - this->m_reverse_api_address_isSet = true; -} - -qint32 -SWGVORDemodMCSettings::getReverseApiPort() { - return reverse_api_port; -} -void -SWGVORDemodMCSettings::setReverseApiPort(qint32 reverse_api_port) { - this->reverse_api_port = reverse_api_port; - this->m_reverse_api_port_isSet = true; -} - -qint32 -SWGVORDemodMCSettings::getReverseApiDeviceIndex() { - return reverse_api_device_index; -} -void -SWGVORDemodMCSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { - this->reverse_api_device_index = reverse_api_device_index; - this->m_reverse_api_device_index_isSet = true; -} - -qint32 -SWGVORDemodMCSettings::getReverseApiChannelIndex() { - return reverse_api_channel_index; -} -void -SWGVORDemodMCSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) { - this->reverse_api_channel_index = reverse_api_channel_index; - this->m_reverse_api_channel_index_isSet = true; -} - -qint32 -SWGVORDemodMCSettings::getIdentThreshold() { - return ident_threshold; -} -void -SWGVORDemodMCSettings::setIdentThreshold(qint32 ident_threshold) { - this->ident_threshold = ident_threshold; - this->m_ident_threshold_isSet = true; -} - -qint32 -SWGVORDemodMCSettings::getMagDecAdjust() { - return mag_dec_adjust; -} -void -SWGVORDemodMCSettings::setMagDecAdjust(qint32 mag_dec_adjust) { - this->mag_dec_adjust = mag_dec_adjust; - this->m_mag_dec_adjust_isSet = true; -} - -SWGChannelMarker* -SWGVORDemodMCSettings::getChannelMarker() { - return channel_marker; -} -void -SWGVORDemodMCSettings::setChannelMarker(SWGChannelMarker* channel_marker) { - this->channel_marker = channel_marker; - this->m_channel_marker_isSet = true; -} - -SWGRollupState* -SWGVORDemodMCSettings::getRollupState() { - return rollup_state; -} -void -SWGVORDemodMCSettings::setRollupState(SWGRollupState* rollup_state) { - this->rollup_state = rollup_state; - this->m_rollup_state_isSet = true; -} - - -bool -SWGVORDemodMCSettings::isSet(){ - bool isObjectUpdated = false; - do{ - if(m_squelch_isSet){ - isObjectUpdated = true; break; - } - if(m_volume_isSet){ - isObjectUpdated = true; break; - } - if(m_audio_mute_isSet){ - isObjectUpdated = true; break; - } - if(m_rgb_color_isSet){ - isObjectUpdated = true; break; - } - if(title && *title != QString("")){ - isObjectUpdated = true; break; - } - if(audio_device_name && *audio_device_name != QString("")){ - isObjectUpdated = true; break; - } - if(m_stream_index_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_device_index_isSet){ - isObjectUpdated = true; break; - } - if(m_reverse_api_channel_index_isSet){ - isObjectUpdated = true; break; - } - if(m_ident_threshold_isSet){ - isObjectUpdated = true; break; - } - if(m_mag_dec_adjust_isSet){ - isObjectUpdated = true; break; - } - if(channel_marker && channel_marker->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/SWGVORDemodMCSettings.h b/swagger/sdrangel/code/qt5/client/SWGVORDemodMCSettings.h deleted file mode 100644 index 3bd0f407f..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGVORDemodMCSettings.h +++ /dev/null @@ -1,151 +0,0 @@ -/** - * 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. - */ - -/* - * SWGVORDemodMCSettings.h - * - * VORDemodMC - */ - -#ifndef SWGVORDemodMCSettings_H_ -#define SWGVORDemodMCSettings_H_ - -#include - - -#include "SWGChannelMarker.h" -#include "SWGRollupState.h" -#include - -#include "SWGObject.h" -#include "export.h" - -namespace SWGSDRangel { - -class SWG_API SWGVORDemodMCSettings: public SWGObject { -public: - SWGVORDemodMCSettings(); - SWGVORDemodMCSettings(QString* json); - virtual ~SWGVORDemodMCSettings(); - void init(); - void cleanup(); - - virtual QString asJson () override; - virtual QJsonObject* asJsonObject() override; - virtual void fromJsonObject(QJsonObject &json) override; - virtual SWGVORDemodMCSettings* fromJson(QString &jsonString) override; - - float getSquelch(); - void setSquelch(float squelch); - - float getVolume(); - void setVolume(float volume); - - qint32 getAudioMute(); - void setAudioMute(qint32 audio_mute); - - qint32 getRgbColor(); - void setRgbColor(qint32 rgb_color); - - QString* getTitle(); - void setTitle(QString* title); - - QString* getAudioDeviceName(); - void setAudioDeviceName(QString* audio_device_name); - - qint32 getStreamIndex(); - void setStreamIndex(qint32 stream_index); - - 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 getReverseApiDeviceIndex(); - void setReverseApiDeviceIndex(qint32 reverse_api_device_index); - - qint32 getReverseApiChannelIndex(); - void setReverseApiChannelIndex(qint32 reverse_api_channel_index); - - qint32 getIdentThreshold(); - void setIdentThreshold(qint32 ident_threshold); - - qint32 getMagDecAdjust(); - void setMagDecAdjust(qint32 mag_dec_adjust); - - SWGChannelMarker* getChannelMarker(); - void setChannelMarker(SWGChannelMarker* channel_marker); - - SWGRollupState* getRollupState(); - void setRollupState(SWGRollupState* rollup_state); - - - virtual bool isSet() override; - -private: - float squelch; - bool m_squelch_isSet; - - float volume; - bool m_volume_isSet; - - qint32 audio_mute; - bool m_audio_mute_isSet; - - qint32 rgb_color; - bool m_rgb_color_isSet; - - QString* title; - bool m_title_isSet; - - QString* audio_device_name; - bool m_audio_device_name_isSet; - - qint32 stream_index; - bool m_stream_index_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_device_index; - bool m_reverse_api_device_index_isSet; - - qint32 reverse_api_channel_index; - bool m_reverse_api_channel_index_isSet; - - qint32 ident_threshold; - bool m_ident_threshold_isSet; - - qint32 mag_dec_adjust; - bool m_mag_dec_adjust_isSet; - - SWGChannelMarker* channel_marker; - bool m_channel_marker_isSet; - - SWGRollupState* rollup_state; - bool m_rollup_state_isSet; - -}; - -} - -#endif /* SWGVORDemodMCSettings_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGVORDemodSCReport.cpp b/swagger/sdrangel/code/qt5/client/SWGVORDemodSCReport.cpp deleted file mode 100644 index b59d20e7b..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGVORDemodSCReport.cpp +++ /dev/null @@ -1,363 +0,0 @@ -/** - * 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 "SWGVORDemodSCReport.h" - -#include "SWGHelpers.h" - -#include -#include -#include -#include - -namespace SWGSDRangel { - -SWGVORDemodSCReport::SWGVORDemodSCReport(QString* json) { - init(); - this->fromJson(*json); -} - -SWGVORDemodSCReport::SWGVORDemodSCReport() { - channel_power_db = 0.0f; - m_channel_power_db_isSet = false; - squelch = 0; - m_squelch_isSet = false; - audio_sample_rate = 0; - m_audio_sample_rate_isSet = false; - volume = 0.0f; - m_volume_isSet = false; - nav_id = 0; - m_nav_id_isSet = false; - radial = 0.0f; - m_radial_isSet = false; - ref_mag = 0.0f; - m_ref_mag_isSet = false; - var_mag = 0.0f; - m_var_mag_isSet = false; - valid_radial = 0; - m_valid_radial_isSet = false; - valid_ref_mag = 0; - m_valid_ref_mag_isSet = false; - valid_var_mag = 0; - m_valid_var_mag_isSet = false; - morse_ident = nullptr; - m_morse_ident_isSet = false; -} - -SWGVORDemodSCReport::~SWGVORDemodSCReport() { - this->cleanup(); -} - -void -SWGVORDemodSCReport::init() { - channel_power_db = 0.0f; - m_channel_power_db_isSet = false; - squelch = 0; - m_squelch_isSet = false; - audio_sample_rate = 0; - m_audio_sample_rate_isSet = false; - volume = 0.0f; - m_volume_isSet = false; - nav_id = 0; - m_nav_id_isSet = false; - radial = 0.0f; - m_radial_isSet = false; - ref_mag = 0.0f; - m_ref_mag_isSet = false; - var_mag = 0.0f; - m_var_mag_isSet = false; - valid_radial = 0; - m_valid_radial_isSet = false; - valid_ref_mag = 0; - m_valid_ref_mag_isSet = false; - valid_var_mag = 0; - m_valid_var_mag_isSet = false; - morse_ident = new QString(""); - m_morse_ident_isSet = false; -} - -void -SWGVORDemodSCReport::cleanup() { - - - - - - - - - - - - if(morse_ident != nullptr) { - delete morse_ident; - } -} - -SWGVORDemodSCReport* -SWGVORDemodSCReport::fromJson(QString &json) { - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonObject jsonObject = doc.object(); - this->fromJsonObject(jsonObject); - return this; -} - -void -SWGVORDemodSCReport::fromJsonObject(QJsonObject &pJson) { - ::SWGSDRangel::setValue(&channel_power_db, pJson["channelPowerDB"], "float", ""); - - ::SWGSDRangel::setValue(&squelch, pJson["squelch"], "qint32", ""); - - ::SWGSDRangel::setValue(&audio_sample_rate, pJson["audioSampleRate"], "qint32", ""); - - ::SWGSDRangel::setValue(&volume, pJson["volume"], "float", ""); - - ::SWGSDRangel::setValue(&nav_id, pJson["navId"], "qint32", ""); - - ::SWGSDRangel::setValue(&radial, pJson["radial"], "float", ""); - - ::SWGSDRangel::setValue(&ref_mag, pJson["refMag"], "float", ""); - - ::SWGSDRangel::setValue(&var_mag, pJson["varMag"], "float", ""); - - ::SWGSDRangel::setValue(&valid_radial, pJson["validRadial"], "qint32", ""); - - ::SWGSDRangel::setValue(&valid_ref_mag, pJson["validRefMag"], "qint32", ""); - - ::SWGSDRangel::setValue(&valid_var_mag, pJson["validVarMag"], "qint32", ""); - - ::SWGSDRangel::setValue(&morse_ident, pJson["morseIdent"], "QString", "QString"); - -} - -QString -SWGVORDemodSCReport::asJson () -{ - QJsonObject* obj = this->asJsonObject(); - - QJsonDocument doc(*obj); - QByteArray bytes = doc.toJson(); - delete obj; - return QString(bytes); -} - -QJsonObject* -SWGVORDemodSCReport::asJsonObject() { - QJsonObject* obj = new QJsonObject(); - if(m_channel_power_db_isSet){ - obj->insert("channelPowerDB", QJsonValue(channel_power_db)); - } - if(m_squelch_isSet){ - obj->insert("squelch", QJsonValue(squelch)); - } - if(m_audio_sample_rate_isSet){ - obj->insert("audioSampleRate", QJsonValue(audio_sample_rate)); - } - if(m_volume_isSet){ - obj->insert("volume", QJsonValue(volume)); - } - if(m_nav_id_isSet){ - obj->insert("navId", QJsonValue(nav_id)); - } - if(m_radial_isSet){ - obj->insert("radial", QJsonValue(radial)); - } - if(m_ref_mag_isSet){ - obj->insert("refMag", QJsonValue(ref_mag)); - } - if(m_var_mag_isSet){ - obj->insert("varMag", QJsonValue(var_mag)); - } - if(m_valid_radial_isSet){ - obj->insert("validRadial", QJsonValue(valid_radial)); - } - if(m_valid_ref_mag_isSet){ - obj->insert("validRefMag", QJsonValue(valid_ref_mag)); - } - if(m_valid_var_mag_isSet){ - obj->insert("validVarMag", QJsonValue(valid_var_mag)); - } - if(morse_ident != nullptr && *morse_ident != QString("")){ - toJsonValue(QString("morseIdent"), morse_ident, obj, QString("QString")); - } - - return obj; -} - -float -SWGVORDemodSCReport::getChannelPowerDb() { - return channel_power_db; -} -void -SWGVORDemodSCReport::setChannelPowerDb(float channel_power_db) { - this->channel_power_db = channel_power_db; - this->m_channel_power_db_isSet = true; -} - -qint32 -SWGVORDemodSCReport::getSquelch() { - return squelch; -} -void -SWGVORDemodSCReport::setSquelch(qint32 squelch) { - this->squelch = squelch; - this->m_squelch_isSet = true; -} - -qint32 -SWGVORDemodSCReport::getAudioSampleRate() { - return audio_sample_rate; -} -void -SWGVORDemodSCReport::setAudioSampleRate(qint32 audio_sample_rate) { - this->audio_sample_rate = audio_sample_rate; - this->m_audio_sample_rate_isSet = true; -} - -float -SWGVORDemodSCReport::getVolume() { - return volume; -} -void -SWGVORDemodSCReport::setVolume(float volume) { - this->volume = volume; - this->m_volume_isSet = true; -} - -qint32 -SWGVORDemodSCReport::getNavId() { - return nav_id; -} -void -SWGVORDemodSCReport::setNavId(qint32 nav_id) { - this->nav_id = nav_id; - this->m_nav_id_isSet = true; -} - -float -SWGVORDemodSCReport::getRadial() { - return radial; -} -void -SWGVORDemodSCReport::setRadial(float radial) { - this->radial = radial; - this->m_radial_isSet = true; -} - -float -SWGVORDemodSCReport::getRefMag() { - return ref_mag; -} -void -SWGVORDemodSCReport::setRefMag(float ref_mag) { - this->ref_mag = ref_mag; - this->m_ref_mag_isSet = true; -} - -float -SWGVORDemodSCReport::getVarMag() { - return var_mag; -} -void -SWGVORDemodSCReport::setVarMag(float var_mag) { - this->var_mag = var_mag; - this->m_var_mag_isSet = true; -} - -qint32 -SWGVORDemodSCReport::getValidRadial() { - return valid_radial; -} -void -SWGVORDemodSCReport::setValidRadial(qint32 valid_radial) { - this->valid_radial = valid_radial; - this->m_valid_radial_isSet = true; -} - -qint32 -SWGVORDemodSCReport::getValidRefMag() { - return valid_ref_mag; -} -void -SWGVORDemodSCReport::setValidRefMag(qint32 valid_ref_mag) { - this->valid_ref_mag = valid_ref_mag; - this->m_valid_ref_mag_isSet = true; -} - -qint32 -SWGVORDemodSCReport::getValidVarMag() { - return valid_var_mag; -} -void -SWGVORDemodSCReport::setValidVarMag(qint32 valid_var_mag) { - this->valid_var_mag = valid_var_mag; - this->m_valid_var_mag_isSet = true; -} - -QString* -SWGVORDemodSCReport::getMorseIdent() { - return morse_ident; -} -void -SWGVORDemodSCReport::setMorseIdent(QString* morse_ident) { - this->morse_ident = morse_ident; - this->m_morse_ident_isSet = true; -} - - -bool -SWGVORDemodSCReport::isSet(){ - bool isObjectUpdated = false; - do{ - if(m_channel_power_db_isSet){ - isObjectUpdated = true; break; - } - if(m_squelch_isSet){ - isObjectUpdated = true; break; - } - if(m_audio_sample_rate_isSet){ - isObjectUpdated = true; break; - } - if(m_volume_isSet){ - isObjectUpdated = true; break; - } - if(m_nav_id_isSet){ - isObjectUpdated = true; break; - } - if(m_radial_isSet){ - isObjectUpdated = true; break; - } - if(m_ref_mag_isSet){ - isObjectUpdated = true; break; - } - if(m_var_mag_isSet){ - isObjectUpdated = true; break; - } - if(m_valid_radial_isSet){ - isObjectUpdated = true; break; - } - if(m_valid_ref_mag_isSet){ - isObjectUpdated = true; break; - } - if(m_valid_var_mag_isSet){ - isObjectUpdated = true; break; - } - if(morse_ident && *morse_ident != QString("")){ - isObjectUpdated = true; break; - } - }while(false); - return isObjectUpdated; -} -} - diff --git a/swagger/sdrangel/code/qt5/client/SWGVORDemodSCReport.h b/swagger/sdrangel/code/qt5/client/SWGVORDemodSCReport.h deleted file mode 100644 index fbb7e9497..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGVORDemodSCReport.h +++ /dev/null @@ -1,125 +0,0 @@ -/** - * 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. - */ - -/* - * SWGVORDemodSCReport.h - * - * VORDemod - */ - -#ifndef SWGVORDemodSCReport_H_ -#define SWGVORDemodSCReport_H_ - -#include - - -#include - -#include "SWGObject.h" -#include "export.h" - -namespace SWGSDRangel { - -class SWG_API SWGVORDemodSCReport: public SWGObject { -public: - SWGVORDemodSCReport(); - SWGVORDemodSCReport(QString* json); - virtual ~SWGVORDemodSCReport(); - void init(); - void cleanup(); - - virtual QString asJson () override; - virtual QJsonObject* asJsonObject() override; - virtual void fromJsonObject(QJsonObject &json) override; - virtual SWGVORDemodSCReport* fromJson(QString &jsonString) override; - - float getChannelPowerDb(); - void setChannelPowerDb(float channel_power_db); - - qint32 getSquelch(); - void setSquelch(qint32 squelch); - - qint32 getAudioSampleRate(); - void setAudioSampleRate(qint32 audio_sample_rate); - - float getVolume(); - void setVolume(float volume); - - qint32 getNavId(); - void setNavId(qint32 nav_id); - - float getRadial(); - void setRadial(float radial); - - float getRefMag(); - void setRefMag(float ref_mag); - - float getVarMag(); - void setVarMag(float var_mag); - - qint32 getValidRadial(); - void setValidRadial(qint32 valid_radial); - - qint32 getValidRefMag(); - void setValidRefMag(qint32 valid_ref_mag); - - qint32 getValidVarMag(); - void setValidVarMag(qint32 valid_var_mag); - - QString* getMorseIdent(); - void setMorseIdent(QString* morse_ident); - - - virtual bool isSet() override; - -private: - float channel_power_db; - bool m_channel_power_db_isSet; - - qint32 squelch; - bool m_squelch_isSet; - - qint32 audio_sample_rate; - bool m_audio_sample_rate_isSet; - - float volume; - bool m_volume_isSet; - - qint32 nav_id; - bool m_nav_id_isSet; - - float radial; - bool m_radial_isSet; - - float ref_mag; - bool m_ref_mag_isSet; - - float var_mag; - bool m_var_mag_isSet; - - qint32 valid_radial; - bool m_valid_radial_isSet; - - qint32 valid_ref_mag; - bool m_valid_ref_mag_isSet; - - qint32 valid_var_mag; - bool m_valid_var_mag_isSet; - - QString* morse_ident; - bool m_morse_ident_isSet; - -}; - -} - -#endif /* SWGVORDemodSCReport_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGVORDemodSCSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGVORDemodSCSettings.cpp deleted file mode 100644 index 090389f0b..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGVORDemodSCSettings.cpp +++ /dev/null @@ -1,486 +0,0 @@ -/** - * 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 "SWGVORDemodSCSettings.h" - -#include "SWGHelpers.h" - -#include -#include -#include -#include - -namespace SWGSDRangel { - -SWGVORDemodSCSettings::SWGVORDemodSCSettings(QString* json) { - init(); - this->fromJson(*json); -} - -SWGVORDemodSCSettings::SWGVORDemodSCSettings() { - input_frequency_offset = 0L; - m_input_frequency_offset_isSet = false; - nav_id = 0; - m_nav_id_isSet = false; - squelch = 0.0f; - m_squelch_isSet = false; - volume = 0.0f; - m_volume_isSet = false; - audio_mute = 0; - m_audio_mute_isSet = false; - rgb_color = 0; - m_rgb_color_isSet = false; - title = nullptr; - m_title_isSet = false; - audio_device_name = nullptr; - m_audio_device_name_isSet = false; - stream_index = 0; - m_stream_index_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_device_index = 0; - m_reverse_api_device_index_isSet = false; - reverse_api_channel_index = 0; - m_reverse_api_channel_index_isSet = false; - ident_threshold = 0; - m_ident_threshold_isSet = false; - channel_marker = nullptr; - m_channel_marker_isSet = false; - rollup_state = nullptr; - m_rollup_state_isSet = false; -} - -SWGVORDemodSCSettings::~SWGVORDemodSCSettings() { - this->cleanup(); -} - -void -SWGVORDemodSCSettings::init() { - input_frequency_offset = 0L; - m_input_frequency_offset_isSet = false; - nav_id = 0; - m_nav_id_isSet = false; - squelch = 0.0f; - m_squelch_isSet = false; - volume = 0.0f; - m_volume_isSet = false; - audio_mute = 0; - m_audio_mute_isSet = false; - rgb_color = 0; - m_rgb_color_isSet = false; - title = new QString(""); - m_title_isSet = false; - audio_device_name = new QString(""); - m_audio_device_name_isSet = false; - stream_index = 0; - m_stream_index_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_device_index = 0; - m_reverse_api_device_index_isSet = false; - reverse_api_channel_index = 0; - m_reverse_api_channel_index_isSet = false; - ident_threshold = 0; - m_ident_threshold_isSet = false; - channel_marker = new SWGChannelMarker(); - m_channel_marker_isSet = false; - rollup_state = new SWGRollupState(); - m_rollup_state_isSet = false; -} - -void -SWGVORDemodSCSettings::cleanup() { - - - - - - - if(title != nullptr) { - delete title; - } - if(audio_device_name != nullptr) { - delete audio_device_name; - } - - - if(reverse_api_address != nullptr) { - delete reverse_api_address; - } - - - - - if(channel_marker != nullptr) { - delete channel_marker; - } - if(rollup_state != nullptr) { - delete rollup_state; - } -} - -SWGVORDemodSCSettings* -SWGVORDemodSCSettings::fromJson(QString &json) { - QByteArray array (json.toStdString().c_str()); - QJsonDocument doc = QJsonDocument::fromJson(array); - QJsonObject jsonObject = doc.object(); - this->fromJsonObject(jsonObject); - return this; -} - -void -SWGVORDemodSCSettings::fromJsonObject(QJsonObject &pJson) { - ::SWGSDRangel::setValue(&input_frequency_offset, pJson["inputFrequencyOffset"], "qint64", ""); - - ::SWGSDRangel::setValue(&nav_id, pJson["navId"], "qint32", ""); - - ::SWGSDRangel::setValue(&squelch, pJson["squelch"], "float", ""); - - ::SWGSDRangel::setValue(&volume, pJson["volume"], "float", ""); - - ::SWGSDRangel::setValue(&audio_mute, pJson["audioMute"], "qint32", ""); - - ::SWGSDRangel::setValue(&rgb_color, pJson["rgbColor"], "qint32", ""); - - ::SWGSDRangel::setValue(&title, pJson["title"], "QString", "QString"); - - ::SWGSDRangel::setValue(&audio_device_name, pJson["audioDeviceName"], "QString", "QString"); - - ::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "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_device_index, pJson["reverseAPIDeviceIndex"], "qint32", ""); - - ::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", ""); - - ::SWGSDRangel::setValue(&ident_threshold, pJson["identThreshold"], "qint32", ""); - - ::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); - - ::SWGSDRangel::setValue(&rollup_state, pJson["rollupState"], "SWGRollupState", "SWGRollupState"); - -} - -QString -SWGVORDemodSCSettings::asJson () -{ - QJsonObject* obj = this->asJsonObject(); - - QJsonDocument doc(*obj); - QByteArray bytes = doc.toJson(); - delete obj; - return QString(bytes); -} - -QJsonObject* -SWGVORDemodSCSettings::asJsonObject() { - QJsonObject* obj = new QJsonObject(); - if(m_input_frequency_offset_isSet){ - obj->insert("inputFrequencyOffset", QJsonValue(input_frequency_offset)); - } - if(m_nav_id_isSet){ - obj->insert("navId", QJsonValue(nav_id)); - } - if(m_squelch_isSet){ - obj->insert("squelch", QJsonValue(squelch)); - } - if(m_volume_isSet){ - obj->insert("volume", QJsonValue(volume)); - } - if(m_audio_mute_isSet){ - obj->insert("audioMute", QJsonValue(audio_mute)); - } - if(m_rgb_color_isSet){ - obj->insert("rgbColor", QJsonValue(rgb_color)); - } - if(title != nullptr && *title != QString("")){ - toJsonValue(QString("title"), title, obj, QString("QString")); - } - if(audio_device_name != nullptr && *audio_device_name != QString("")){ - toJsonValue(QString("audioDeviceName"), audio_device_name, obj, QString("QString")); - } - if(m_stream_index_isSet){ - obj->insert("streamIndex", QJsonValue(stream_index)); - } - 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_device_index_isSet){ - obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index)); - } - if(m_reverse_api_channel_index_isSet){ - obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index)); - } - if(m_ident_threshold_isSet){ - obj->insert("identThreshold", QJsonValue(ident_threshold)); - } - if((channel_marker != nullptr) && (channel_marker->isSet())){ - toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker")); - } - if((rollup_state != nullptr) && (rollup_state->isSet())){ - toJsonValue(QString("rollupState"), rollup_state, obj, QString("SWGRollupState")); - } - - return obj; -} - -qint64 -SWGVORDemodSCSettings::getInputFrequencyOffset() { - return input_frequency_offset; -} -void -SWGVORDemodSCSettings::setInputFrequencyOffset(qint64 input_frequency_offset) { - this->input_frequency_offset = input_frequency_offset; - this->m_input_frequency_offset_isSet = true; -} - -qint32 -SWGVORDemodSCSettings::getNavId() { - return nav_id; -} -void -SWGVORDemodSCSettings::setNavId(qint32 nav_id) { - this->nav_id = nav_id; - this->m_nav_id_isSet = true; -} - -float -SWGVORDemodSCSettings::getSquelch() { - return squelch; -} -void -SWGVORDemodSCSettings::setSquelch(float squelch) { - this->squelch = squelch; - this->m_squelch_isSet = true; -} - -float -SWGVORDemodSCSettings::getVolume() { - return volume; -} -void -SWGVORDemodSCSettings::setVolume(float volume) { - this->volume = volume; - this->m_volume_isSet = true; -} - -qint32 -SWGVORDemodSCSettings::getAudioMute() { - return audio_mute; -} -void -SWGVORDemodSCSettings::setAudioMute(qint32 audio_mute) { - this->audio_mute = audio_mute; - this->m_audio_mute_isSet = true; -} - -qint32 -SWGVORDemodSCSettings::getRgbColor() { - return rgb_color; -} -void -SWGVORDemodSCSettings::setRgbColor(qint32 rgb_color) { - this->rgb_color = rgb_color; - this->m_rgb_color_isSet = true; -} - -QString* -SWGVORDemodSCSettings::getTitle() { - return title; -} -void -SWGVORDemodSCSettings::setTitle(QString* title) { - this->title = title; - this->m_title_isSet = true; -} - -QString* -SWGVORDemodSCSettings::getAudioDeviceName() { - return audio_device_name; -} -void -SWGVORDemodSCSettings::setAudioDeviceName(QString* audio_device_name) { - this->audio_device_name = audio_device_name; - this->m_audio_device_name_isSet = true; -} - -qint32 -SWGVORDemodSCSettings::getStreamIndex() { - return stream_index; -} -void -SWGVORDemodSCSettings::setStreamIndex(qint32 stream_index) { - this->stream_index = stream_index; - this->m_stream_index_isSet = true; -} - -qint32 -SWGVORDemodSCSettings::getUseReverseApi() { - return use_reverse_api; -} -void -SWGVORDemodSCSettings::setUseReverseApi(qint32 use_reverse_api) { - this->use_reverse_api = use_reverse_api; - this->m_use_reverse_api_isSet = true; -} - -QString* -SWGVORDemodSCSettings::getReverseApiAddress() { - return reverse_api_address; -} -void -SWGVORDemodSCSettings::setReverseApiAddress(QString* reverse_api_address) { - this->reverse_api_address = reverse_api_address; - this->m_reverse_api_address_isSet = true; -} - -qint32 -SWGVORDemodSCSettings::getReverseApiPort() { - return reverse_api_port; -} -void -SWGVORDemodSCSettings::setReverseApiPort(qint32 reverse_api_port) { - this->reverse_api_port = reverse_api_port; - this->m_reverse_api_port_isSet = true; -} - -qint32 -SWGVORDemodSCSettings::getReverseApiDeviceIndex() { - return reverse_api_device_index; -} -void -SWGVORDemodSCSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { - this->reverse_api_device_index = reverse_api_device_index; - this->m_reverse_api_device_index_isSet = true; -} - -qint32 -SWGVORDemodSCSettings::getReverseApiChannelIndex() { - return reverse_api_channel_index; -} -void -SWGVORDemodSCSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) { - this->reverse_api_channel_index = reverse_api_channel_index; - this->m_reverse_api_channel_index_isSet = true; -} - -qint32 -SWGVORDemodSCSettings::getIdentThreshold() { - return ident_threshold; -} -void -SWGVORDemodSCSettings::setIdentThreshold(qint32 ident_threshold) { - this->ident_threshold = ident_threshold; - this->m_ident_threshold_isSet = true; -} - -SWGChannelMarker* -SWGVORDemodSCSettings::getChannelMarker() { - return channel_marker; -} -void -SWGVORDemodSCSettings::setChannelMarker(SWGChannelMarker* channel_marker) { - this->channel_marker = channel_marker; - this->m_channel_marker_isSet = true; -} - -SWGRollupState* -SWGVORDemodSCSettings::getRollupState() { - return rollup_state; -} -void -SWGVORDemodSCSettings::setRollupState(SWGRollupState* rollup_state) { - this->rollup_state = rollup_state; - this->m_rollup_state_isSet = true; -} - - -bool -SWGVORDemodSCSettings::isSet(){ - bool isObjectUpdated = false; - do{ - if(m_input_frequency_offset_isSet){ - isObjectUpdated = true; break; - } - if(m_nav_id_isSet){ - isObjectUpdated = true; break; - } - if(m_squelch_isSet){ - isObjectUpdated = true; break; - } - if(m_volume_isSet){ - isObjectUpdated = true; break; - } - if(m_audio_mute_isSet){ - isObjectUpdated = true; break; - } - if(m_rgb_color_isSet){ - isObjectUpdated = true; break; - } - if(title && *title != QString("")){ - isObjectUpdated = true; break; - } - if(audio_device_name && *audio_device_name != QString("")){ - isObjectUpdated = true; break; - } - if(m_stream_index_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_device_index_isSet){ - isObjectUpdated = true; break; - } - if(m_reverse_api_channel_index_isSet){ - isObjectUpdated = true; break; - } - if(m_ident_threshold_isSet){ - isObjectUpdated = true; break; - } - if(channel_marker && channel_marker->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/SWGVORDemodSCSettings.h b/swagger/sdrangel/code/qt5/client/SWGVORDemodSCSettings.h deleted file mode 100644 index c7acf6446..000000000 --- a/swagger/sdrangel/code/qt5/client/SWGVORDemodSCSettings.h +++ /dev/null @@ -1,157 +0,0 @@ -/** - * 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. - */ - -/* - * SWGVORDemodSCSettings.h - * - * VORDemod - */ - -#ifndef SWGVORDemodSCSettings_H_ -#define SWGVORDemodSCSettings_H_ - -#include - - -#include "SWGChannelMarker.h" -#include "SWGRollupState.h" -#include - -#include "SWGObject.h" -#include "export.h" - -namespace SWGSDRangel { - -class SWG_API SWGVORDemodSCSettings: public SWGObject { -public: - SWGVORDemodSCSettings(); - SWGVORDemodSCSettings(QString* json); - virtual ~SWGVORDemodSCSettings(); - void init(); - void cleanup(); - - virtual QString asJson () override; - virtual QJsonObject* asJsonObject() override; - virtual void fromJsonObject(QJsonObject &json) override; - virtual SWGVORDemodSCSettings* fromJson(QString &jsonString) override; - - qint64 getInputFrequencyOffset(); - void setInputFrequencyOffset(qint64 input_frequency_offset); - - qint32 getNavId(); - void setNavId(qint32 nav_id); - - float getSquelch(); - void setSquelch(float squelch); - - float getVolume(); - void setVolume(float volume); - - qint32 getAudioMute(); - void setAudioMute(qint32 audio_mute); - - qint32 getRgbColor(); - void setRgbColor(qint32 rgb_color); - - QString* getTitle(); - void setTitle(QString* title); - - QString* getAudioDeviceName(); - void setAudioDeviceName(QString* audio_device_name); - - qint32 getStreamIndex(); - void setStreamIndex(qint32 stream_index); - - 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 getReverseApiDeviceIndex(); - void setReverseApiDeviceIndex(qint32 reverse_api_device_index); - - qint32 getReverseApiChannelIndex(); - void setReverseApiChannelIndex(qint32 reverse_api_channel_index); - - qint32 getIdentThreshold(); - void setIdentThreshold(qint32 ident_threshold); - - SWGChannelMarker* getChannelMarker(); - void setChannelMarker(SWGChannelMarker* channel_marker); - - SWGRollupState* getRollupState(); - void setRollupState(SWGRollupState* rollup_state); - - - virtual bool isSet() override; - -private: - qint64 input_frequency_offset; - bool m_input_frequency_offset_isSet; - - qint32 nav_id; - bool m_nav_id_isSet; - - float squelch; - bool m_squelch_isSet; - - float volume; - bool m_volume_isSet; - - qint32 audio_mute; - bool m_audio_mute_isSet; - - qint32 rgb_color; - bool m_rgb_color_isSet; - - QString* title; - bool m_title_isSet; - - QString* audio_device_name; - bool m_audio_device_name_isSet; - - qint32 stream_index; - bool m_stream_index_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_device_index; - bool m_reverse_api_device_index_isSet; - - qint32 reverse_api_channel_index; - bool m_reverse_api_channel_index_isSet; - - qint32 ident_threshold; - bool m_ident_threshold_isSet; - - SWGChannelMarker* channel_marker; - bool m_channel_marker_isSet; - - SWGRollupState* rollup_state; - bool m_rollup_state_isSet; - -}; - -} - -#endif /* SWGVORDemodSCSettings_H_ */