From 0bfea9df22737d498e2a81a5b999ff1e1ac3c110 Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 5 May 2020 18:54:28 +0200 Subject: [PATCH] REST API: GLSpectrumSettings: updated with new fields. Generated code --- sdrbase/resources/webapi/doc/html2/index.html | 18 +++- swagger/sdrangel/code/html2/index.html | 18 +++- .../code/qt5/client/SWGGLSpectrum.cpp | 94 +++++++++++++++++++ .../sdrangel/code/qt5/client/SWGGLSpectrum.h | 25 +++++ 4 files changed, 153 insertions(+), 2 deletions(-) diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index b090a0d0c..11d6bbe5a 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -4222,6 +4222,22 @@ margin-bottom: 20px; "linear" : { "type" : "integer", "description" : "boolean" + }, + "ssb" : { + "type" : "integer", + "description" : "boolean" + }, + "usb" : { + "type" : "integer", + "description" : "boolean" + }, + "wsSpectrumAddress" : { + "type" : "string", + "description" : "IPv4 address of interface the websocket server is listening to" + }, + "wsSpectrumPort" : { + "type" : "integer", + "description" : "port on which the websocket server is listening" } }, "description" : "GLSpectrumGUI settings" @@ -37223,7 +37239,7 @@ except ApiException as e:
- Generated 2020-05-05T11:23:31.800+02:00 + Generated 2020-05-05T14:20:39.487+02:00
diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index b090a0d0c..11d6bbe5a 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -4222,6 +4222,22 @@ margin-bottom: 20px; "linear" : { "type" : "integer", "description" : "boolean" + }, + "ssb" : { + "type" : "integer", + "description" : "boolean" + }, + "usb" : { + "type" : "integer", + "description" : "boolean" + }, + "wsSpectrumAddress" : { + "type" : "string", + "description" : "IPv4 address of interface the websocket server is listening to" + }, + "wsSpectrumPort" : { + "type" : "integer", + "description" : "port on which the websocket server is listening" } }, "description" : "GLSpectrumGUI settings" @@ -37223,7 +37239,7 @@ except ApiException as e:
- Generated 2020-05-05T11:23:31.800+02:00 + Generated 2020-05-05T14:20:39.487+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGGLSpectrum.cpp b/swagger/sdrangel/code/qt5/client/SWGGLSpectrum.cpp index 0a3714f9f..fdb136873 100644 --- a/swagger/sdrangel/code/qt5/client/SWGGLSpectrum.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGGLSpectrum.cpp @@ -68,6 +68,14 @@ SWGGLSpectrum::SWGGLSpectrum() { m_averaging_value_isSet = false; linear = 0; m_linear_isSet = false; + ssb = 0; + m_ssb_isSet = false; + usb = 0; + m_usb_isSet = false; + ws_spectrum_address = nullptr; + m_ws_spectrum_address_isSet = false; + ws_spectrum_port = 0; + m_ws_spectrum_port_isSet = false; } SWGGLSpectrum::~SWGGLSpectrum() { @@ -116,6 +124,14 @@ SWGGLSpectrum::init() { m_averaging_value_isSet = false; linear = 0; m_linear_isSet = false; + ssb = 0; + m_ssb_isSet = false; + usb = 0; + m_usb_isSet = false; + ws_spectrum_address = new QString(""); + m_ws_spectrum_address_isSet = false; + ws_spectrum_port = 0; + m_ws_spectrum_port_isSet = false; } void @@ -140,6 +156,12 @@ SWGGLSpectrum::cleanup() { + + + if(ws_spectrum_address != nullptr) { + delete ws_spectrum_address; + } + } SWGGLSpectrum* @@ -193,6 +215,14 @@ SWGGLSpectrum::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&linear, pJson["linear"], "qint32", ""); + ::SWGSDRangel::setValue(&ssb, pJson["ssb"], "qint32", ""); + + ::SWGSDRangel::setValue(&usb, pJson["usb"], "qint32", ""); + + ::SWGSDRangel::setValue(&ws_spectrum_address, pJson["wsSpectrumAddress"], "QString", "QString"); + + ::SWGSDRangel::setValue(&ws_spectrum_port, pJson["wsSpectrumPort"], "qint32", ""); + } QString @@ -269,6 +299,18 @@ SWGGLSpectrum::asJsonObject() { if(m_linear_isSet){ obj->insert("linear", QJsonValue(linear)); } + if(m_ssb_isSet){ + obj->insert("ssb", QJsonValue(ssb)); + } + if(m_usb_isSet){ + obj->insert("usb", QJsonValue(usb)); + } + if(ws_spectrum_address != nullptr && *ws_spectrum_address != QString("")){ + toJsonValue(QString("wsSpectrumAddress"), ws_spectrum_address, obj, QString("QString")); + } + if(m_ws_spectrum_port_isSet){ + obj->insert("wsSpectrumPort", QJsonValue(ws_spectrum_port)); + } return obj; } @@ -473,6 +515,46 @@ SWGGLSpectrum::setLinear(qint32 linear) { this->m_linear_isSet = true; } +qint32 +SWGGLSpectrum::getSsb() { + return ssb; +} +void +SWGGLSpectrum::setSsb(qint32 ssb) { + this->ssb = ssb; + this->m_ssb_isSet = true; +} + +qint32 +SWGGLSpectrum::getUsb() { + return usb; +} +void +SWGGLSpectrum::setUsb(qint32 usb) { + this->usb = usb; + this->m_usb_isSet = true; +} + +QString* +SWGGLSpectrum::getWsSpectrumAddress() { + return ws_spectrum_address; +} +void +SWGGLSpectrum::setWsSpectrumAddress(QString* ws_spectrum_address) { + this->ws_spectrum_address = ws_spectrum_address; + this->m_ws_spectrum_address_isSet = true; +} + +qint32 +SWGGLSpectrum::getWsSpectrumPort() { + return ws_spectrum_port; +} +void +SWGGLSpectrum::setWsSpectrumPort(qint32 ws_spectrum_port) { + this->ws_spectrum_port = ws_spectrum_port; + this->m_ws_spectrum_port_isSet = true; +} + bool SWGGLSpectrum::isSet(){ @@ -538,6 +620,18 @@ SWGGLSpectrum::isSet(){ if(m_linear_isSet){ isObjectUpdated = true; break; } + if(m_ssb_isSet){ + isObjectUpdated = true; break; + } + if(m_usb_isSet){ + isObjectUpdated = true; break; + } + if(ws_spectrum_address && *ws_spectrum_address != QString("")){ + isObjectUpdated = true; break; + } + if(m_ws_spectrum_port_isSet){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGGLSpectrum.h b/swagger/sdrangel/code/qt5/client/SWGGLSpectrum.h index f8f4bdd12..64c05f6f7 100644 --- a/swagger/sdrangel/code/qt5/client/SWGGLSpectrum.h +++ b/swagger/sdrangel/code/qt5/client/SWGGLSpectrum.h @@ -22,6 +22,7 @@ #include +#include #include "SWGObject.h" #include "export.h" @@ -101,6 +102,18 @@ public: qint32 getLinear(); void setLinear(qint32 linear); + qint32 getSsb(); + void setSsb(qint32 ssb); + + qint32 getUsb(); + void setUsb(qint32 usb); + + QString* getWsSpectrumAddress(); + void setWsSpectrumAddress(QString* ws_spectrum_address); + + qint32 getWsSpectrumPort(); + void setWsSpectrumPort(qint32 ws_spectrum_port); + virtual bool isSet() override; @@ -165,6 +178,18 @@ private: qint32 linear; bool m_linear_isSet; + qint32 ssb; + bool m_ssb_isSet; + + qint32 usb; + bool m_usb_isSet; + + QString* ws_spectrum_address; + bool m_ws_spectrum_address_isSet; + + qint32 ws_spectrum_port; + bool m_ws_spectrum_port_isSet; + }; }