From 2fdd92c85cea7e23b6c968bbed8e63f8d900f841 Mon Sep 17 00:00:00 2001 From: srcejon Date: Wed, 13 Mar 2024 14:32:16 +0000 Subject: [PATCH] Regenerate swagger files --- sdrbase/resources/webapi/doc/html2/index.html | 85 +++- .../doc/swagger/include/ChannelPower.yaml | 56 +++ .../doc/swagger/include/ChannelReport.yaml | 2 + .../doc/swagger/include/ChannelSettings.yaml | 2 + swagger/sdrangel/code/html2/index.html | 85 +++- .../code/qt5/client/SWGChannelPowerReport.cpp | 177 ++++++++ .../code/qt5/client/SWGChannelPowerReport.h | 76 ++++ .../qt5/client/SWGChannelPowerSettings.cpp | 415 ++++++++++++++++++ .../code/qt5/client/SWGChannelPowerSettings.h | 139 ++++++ .../code/qt5/client/SWGChannelReport.cpp | 25 ++ .../code/qt5/client/SWGChannelReport.h | 7 + .../code/qt5/client/SWGChannelSettings.cpp | 25 ++ .../code/qt5/client/SWGChannelSettings.h | 7 + .../code/qt5/client/SWGModelFactory.h | 12 + 14 files changed, 1111 insertions(+), 2 deletions(-) create mode 100644 sdrbase/resources/webapi/doc/swagger/include/ChannelPower.yaml create mode 100644 swagger/sdrangel/code/qt5/client/SWGChannelPowerReport.cpp create mode 100644 swagger/sdrangel/code/qt5/client/SWGChannelPowerReport.h create mode 100644 swagger/sdrangel/code/qt5/client/SWGChannelPowerSettings.cpp create mode 100644 swagger/sdrangel/code/qt5/client/SWGChannelPowerSettings.h diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 9e0651169..391a9fa1a 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -3784,6 +3784,83 @@ margin-bottom: 20px; } }, "description" : "ChannelMarker settings" +}; + defs.ChannelPowerReport = { + "properties" : { + "channelPowerDB" : { + "type" : "number", + "format" : "float", + "description" : "power received in channel (dB)" + }, + "channelPowerMaxDB" : { + "type" : "number", + "format" : "float", + "description" : "max power received in channel (dB)" + }, + "channelPowerMinDB" : { + "type" : "number", + "format" : "float", + "description" : "min power received in channel (dB)" + }, + "channelSampleRate" : { + "type" : "integer" + } + }, + "description" : "ChannelPower" +}; + defs.ChannelPowerSettings = { + "properties" : { + "inputFrequencyOffset" : { + "type" : "integer", + "format" : "int64" + }, + "rfBandwidth" : { + "type" : "number", + "format" : "float" + }, + "pulseThreshold" : { + "type" : "number", + "format" : "float", + "description" : "In dB" + }, + "averagePeriodUS" : { + "type" : "integer", + "description" : "Average period in microseconds" + }, + "rgbColor" : { + "type" : "integer" + }, + "title" : { + "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" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" + }, + "rollupState" : { + "$ref" : "#/definitions/RollupState" + } + }, + "description" : "ChannelDemod" }; defs.ChannelReport = { "required" : [ "direction" ], @@ -3818,6 +3895,9 @@ margin-bottom: 20px; "BFMDemodReport" : { "$ref" : "#/definitions/BFMDemodReport" }, + "ChannelPowerReport" : { + "$ref" : "#/definitions/ChannelPowerReport" + }, "ChirpChatDemodReport" : { "$ref" : "#/definitions/ChirpChatDemodReport" }, @@ -4000,6 +4080,9 @@ margin-bottom: 20px; "ChannelAnalyzerSettings" : { "$ref" : "#/definitions/ChannelAnalyzerSettings" }, + "ChannelPowerSettings" : { + "$ref" : "#/definitions/ChannelPowerSettings" + }, "ChirpChatDemodSettings" : { "$ref" : "#/definitions/ChirpChatDemodSettings" }, @@ -58777,7 +58860,7 @@ except ApiException as e:
- Generated 2024-03-04T22:20:15.730+01:00 + Generated 2024-03-13T15:31:43.924+01:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelPower.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelPower.yaml new file mode 100644 index 000000000..a56d9d975 --- /dev/null +++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelPower.yaml @@ -0,0 +1,56 @@ +ChannelPowerSettings: + description: ChannelDemod + properties: + inputFrequencyOffset: + type: integer + format: int64 + rfBandwidth: + type: number + format: float + pulseThreshold: + description: "In dB" + type: number + format: float + averagePeriodUS: + description: "Average period in microseconds" + type: integer + rgbColor: + type: integer + title: + 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 + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" + rollupState: + $ref: "/doc/swagger/include/RollupState.yaml#/RollupState" + +ChannelPowerReport: + description: ChannelPower + properties: + channelPowerDB: + description: power received in channel (dB) + type: number + format: float + channelPowerMaxDB: + description: max power received in channel (dB) + type: number + format: float + channelPowerMinDB: + description: min power received in channel (dB) + type: number + format: float + channelSampleRate: + type: integer diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml index b2571cf16..a58adb1ac 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml @@ -25,6 +25,8 @@ ChannelReport: $ref: "/doc/swagger/include/ATVMod.yaml#/ATVModReport" BFMDemodReport: $ref: "/doc/swagger/include/BFMDemod.yaml#/BFMDemodReport" + ChannelPowerReport: + $ref: "/doc/swagger/include/ChannelPower.yaml#/ChannelPowerReport" ChirpChatDemodReport: $ref: "/doc/swagger/include/ChirpChatDemod.yaml#/ChirpChatDemodReport" ChirpChatModReport: diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml index a8cd1cc2b..66b4f6deb 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml @@ -39,6 +39,8 @@ ChannelSettings: $ref: "/doc/swagger/include/BFMDemod.yaml#/BFMDemodSettings" ChannelAnalyzerSettings: $ref: "/doc/swagger/include/ChannelAnalyzer.yaml#/ChannelAnalyzerSettings" + ChannelPowerSettings: + $ref: "/doc/swagger/include/ChannelPower.yaml#/ChannelPowerSettings" ChirpChatDemodSettings: $ref: "/doc/swagger/include/ChirpChatDemod.yaml#/ChirpChatDemodSettings" ChirpChatModSettings: diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 9e0651169..391a9fa1a 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -3784,6 +3784,83 @@ margin-bottom: 20px; } }, "description" : "ChannelMarker settings" +}; + defs.ChannelPowerReport = { + "properties" : { + "channelPowerDB" : { + "type" : "number", + "format" : "float", + "description" : "power received in channel (dB)" + }, + "channelPowerMaxDB" : { + "type" : "number", + "format" : "float", + "description" : "max power received in channel (dB)" + }, + "channelPowerMinDB" : { + "type" : "number", + "format" : "float", + "description" : "min power received in channel (dB)" + }, + "channelSampleRate" : { + "type" : "integer" + } + }, + "description" : "ChannelPower" +}; + defs.ChannelPowerSettings = { + "properties" : { + "inputFrequencyOffset" : { + "type" : "integer", + "format" : "int64" + }, + "rfBandwidth" : { + "type" : "number", + "format" : "float" + }, + "pulseThreshold" : { + "type" : "number", + "format" : "float", + "description" : "In dB" + }, + "averagePeriodUS" : { + "type" : "integer", + "description" : "Average period in microseconds" + }, + "rgbColor" : { + "type" : "integer" + }, + "title" : { + "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" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" + }, + "rollupState" : { + "$ref" : "#/definitions/RollupState" + } + }, + "description" : "ChannelDemod" }; defs.ChannelReport = { "required" : [ "direction" ], @@ -3818,6 +3895,9 @@ margin-bottom: 20px; "BFMDemodReport" : { "$ref" : "#/definitions/BFMDemodReport" }, + "ChannelPowerReport" : { + "$ref" : "#/definitions/ChannelPowerReport" + }, "ChirpChatDemodReport" : { "$ref" : "#/definitions/ChirpChatDemodReport" }, @@ -4000,6 +4080,9 @@ margin-bottom: 20px; "ChannelAnalyzerSettings" : { "$ref" : "#/definitions/ChannelAnalyzerSettings" }, + "ChannelPowerSettings" : { + "$ref" : "#/definitions/ChannelPowerSettings" + }, "ChirpChatDemodSettings" : { "$ref" : "#/definitions/ChirpChatDemodSettings" }, @@ -58777,7 +58860,7 @@ except ApiException as e:
- Generated 2024-03-04T22:20:15.730+01:00 + Generated 2024-03-13T15:31:43.924+01:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelPowerReport.cpp b/swagger/sdrangel/code/qt5/client/SWGChannelPowerReport.cpp new file mode 100644 index 000000000..a9a08af3d --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGChannelPowerReport.cpp @@ -0,0 +1,177 @@ +/** + * 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 "SWGChannelPowerReport.h" + +#include "SWGHelpers.h" + +#include +#include +#include +#include + +namespace SWGSDRangel { + +SWGChannelPowerReport::SWGChannelPowerReport(QString* json) { + init(); + this->fromJson(*json); +} + +SWGChannelPowerReport::SWGChannelPowerReport() { + channel_power_db = 0.0f; + m_channel_power_db_isSet = false; + channel_power_max_db = 0.0f; + m_channel_power_max_db_isSet = false; + channel_power_min_db = 0.0f; + m_channel_power_min_db_isSet = false; + channel_sample_rate = 0; + m_channel_sample_rate_isSet = false; +} + +SWGChannelPowerReport::~SWGChannelPowerReport() { + this->cleanup(); +} + +void +SWGChannelPowerReport::init() { + channel_power_db = 0.0f; + m_channel_power_db_isSet = false; + channel_power_max_db = 0.0f; + m_channel_power_max_db_isSet = false; + channel_power_min_db = 0.0f; + m_channel_power_min_db_isSet = false; + channel_sample_rate = 0; + m_channel_sample_rate_isSet = false; +} + +void +SWGChannelPowerReport::cleanup() { + + + + +} + +SWGChannelPowerReport* +SWGChannelPowerReport::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; +} + +void +SWGChannelPowerReport::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&channel_power_db, pJson["channelPowerDB"], "float", ""); + + ::SWGSDRangel::setValue(&channel_power_max_db, pJson["channelPowerMaxDB"], "float", ""); + + ::SWGSDRangel::setValue(&channel_power_min_db, pJson["channelPowerMinDB"], "float", ""); + + ::SWGSDRangel::setValue(&channel_sample_rate, pJson["channelSampleRate"], "qint32", ""); + +} + +QString +SWGChannelPowerReport::asJson () +{ + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + delete obj; + return QString(bytes); +} + +QJsonObject* +SWGChannelPowerReport::asJsonObject() { + QJsonObject* obj = new QJsonObject(); + if(m_channel_power_db_isSet){ + obj->insert("channelPowerDB", QJsonValue(channel_power_db)); + } + if(m_channel_power_max_db_isSet){ + obj->insert("channelPowerMaxDB", QJsonValue(channel_power_max_db)); + } + if(m_channel_power_min_db_isSet){ + obj->insert("channelPowerMinDB", QJsonValue(channel_power_min_db)); + } + if(m_channel_sample_rate_isSet){ + obj->insert("channelSampleRate", QJsonValue(channel_sample_rate)); + } + + return obj; +} + +float +SWGChannelPowerReport::getChannelPowerDb() { + return channel_power_db; +} +void +SWGChannelPowerReport::setChannelPowerDb(float channel_power_db) { + this->channel_power_db = channel_power_db; + this->m_channel_power_db_isSet = true; +} + +float +SWGChannelPowerReport::getChannelPowerMaxDb() { + return channel_power_max_db; +} +void +SWGChannelPowerReport::setChannelPowerMaxDb(float channel_power_max_db) { + this->channel_power_max_db = channel_power_max_db; + this->m_channel_power_max_db_isSet = true; +} + +float +SWGChannelPowerReport::getChannelPowerMinDb() { + return channel_power_min_db; +} +void +SWGChannelPowerReport::setChannelPowerMinDb(float channel_power_min_db) { + this->channel_power_min_db = channel_power_min_db; + this->m_channel_power_min_db_isSet = true; +} + +qint32 +SWGChannelPowerReport::getChannelSampleRate() { + return channel_sample_rate; +} +void +SWGChannelPowerReport::setChannelSampleRate(qint32 channel_sample_rate) { + this->channel_sample_rate = channel_sample_rate; + this->m_channel_sample_rate_isSet = true; +} + + +bool +SWGChannelPowerReport::isSet(){ + bool isObjectUpdated = false; + do{ + if(m_channel_power_db_isSet){ + isObjectUpdated = true; break; + } + if(m_channel_power_max_db_isSet){ + isObjectUpdated = true; break; + } + if(m_channel_power_min_db_isSet){ + isObjectUpdated = true; break; + } + if(m_channel_sample_rate_isSet){ + isObjectUpdated = true; break; + } + }while(false); + return isObjectUpdated; +} +} + diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelPowerReport.h b/swagger/sdrangel/code/qt5/client/SWGChannelPowerReport.h new file mode 100644 index 000000000..0f364f85d --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGChannelPowerReport.h @@ -0,0 +1,76 @@ +/** + * 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. + */ + +/* + * SWGChannelPowerReport.h + * + * ChannelPower + */ + +#ifndef SWGChannelPowerReport_H_ +#define SWGChannelPowerReport_H_ + +#include + + + +#include "SWGObject.h" +#include "export.h" + +namespace SWGSDRangel { + +class SWG_API SWGChannelPowerReport: public SWGObject { +public: + SWGChannelPowerReport(); + SWGChannelPowerReport(QString* json); + virtual ~SWGChannelPowerReport(); + void init(); + void cleanup(); + + virtual QString asJson () override; + virtual QJsonObject* asJsonObject() override; + virtual void fromJsonObject(QJsonObject &json) override; + virtual SWGChannelPowerReport* fromJson(QString &jsonString) override; + + float getChannelPowerDb(); + void setChannelPowerDb(float channel_power_db); + + float getChannelPowerMaxDb(); + void setChannelPowerMaxDb(float channel_power_max_db); + + float getChannelPowerMinDb(); + void setChannelPowerMinDb(float channel_power_min_db); + + qint32 getChannelSampleRate(); + void setChannelSampleRate(qint32 channel_sample_rate); + + + virtual bool isSet() override; + +private: + float channel_power_db; + bool m_channel_power_db_isSet; + + float channel_power_max_db; + bool m_channel_power_max_db_isSet; + + float channel_power_min_db; + bool m_channel_power_min_db_isSet; + + qint32 channel_sample_rate; + bool m_channel_sample_rate_isSet; + +}; + +} + +#endif /* SWGChannelPowerReport_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelPowerSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGChannelPowerSettings.cpp new file mode 100644 index 000000000..e2d31e2aa --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGChannelPowerSettings.cpp @@ -0,0 +1,415 @@ +/** + * 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 "SWGChannelPowerSettings.h" + +#include "SWGHelpers.h" + +#include +#include +#include +#include + +namespace SWGSDRangel { + +SWGChannelPowerSettings::SWGChannelPowerSettings(QString* json) { + init(); + this->fromJson(*json); +} + +SWGChannelPowerSettings::SWGChannelPowerSettings() { + input_frequency_offset = 0L; + m_input_frequency_offset_isSet = false; + rf_bandwidth = 0.0f; + m_rf_bandwidth_isSet = false; + pulse_threshold = 0.0f; + m_pulse_threshold_isSet = false; + average_period_us = 0; + m_average_period_us_isSet = false; + rgb_color = 0; + m_rgb_color_isSet = false; + title = nullptr; + m_title_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; + channel_marker = nullptr; + m_channel_marker_isSet = false; + rollup_state = nullptr; + m_rollup_state_isSet = false; +} + +SWGChannelPowerSettings::~SWGChannelPowerSettings() { + this->cleanup(); +} + +void +SWGChannelPowerSettings::init() { + input_frequency_offset = 0L; + m_input_frequency_offset_isSet = false; + rf_bandwidth = 0.0f; + m_rf_bandwidth_isSet = false; + pulse_threshold = 0.0f; + m_pulse_threshold_isSet = false; + average_period_us = 0; + m_average_period_us_isSet = false; + rgb_color = 0; + m_rgb_color_isSet = false; + title = new QString(""); + m_title_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; + channel_marker = new SWGChannelMarker(); + m_channel_marker_isSet = false; + rollup_state = new SWGRollupState(); + m_rollup_state_isSet = false; +} + +void +SWGChannelPowerSettings::cleanup() { + + + + + + if(title != nullptr) { + delete title; + } + + + if(reverse_api_address != nullptr) { + delete reverse_api_address; + } + + + + if(channel_marker != nullptr) { + delete channel_marker; + } + if(rollup_state != nullptr) { + delete rollup_state; + } +} + +SWGChannelPowerSettings* +SWGChannelPowerSettings::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; +} + +void +SWGChannelPowerSettings::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&input_frequency_offset, pJson["inputFrequencyOffset"], "qint64", ""); + + ::SWGSDRangel::setValue(&rf_bandwidth, pJson["rfBandwidth"], "float", ""); + + ::SWGSDRangel::setValue(&pulse_threshold, pJson["pulseThreshold"], "float", ""); + + ::SWGSDRangel::setValue(&average_period_us, pJson["averagePeriodUS"], "qint32", ""); + + ::SWGSDRangel::setValue(&rgb_color, pJson["rgbColor"], "qint32", ""); + + ::SWGSDRangel::setValue(&title, pJson["title"], "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(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker"); + + ::SWGSDRangel::setValue(&rollup_state, pJson["rollupState"], "SWGRollupState", "SWGRollupState"); + +} + +QString +SWGChannelPowerSettings::asJson () +{ + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + delete obj; + return QString(bytes); +} + +QJsonObject* +SWGChannelPowerSettings::asJsonObject() { + QJsonObject* obj = new QJsonObject(); + if(m_input_frequency_offset_isSet){ + obj->insert("inputFrequencyOffset", QJsonValue(input_frequency_offset)); + } + if(m_rf_bandwidth_isSet){ + obj->insert("rfBandwidth", QJsonValue(rf_bandwidth)); + } + if(m_pulse_threshold_isSet){ + obj->insert("pulseThreshold", QJsonValue(pulse_threshold)); + } + if(m_average_period_us_isSet){ + obj->insert("averagePeriodUS", QJsonValue(average_period_us)); + } + if(m_rgb_color_isSet){ + obj->insert("rgbColor", QJsonValue(rgb_color)); + } + if(title != nullptr && *title != QString("")){ + toJsonValue(QString("title"), title, 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((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 +SWGChannelPowerSettings::getInputFrequencyOffset() { + return input_frequency_offset; +} +void +SWGChannelPowerSettings::setInputFrequencyOffset(qint64 input_frequency_offset) { + this->input_frequency_offset = input_frequency_offset; + this->m_input_frequency_offset_isSet = true; +} + +float +SWGChannelPowerSettings::getRfBandwidth() { + return rf_bandwidth; +} +void +SWGChannelPowerSettings::setRfBandwidth(float rf_bandwidth) { + this->rf_bandwidth = rf_bandwidth; + this->m_rf_bandwidth_isSet = true; +} + +float +SWGChannelPowerSettings::getPulseThreshold() { + return pulse_threshold; +} +void +SWGChannelPowerSettings::setPulseThreshold(float pulse_threshold) { + this->pulse_threshold = pulse_threshold; + this->m_pulse_threshold_isSet = true; +} + +qint32 +SWGChannelPowerSettings::getAveragePeriodUs() { + return average_period_us; +} +void +SWGChannelPowerSettings::setAveragePeriodUs(qint32 average_period_us) { + this->average_period_us = average_period_us; + this->m_average_period_us_isSet = true; +} + +qint32 +SWGChannelPowerSettings::getRgbColor() { + return rgb_color; +} +void +SWGChannelPowerSettings::setRgbColor(qint32 rgb_color) { + this->rgb_color = rgb_color; + this->m_rgb_color_isSet = true; +} + +QString* +SWGChannelPowerSettings::getTitle() { + return title; +} +void +SWGChannelPowerSettings::setTitle(QString* title) { + this->title = title; + this->m_title_isSet = true; +} + +qint32 +SWGChannelPowerSettings::getStreamIndex() { + return stream_index; +} +void +SWGChannelPowerSettings::setStreamIndex(qint32 stream_index) { + this->stream_index = stream_index; + this->m_stream_index_isSet = true; +} + +qint32 +SWGChannelPowerSettings::getUseReverseApi() { + return use_reverse_api; +} +void +SWGChannelPowerSettings::setUseReverseApi(qint32 use_reverse_api) { + this->use_reverse_api = use_reverse_api; + this->m_use_reverse_api_isSet = true; +} + +QString* +SWGChannelPowerSettings::getReverseApiAddress() { + return reverse_api_address; +} +void +SWGChannelPowerSettings::setReverseApiAddress(QString* reverse_api_address) { + this->reverse_api_address = reverse_api_address; + this->m_reverse_api_address_isSet = true; +} + +qint32 +SWGChannelPowerSettings::getReverseApiPort() { + return reverse_api_port; +} +void +SWGChannelPowerSettings::setReverseApiPort(qint32 reverse_api_port) { + this->reverse_api_port = reverse_api_port; + this->m_reverse_api_port_isSet = true; +} + +qint32 +SWGChannelPowerSettings::getReverseApiDeviceIndex() { + return reverse_api_device_index; +} +void +SWGChannelPowerSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { + this->reverse_api_device_index = reverse_api_device_index; + this->m_reverse_api_device_index_isSet = true; +} + +qint32 +SWGChannelPowerSettings::getReverseApiChannelIndex() { + return reverse_api_channel_index; +} +void +SWGChannelPowerSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) { + this->reverse_api_channel_index = reverse_api_channel_index; + this->m_reverse_api_channel_index_isSet = true; +} + +SWGChannelMarker* +SWGChannelPowerSettings::getChannelMarker() { + return channel_marker; +} +void +SWGChannelPowerSettings::setChannelMarker(SWGChannelMarker* channel_marker) { + this->channel_marker = channel_marker; + this->m_channel_marker_isSet = true; +} + +SWGRollupState* +SWGChannelPowerSettings::getRollupState() { + return rollup_state; +} +void +SWGChannelPowerSettings::setRollupState(SWGRollupState* rollup_state) { + this->rollup_state = rollup_state; + this->m_rollup_state_isSet = true; +} + + +bool +SWGChannelPowerSettings::isSet(){ + bool isObjectUpdated = false; + do{ + if(m_input_frequency_offset_isSet){ + isObjectUpdated = true; break; + } + if(m_rf_bandwidth_isSet){ + isObjectUpdated = true; break; + } + if(m_pulse_threshold_isSet){ + isObjectUpdated = true; break; + } + if(m_average_period_us_isSet){ + isObjectUpdated = true; break; + } + if(m_rgb_color_isSet){ + isObjectUpdated = true; break; + } + if(title && *title != 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(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/SWGChannelPowerSettings.h b/swagger/sdrangel/code/qt5/client/SWGChannelPowerSettings.h new file mode 100644 index 000000000..f580418c4 --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGChannelPowerSettings.h @@ -0,0 +1,139 @@ +/** + * 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. + */ + +/* + * SWGChannelPowerSettings.h + * + * ChannelDemod + */ + +#ifndef SWGChannelPowerSettings_H_ +#define SWGChannelPowerSettings_H_ + +#include + + +#include "SWGChannelMarker.h" +#include "SWGRollupState.h" +#include + +#include "SWGObject.h" +#include "export.h" + +namespace SWGSDRangel { + +class SWG_API SWGChannelPowerSettings: public SWGObject { +public: + SWGChannelPowerSettings(); + SWGChannelPowerSettings(QString* json); + virtual ~SWGChannelPowerSettings(); + void init(); + void cleanup(); + + virtual QString asJson () override; + virtual QJsonObject* asJsonObject() override; + virtual void fromJsonObject(QJsonObject &json) override; + virtual SWGChannelPowerSettings* fromJson(QString &jsonString) override; + + qint64 getInputFrequencyOffset(); + void setInputFrequencyOffset(qint64 input_frequency_offset); + + float getRfBandwidth(); + void setRfBandwidth(float rf_bandwidth); + + float getPulseThreshold(); + void setPulseThreshold(float pulse_threshold); + + qint32 getAveragePeriodUs(); + void setAveragePeriodUs(qint32 average_period_us); + + qint32 getRgbColor(); + void setRgbColor(qint32 rgb_color); + + QString* getTitle(); + void setTitle(QString* title); + + 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); + + 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; + + float rf_bandwidth; + bool m_rf_bandwidth_isSet; + + float pulse_threshold; + bool m_pulse_threshold_isSet; + + qint32 average_period_us; + bool m_average_period_us_isSet; + + qint32 rgb_color; + bool m_rgb_color_isSet; + + QString* title; + bool m_title_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; + + SWGChannelMarker* channel_marker; + bool m_channel_marker_isSet; + + SWGRollupState* rollup_state; + bool m_rollup_state_isSet; + +}; + +} + +#endif /* SWGChannelPowerSettings_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelReport.cpp b/swagger/sdrangel/code/qt5/client/SWGChannelReport.cpp index a0b7eb4ce..de6381086 100644 --- a/swagger/sdrangel/code/qt5/client/SWGChannelReport.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGChannelReport.cpp @@ -46,6 +46,8 @@ SWGChannelReport::SWGChannelReport() { m_atv_mod_report_isSet = false; bfm_demod_report = nullptr; m_bfm_demod_report_isSet = false; + channel_power_report = nullptr; + m_channel_power_report_isSet = false; chirp_chat_demod_report = nullptr; m_chirp_chat_demod_report_isSet = false; chirp_chat_mod_report = nullptr; @@ -156,6 +158,8 @@ SWGChannelReport::init() { m_atv_mod_report_isSet = false; bfm_demod_report = new SWGBFMDemodReport(); m_bfm_demod_report_isSet = false; + channel_power_report = new SWGChannelPowerReport(); + m_channel_power_report_isSet = false; chirp_chat_demod_report = new SWGChirpChatDemodReport(); m_chirp_chat_demod_report_isSet = false; chirp_chat_mod_report = new SWGChirpChatModReport(); @@ -269,6 +273,9 @@ SWGChannelReport::cleanup() { if(bfm_demod_report != nullptr) { delete bfm_demod_report; } + if(channel_power_report != nullptr) { + delete channel_power_report; + } if(chirp_chat_demod_report != nullptr) { delete chirp_chat_demod_report; } @@ -426,6 +433,8 @@ SWGChannelReport::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&bfm_demod_report, pJson["BFMDemodReport"], "SWGBFMDemodReport", "SWGBFMDemodReport"); + ::SWGSDRangel::setValue(&channel_power_report, pJson["ChannelPowerReport"], "SWGChannelPowerReport", "SWGChannelPowerReport"); + ::SWGSDRangel::setValue(&chirp_chat_demod_report, pJson["ChirpChatDemodReport"], "SWGChirpChatDemodReport", "SWGChirpChatDemodReport"); ::SWGSDRangel::setValue(&chirp_chat_mod_report, pJson["ChirpChatModReport"], "SWGChirpChatModReport", "SWGChirpChatModReport"); @@ -553,6 +562,9 @@ SWGChannelReport::asJsonObject() { if((bfm_demod_report != nullptr) && (bfm_demod_report->isSet())){ toJsonValue(QString("BFMDemodReport"), bfm_demod_report, obj, QString("SWGBFMDemodReport")); } + if((channel_power_report != nullptr) && (channel_power_report->isSet())){ + toJsonValue(QString("ChannelPowerReport"), channel_power_report, obj, QString("SWGChannelPowerReport")); + } if((chirp_chat_demod_report != nullptr) && (chirp_chat_demod_report->isSet())){ toJsonValue(QString("ChirpChatDemodReport"), chirp_chat_demod_report, obj, QString("SWGChirpChatDemodReport")); } @@ -773,6 +785,16 @@ SWGChannelReport::setBfmDemodReport(SWGBFMDemodReport* bfm_demod_report) { this->m_bfm_demod_report_isSet = true; } +SWGChannelPowerReport* +SWGChannelReport::getChannelPowerReport() { + return channel_power_report; +} +void +SWGChannelReport::setChannelPowerReport(SWGChannelPowerReport* channel_power_report) { + this->channel_power_report = channel_power_report; + this->m_channel_power_report_isSet = true; +} + SWGChirpChatDemodReport* SWGChannelReport::getChirpChatDemodReport() { return chirp_chat_demod_report; @@ -1225,6 +1247,9 @@ SWGChannelReport::isSet(){ if(bfm_demod_report && bfm_demod_report->isSet()){ isObjectUpdated = true; break; } + if(channel_power_report && channel_power_report->isSet()){ + isObjectUpdated = true; break; + } if(chirp_chat_demod_report && chirp_chat_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 a6037c107..7a1de8f08 100644 --- a/swagger/sdrangel/code/qt5/client/SWGChannelReport.h +++ b/swagger/sdrangel/code/qt5/client/SWGChannelReport.h @@ -29,6 +29,7 @@ #include "SWGAMModReport.h" #include "SWGATVModReport.h" #include "SWGBFMDemodReport.h" +#include "SWGChannelPowerReport.h" #include "SWGChirpChatDemodReport.h" #include "SWGChirpChatModReport.h" #include "SWGDATVDemodReport.h" @@ -118,6 +119,9 @@ public: SWGBFMDemodReport* getBfmDemodReport(); void setBfmDemodReport(SWGBFMDemodReport* bfm_demod_report); + SWGChannelPowerReport* getChannelPowerReport(); + void setChannelPowerReport(SWGChannelPowerReport* channel_power_report); + SWGChirpChatDemodReport* getChirpChatDemodReport(); void setChirpChatDemodReport(SWGChirpChatDemodReport* chirp_chat_demod_report); @@ -275,6 +279,9 @@ private: SWGBFMDemodReport* bfm_demod_report; bool m_bfm_demod_report_isSet; + SWGChannelPowerReport* channel_power_report; + bool m_channel_power_report_isSet; + SWGChirpChatDemodReport* chirp_chat_demod_report; bool m_chirp_chat_demod_report_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGChannelSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGChannelSettings.cpp index 2847534a0..4a6226dfe 100644 --- a/swagger/sdrangel/code/qt5/client/SWGChannelSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGChannelSettings.cpp @@ -58,6 +58,8 @@ SWGChannelSettings::SWGChannelSettings() { m_bfm_demod_settings_isSet = false; channel_analyzer_settings = nullptr; m_channel_analyzer_settings_isSet = false; + channel_power_settings = nullptr; + m_channel_power_settings_isSet = false; chirp_chat_demod_settings = nullptr; m_chirp_chat_demod_settings_isSet = false; chirp_chat_mod_settings = nullptr; @@ -192,6 +194,8 @@ SWGChannelSettings::init() { m_bfm_demod_settings_isSet = false; channel_analyzer_settings = new SWGChannelAnalyzerSettings(); m_channel_analyzer_settings_isSet = false; + channel_power_settings = new SWGChannelPowerSettings(); + m_channel_power_settings_isSet = false; chirp_chat_demod_settings = new SWGChirpChatDemodSettings(); m_chirp_chat_demod_settings_isSet = false; chirp_chat_mod_settings = new SWGChirpChatModSettings(); @@ -331,6 +335,9 @@ SWGChannelSettings::cleanup() { if(channel_analyzer_settings != nullptr) { delete channel_analyzer_settings; } + if(channel_power_settings != nullptr) { + delete channel_power_settings; + } if(chirp_chat_demod_settings != nullptr) { delete chirp_chat_demod_settings; } @@ -518,6 +525,8 @@ SWGChannelSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&channel_analyzer_settings, pJson["ChannelAnalyzerSettings"], "SWGChannelAnalyzerSettings", "SWGChannelAnalyzerSettings"); + ::SWGSDRangel::setValue(&channel_power_settings, pJson["ChannelPowerSettings"], "SWGChannelPowerSettings", "SWGChannelPowerSettings"); + ::SWGSDRangel::setValue(&chirp_chat_demod_settings, pJson["ChirpChatDemodSettings"], "SWGChirpChatDemodSettings", "SWGChirpChatDemodSettings"); ::SWGSDRangel::setValue(&chirp_chat_mod_settings, pJson["ChirpChatModSettings"], "SWGChirpChatModSettings", "SWGChirpChatModSettings"); @@ -675,6 +684,9 @@ SWGChannelSettings::asJsonObject() { if((channel_analyzer_settings != nullptr) && (channel_analyzer_settings->isSet())){ toJsonValue(QString("ChannelAnalyzerSettings"), channel_analyzer_settings, obj, QString("SWGChannelAnalyzerSettings")); } + if((channel_power_settings != nullptr) && (channel_power_settings->isSet())){ + toJsonValue(QString("ChannelPowerSettings"), channel_power_settings, obj, QString("SWGChannelPowerSettings")); + } if((chirp_chat_demod_settings != nullptr) && (chirp_chat_demod_settings->isSet())){ toJsonValue(QString("ChirpChatDemodSettings"), chirp_chat_demod_settings, obj, QString("SWGChirpChatDemodSettings")); } @@ -973,6 +985,16 @@ SWGChannelSettings::setChannelAnalyzerSettings(SWGChannelAnalyzerSettings* chann this->m_channel_analyzer_settings_isSet = true; } +SWGChannelPowerSettings* +SWGChannelSettings::getChannelPowerSettings() { + return channel_power_settings; +} +void +SWGChannelSettings::setChannelPowerSettings(SWGChannelPowerSettings* channel_power_settings) { + this->channel_power_settings = channel_power_settings; + this->m_channel_power_settings_isSet = true; +} + SWGChirpChatDemodSettings* SWGChannelSettings::getChirpChatDemodSettings() { return chirp_chat_demod_settings; @@ -1503,6 +1525,9 @@ SWGChannelSettings::isSet(){ if(channel_analyzer_settings && channel_analyzer_settings->isSet()){ isObjectUpdated = true; break; } + if(channel_power_settings && channel_power_settings->isSet()){ + isObjectUpdated = true; break; + } if(chirp_chat_demod_settings && chirp_chat_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 9871e06de..59a16a74c 100644 --- a/swagger/sdrangel/code/qt5/client/SWGChannelSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGChannelSettings.h @@ -33,6 +33,7 @@ #include "SWGBFMDemodSettings.h" #include "SWGBeamSteeringCWModSettings.h" #include "SWGChannelAnalyzerSettings.h" +#include "SWGChannelPowerSettings.h" #include "SWGChirpChatDemodSettings.h" #include "SWGChirpChatModSettings.h" #include "SWGDABDemodSettings.h" @@ -146,6 +147,9 @@ public: SWGChannelAnalyzerSettings* getChannelAnalyzerSettings(); void setChannelAnalyzerSettings(SWGChannelAnalyzerSettings* channel_analyzer_settings); + SWGChannelPowerSettings* getChannelPowerSettings(); + void setChannelPowerSettings(SWGChannelPowerSettings* channel_power_settings); + SWGChirpChatDemodSettings* getChirpChatDemodSettings(); void setChirpChatDemodSettings(SWGChirpChatDemodSettings* chirp_chat_demod_settings); @@ -339,6 +343,9 @@ private: SWGChannelAnalyzerSettings* channel_analyzer_settings; bool m_channel_analyzer_settings_isSet; + SWGChannelPowerSettings* channel_power_settings; + bool m_channel_power_settings_isSet; + SWGChirpChatDemodSettings* chirp_chat_demod_settings; bool m_chirp_chat_demod_settings_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h index f4616eb0a..8342dd721 100644 --- a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h +++ b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h @@ -84,6 +84,8 @@ #include "SWGChannelConfig.h" #include "SWGChannelListItem.h" #include "SWGChannelMarker.h" +#include "SWGChannelPowerReport.h" +#include "SWGChannelPowerSettings.h" #include "SWGChannelReport.h" #include "SWGChannelSettings.h" #include "SWGChannelsDetail.h" @@ -732,6 +734,16 @@ namespace SWGSDRangel { obj->init(); return obj; } + if(QString("SWGChannelPowerReport").compare(type) == 0) { + SWGChannelPowerReport *obj = new SWGChannelPowerReport(); + obj->init(); + return obj; + } + if(QString("SWGChannelPowerSettings").compare(type) == 0) { + SWGChannelPowerSettings *obj = new SWGChannelPowerSettings(); + obj->init(); + return obj; + } if(QString("SWGChannelReport").compare(type) == 0) { SWGChannelReport *obj = new SWGChannelReport(); obj->init();