From e8ea0665fe6e1381b9a1528f3d3ce4a2cbca9ec7 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 20 Dec 2020 19:01:54 +0100 Subject: [PATCH] Demod Analyzer: REST API update. AMMod: fixed include issue --- plugins/channeltx/modam/ammodsource.h | 1 + .../feature/demodanalyzer/demodanalyzer.cpp | 7 +++ sdrbase/resources/webapi/doc/html2/index.html | 7 +-- .../doc/swagger/include/DemodAnalyzer.yaml | 4 +- .../api/swagger/include/DemodAnalyzer.yaml | 4 +- swagger/sdrangel/code/html2/index.html | 7 +-- .../qt5/client/SWGDemodAnalyzerSettings.cpp | 49 +++++-------------- .../qt5/client/SWGDemodAnalyzerSettings.h | 14 ++---- 8 files changed, 31 insertions(+), 62 deletions(-) diff --git a/plugins/channeltx/modam/ammodsource.h b/plugins/channeltx/modam/ammodsource.h index 56ce84b5b..528819526 100644 --- a/plugins/channeltx/modam/ammodsource.h +++ b/plugins/channeltx/modam/ammodsource.h @@ -20,6 +20,7 @@ #include #include +#include #include #include diff --git a/plugins/feature/demodanalyzer/demodanalyzer.cpp b/plugins/feature/demodanalyzer/demodanalyzer.cpp index f74cec029..4ece5f8d5 100644 --- a/plugins/feature/demodanalyzer/demodanalyzer.cpp +++ b/plugins/feature/demodanalyzer/demodanalyzer.cpp @@ -402,6 +402,7 @@ void DemodAnalyzer::webapiFormatFeatureSettings( response.getDemodAnalyzerSettings()->setTitle(new QString(settings.m_title)); } + response.getDemodAnalyzerSettings()->setLog2Decim(settings.m_log2Decim); response.getDemodAnalyzerSettings()->setRgbColor(settings.m_rgbColor); response.getDemodAnalyzerSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); @@ -421,6 +422,9 @@ void DemodAnalyzer::webapiUpdateFeatureSettings( const QStringList& featureSettingsKeys, SWGSDRangel::SWGFeatureSettings& response) { + if (featureSettingsKeys.contains("log2Decim")) { + settings.m_log2Decim = response.getDemodAnalyzerSettings()->getLog2Decim(); + } if (featureSettingsKeys.contains("title")) { settings.m_title = *response.getDemodAnalyzerSettings()->getTitle(); } @@ -455,6 +459,9 @@ void DemodAnalyzer::webapiReverseSendSettings(QList& featureSettingsKey // transfer data that has been modified. When force is on transfer all data except reverse API data + if (featureSettingsKeys.contains("log2Decim") || force) { + swgDemodAnalyzerSettings->setLog2Decim(settings.m_log2Decim); + } if (featureSettingsKeys.contains("title") || force) { swgDemodAnalyzerSettings->setTitle(new QString(settings.m_title)); } diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index d47d11810..6887654e4 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -3403,10 +3403,7 @@ margin-bottom: 20px; }; defs.DemodAnalyzerSettings = { "properties" : { - "deviceIndex" : { - "type" : "integer" - }, - "channelIndex" : { + "log2Decim" : { "type" : "integer" }, "title" : { @@ -44920,7 +44917,7 @@ except ApiException as e:
- Generated 2020-12-16T13:53:51.605+01:00 + Generated 2020-12-20T18:34:47.837+01:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/DemodAnalyzer.yaml b/sdrbase/resources/webapi/doc/swagger/include/DemodAnalyzer.yaml index 7533eb089..2cea87636 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/DemodAnalyzer.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/DemodAnalyzer.yaml @@ -1,9 +1,7 @@ DemodAnalyzerSettings: description: DemodAnalyzer properties: - deviceIndex: - type: integer - channelIndex: + log2Decim: type: integer title: type: string diff --git a/swagger/sdrangel/api/swagger/include/DemodAnalyzer.yaml b/swagger/sdrangel/api/swagger/include/DemodAnalyzer.yaml index 87f773140..e742b027d 100644 --- a/swagger/sdrangel/api/swagger/include/DemodAnalyzer.yaml +++ b/swagger/sdrangel/api/swagger/include/DemodAnalyzer.yaml @@ -1,9 +1,7 @@ DemodAnalyzerSettings: description: DemodAnalyzer properties: - deviceIndex: - type: integer - channelIndex: + log2Decim: type: integer title: type: string diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index d47d11810..6887654e4 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -3403,10 +3403,7 @@ margin-bottom: 20px; }; defs.DemodAnalyzerSettings = { "properties" : { - "deviceIndex" : { - "type" : "integer" - }, - "channelIndex" : { + "log2Decim" : { "type" : "integer" }, "title" : { @@ -44920,7 +44917,7 @@ except ApiException as e:
- Generated 2020-12-16T13:53:51.605+01:00 + Generated 2020-12-20T18:34:47.837+01:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGDemodAnalyzerSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGDemodAnalyzerSettings.cpp index 419fb6cd2..b7e85a466 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDemodAnalyzerSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGDemodAnalyzerSettings.cpp @@ -28,10 +28,8 @@ SWGDemodAnalyzerSettings::SWGDemodAnalyzerSettings(QString* json) { } SWGDemodAnalyzerSettings::SWGDemodAnalyzerSettings() { - device_index = 0; - m_device_index_isSet = false; - channel_index = 0; - m_channel_index_isSet = false; + log2_decim = 0; + m_log2_decim_isSet = false; title = nullptr; m_title_isSet = false; rgb_color = 0; @@ -58,10 +56,8 @@ SWGDemodAnalyzerSettings::~SWGDemodAnalyzerSettings() { void SWGDemodAnalyzerSettings::init() { - device_index = 0; - m_device_index_isSet = false; - channel_index = 0; - m_channel_index_isSet = false; + log2_decim = 0; + m_log2_decim_isSet = false; title = new QString(""); m_title_isSet = false; rgb_color = 0; @@ -85,7 +81,6 @@ SWGDemodAnalyzerSettings::init() { void SWGDemodAnalyzerSettings::cleanup() { - if(title != nullptr) { delete title; } @@ -116,9 +111,7 @@ SWGDemodAnalyzerSettings::fromJson(QString &json) { void SWGDemodAnalyzerSettings::fromJsonObject(QJsonObject &pJson) { - ::SWGSDRangel::setValue(&device_index, pJson["deviceIndex"], "qint32", ""); - - ::SWGSDRangel::setValue(&channel_index, pJson["channelIndex"], "qint32", ""); + ::SWGSDRangel::setValue(&log2_decim, pJson["log2Decim"], "qint32", ""); ::SWGSDRangel::setValue(&title, pJson["title"], "QString", "QString"); @@ -154,11 +147,8 @@ SWGDemodAnalyzerSettings::asJson () QJsonObject* SWGDemodAnalyzerSettings::asJsonObject() { QJsonObject* obj = new QJsonObject(); - if(m_device_index_isSet){ - obj->insert("deviceIndex", QJsonValue(device_index)); - } - if(m_channel_index_isSet){ - obj->insert("channelIndex", QJsonValue(channel_index)); + if(m_log2_decim_isSet){ + obj->insert("log2Decim", QJsonValue(log2_decim)); } if(title != nullptr && *title != QString("")){ toJsonValue(QString("title"), title, obj, QString("QString")); @@ -192,23 +182,13 @@ SWGDemodAnalyzerSettings::asJsonObject() { } qint32 -SWGDemodAnalyzerSettings::getDeviceIndex() { - return device_index; +SWGDemodAnalyzerSettings::getLog2Decim() { + return log2_decim; } void -SWGDemodAnalyzerSettings::setDeviceIndex(qint32 device_index) { - this->device_index = device_index; - this->m_device_index_isSet = true; -} - -qint32 -SWGDemodAnalyzerSettings::getChannelIndex() { - return channel_index; -} -void -SWGDemodAnalyzerSettings::setChannelIndex(qint32 channel_index) { - this->channel_index = channel_index; - this->m_channel_index_isSet = true; +SWGDemodAnalyzerSettings::setLog2Decim(qint32 log2_decim) { + this->log2_decim = log2_decim; + this->m_log2_decim_isSet = true; } QString* @@ -306,10 +286,7 @@ bool SWGDemodAnalyzerSettings::isSet(){ bool isObjectUpdated = false; do{ - if(m_device_index_isSet){ - isObjectUpdated = true; break; - } - if(m_channel_index_isSet){ + if(m_log2_decim_isSet){ isObjectUpdated = true; break; } if(title && *title != QString("")){ diff --git a/swagger/sdrangel/code/qt5/client/SWGDemodAnalyzerSettings.h b/swagger/sdrangel/code/qt5/client/SWGDemodAnalyzerSettings.h index 557c3cb0b..a22d2fd86 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDemodAnalyzerSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGDemodAnalyzerSettings.h @@ -44,11 +44,8 @@ public: virtual void fromJsonObject(QJsonObject &json) override; virtual SWGDemodAnalyzerSettings* fromJson(QString &jsonString) override; - qint32 getDeviceIndex(); - void setDeviceIndex(qint32 device_index); - - qint32 getChannelIndex(); - void setChannelIndex(qint32 channel_index); + qint32 getLog2Decim(); + void setLog2Decim(qint32 log2_decim); QString* getTitle(); void setTitle(QString* title); @@ -81,11 +78,8 @@ public: virtual bool isSet() override; private: - qint32 device_index; - bool m_device_index_isSet; - - qint32 channel_index; - bool m_channel_index_isSet; + qint32 log2_decim; + bool m_log2_decim_isSet; QString* title; bool m_title_isSet;