From e24e8d20ac88383502e5de5c0d532f466546a8bf Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 20 Aug 2020 13:50:39 +0200 Subject: [PATCH] ATV Demod: REST API generated code --- sdrbase/resources/webapi/doc/html2/index.html | 12 +--- .../webapi/doc/swagger/include/ATVDemod.yaml | 7 -- swagger/sdrangel/code/html2/index.html | 12 +--- .../code/qt5/client/SWGATVDemodSettings.cpp | 69 ------------------- .../code/qt5/client/SWGATVDemodSettings.h | 18 ----- 5 files changed, 2 insertions(+), 116 deletions(-) diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 5a9bc0853..e059944f5 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -899,12 +899,6 @@ margin-bottom: 20px; }; defs.ATVDemodSettings = { "properties" : { - "lineTimeFactor" : { - "type" : "integer" - }, - "topTimeFactor" : { - "type" : "integer" - }, "fpsIndex" : { "type" : "integer" }, @@ -940,10 +934,6 @@ margin-bottom: 20px; "type" : "integer", "description" : "boolean" }, - "blndecimatorEnable" : { - "type" : "integer", - "description" : "boolean" - }, "fltBFOFrequency" : { "type" : "number", "format" : "float" @@ -33315,7 +33305,7 @@ except ApiException as e:
- Generated 2020-08-09T06:42:07.619+02:00 + Generated 2020-08-20T08:53:46.594+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ATVDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/ATVDemod.yaml index 4e504057e..976a48563 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ATVDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ATVDemod.yaml @@ -1,10 +1,6 @@ ATVDemodSettings: description: ATVDemod properties: - lineTimeFactor: - type: integer - topTimeFactor: - type: integer fpsIndex: type: integer halfImage: @@ -30,9 +26,6 @@ ATVDemodSettings: blnFFTFiltering: description: boolean type: integer - blndecimatorEnable: - description: boolean - type: integer fltBFOFrequency: type: number format: float diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 5a9bc0853..e059944f5 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -899,12 +899,6 @@ margin-bottom: 20px; }; defs.ATVDemodSettings = { "properties" : { - "lineTimeFactor" : { - "type" : "integer" - }, - "topTimeFactor" : { - "type" : "integer" - }, "fpsIndex" : { "type" : "integer" }, @@ -940,10 +934,6 @@ margin-bottom: 20px; "type" : "integer", "description" : "boolean" }, - "blndecimatorEnable" : { - "type" : "integer", - "description" : "boolean" - }, "fltBFOFrequency" : { "type" : "number", "format" : "float" @@ -33315,7 +33305,7 @@ except ApiException as e:
- Generated 2020-08-09T06:42:07.619+02:00 + Generated 2020-08-20T08:53:46.594+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGATVDemodSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGATVDemodSettings.cpp index 03aa7d769..baf1864b9 100644 --- a/swagger/sdrangel/code/qt5/client/SWGATVDemodSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGATVDemodSettings.cpp @@ -28,10 +28,6 @@ SWGATVDemodSettings::SWGATVDemodSettings(QString* json) { } SWGATVDemodSettings::SWGATVDemodSettings() { - line_time_factor = 0; - m_line_time_factor_isSet = false; - top_time_factor = 0; - m_top_time_factor_isSet = false; fps_index = 0; m_fps_index_isSet = false; half_image = 0; @@ -52,8 +48,6 @@ SWGATVDemodSettings::SWGATVDemodSettings() { m_flt_rf_opp_bandwidth_isSet = false; bln_fft_filtering = 0; m_bln_fft_filtering_isSet = false; - blndecimator_enable = 0; - m_blndecimator_enable_isSet = false; flt_bfo_frequency = 0.0f; m_flt_bfo_frequency_isSet = false; fm_deviation = 0.0f; @@ -108,10 +102,6 @@ SWGATVDemodSettings::~SWGATVDemodSettings() { void SWGATVDemodSettings::init() { - line_time_factor = 0; - m_line_time_factor_isSet = false; - top_time_factor = 0; - m_top_time_factor_isSet = false; fps_index = 0; m_fps_index_isSet = false; half_image = 0; @@ -132,8 +122,6 @@ SWGATVDemodSettings::init() { m_flt_rf_opp_bandwidth_isSet = false; bln_fft_filtering = 0; m_bln_fft_filtering_isSet = false; - blndecimator_enable = 0; - m_blndecimator_enable_isSet = false; flt_bfo_frequency = 0.0f; m_flt_bfo_frequency_isSet = false; fm_deviation = 0.0f; @@ -210,9 +198,6 @@ SWGATVDemodSettings::cleanup() { - - - @@ -237,10 +222,6 @@ SWGATVDemodSettings::fromJson(QString &json) { void SWGATVDemodSettings::fromJsonObject(QJsonObject &pJson) { - ::SWGSDRangel::setValue(&line_time_factor, pJson["lineTimeFactor"], "qint32", ""); - - ::SWGSDRangel::setValue(&top_time_factor, pJson["topTimeFactor"], "qint32", ""); - ::SWGSDRangel::setValue(&fps_index, pJson["fpsIndex"], "qint32", ""); ::SWGSDRangel::setValue(&half_image, pJson["halfImage"], "qint32", ""); @@ -261,8 +242,6 @@ SWGATVDemodSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&bln_fft_filtering, pJson["blnFFTFiltering"], "qint32", ""); - ::SWGSDRangel::setValue(&blndecimator_enable, pJson["blndecimatorEnable"], "qint32", ""); - ::SWGSDRangel::setValue(&flt_bfo_frequency, pJson["fltBFOFrequency"], "float", ""); ::SWGSDRangel::setValue(&fm_deviation, pJson["fmDeviation"], "float", ""); @@ -325,12 +304,6 @@ SWGATVDemodSettings::asJson () QJsonObject* SWGATVDemodSettings::asJsonObject() { QJsonObject* obj = new QJsonObject(); - if(m_line_time_factor_isSet){ - obj->insert("lineTimeFactor", QJsonValue(line_time_factor)); - } - if(m_top_time_factor_isSet){ - obj->insert("topTimeFactor", QJsonValue(top_time_factor)); - } if(m_fps_index_isSet){ obj->insert("fpsIndex", QJsonValue(fps_index)); } @@ -361,9 +334,6 @@ SWGATVDemodSettings::asJsonObject() { if(m_bln_fft_filtering_isSet){ obj->insert("blnFFTFiltering", QJsonValue(bln_fft_filtering)); } - if(m_blndecimator_enable_isSet){ - obj->insert("blndecimatorEnable", QJsonValue(blndecimator_enable)); - } if(m_flt_bfo_frequency_isSet){ obj->insert("fltBFOFrequency", QJsonValue(flt_bfo_frequency)); } @@ -437,26 +407,6 @@ SWGATVDemodSettings::asJsonObject() { return obj; } -qint32 -SWGATVDemodSettings::getLineTimeFactor() { - return line_time_factor; -} -void -SWGATVDemodSettings::setLineTimeFactor(qint32 line_time_factor) { - this->line_time_factor = line_time_factor; - this->m_line_time_factor_isSet = true; -} - -qint32 -SWGATVDemodSettings::getTopTimeFactor() { - return top_time_factor; -} -void -SWGATVDemodSettings::setTopTimeFactor(qint32 top_time_factor) { - this->top_time_factor = top_time_factor; - this->m_top_time_factor_isSet = true; -} - qint32 SWGATVDemodSettings::getFpsIndex() { return fps_index; @@ -557,16 +507,6 @@ SWGATVDemodSettings::setBlnFftFiltering(qint32 bln_fft_filtering) { this->m_bln_fft_filtering_isSet = true; } -qint32 -SWGATVDemodSettings::getBlndecimatorEnable() { - return blndecimator_enable; -} -void -SWGATVDemodSettings::setBlndecimatorEnable(qint32 blndecimator_enable) { - this->blndecimator_enable = blndecimator_enable; - this->m_blndecimator_enable_isSet = true; -} - float SWGATVDemodSettings::getFltBfoFrequency() { return flt_bfo_frequency; @@ -802,12 +742,6 @@ bool SWGATVDemodSettings::isSet(){ bool isObjectUpdated = false; do{ - if(m_line_time_factor_isSet){ - isObjectUpdated = true; break; - } - if(m_top_time_factor_isSet){ - isObjectUpdated = true; break; - } if(m_fps_index_isSet){ isObjectUpdated = true; break; } @@ -838,9 +772,6 @@ SWGATVDemodSettings::isSet(){ if(m_bln_fft_filtering_isSet){ isObjectUpdated = true; break; } - if(m_blndecimator_enable_isSet){ - isObjectUpdated = true; break; - } if(m_flt_bfo_frequency_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGATVDemodSettings.h b/swagger/sdrangel/code/qt5/client/SWGATVDemodSettings.h index ece7085d4..794767089 100644 --- a/swagger/sdrangel/code/qt5/client/SWGATVDemodSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGATVDemodSettings.h @@ -42,12 +42,6 @@ public: virtual void fromJsonObject(QJsonObject &json) override; virtual SWGATVDemodSettings* fromJson(QString &jsonString) override; - qint32 getLineTimeFactor(); - void setLineTimeFactor(qint32 line_time_factor); - - qint32 getTopTimeFactor(); - void setTopTimeFactor(qint32 top_time_factor); - qint32 getFpsIndex(); void setFpsIndex(qint32 fps_index); @@ -78,9 +72,6 @@ public: qint32 getBlnFftFiltering(); void setBlnFftFiltering(qint32 bln_fft_filtering); - qint32 getBlndecimatorEnable(); - void setBlndecimatorEnable(qint32 blndecimator_enable); - float getFltBfoFrequency(); void setFltBfoFrequency(float flt_bfo_frequency); @@ -154,12 +145,6 @@ public: virtual bool isSet() override; private: - qint32 line_time_factor; - bool m_line_time_factor_isSet; - - qint32 top_time_factor; - bool m_top_time_factor_isSet; - qint32 fps_index; bool m_fps_index_isSet; @@ -190,9 +175,6 @@ private: qint32 bln_fft_filtering; bool m_bln_fft_filtering_isSet; - qint32 blndecimator_enable; - bool m_blndecimator_enable_isSet; - float flt_bfo_frequency; bool m_flt_bfo_frequency_isSet;