diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 7a6631a77..2437b437c 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -4178,6 +4178,10 @@ margin-bottom: 20px; }, "step" : { "type" : "integer" + }, + "scale" : { + "type" : "number", + "format" : "float" } }, "description" : "An frequency range with 64 bit support for min and max" @@ -6413,6 +6417,10 @@ margin-bottom: 20px; }, "step" : { "type" : "integer" + }, + "scale" : { + "type" : "number", + "format" : "float" } }, "description" : "An arbitrary range of integer values" @@ -37622,7 +37630,7 @@ except ApiException as e:
- Generated 2020-09-11T08:28:28.211+02:00 + Generated 2020-09-15T08:45:12.589+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/Structs.yaml b/sdrbase/resources/webapi/doc/swagger/include/Structs.yaml index af17abd24..08755b94b 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/Structs.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/Structs.yaml @@ -41,6 +41,9 @@ Range: type: integer step: type: integer + scale: + type: number + format: float RangeFloat: description: An arbitrary range of floating point values @@ -66,6 +69,9 @@ FrequencyRange: format: int64 step: type: integer + scale: + type: number + format: float NamedEnum: description: Enumeration with name for values diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 7a6631a77..2437b437c 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -4178,6 +4178,10 @@ margin-bottom: 20px; }, "step" : { "type" : "integer" + }, + "scale" : { + "type" : "number", + "format" : "float" } }, "description" : "An frequency range with 64 bit support for min and max" @@ -6413,6 +6417,10 @@ margin-bottom: 20px; }, "step" : { "type" : "integer" + }, + "scale" : { + "type" : "number", + "format" : "float" } }, "description" : "An arbitrary range of integer values" @@ -37622,7 +37630,7 @@ except ApiException as e:
- Generated 2020-09-11T08:28:28.211+02:00 + Generated 2020-09-15T08:45:12.589+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGFrequencyRange.cpp b/swagger/sdrangel/code/qt5/client/SWGFrequencyRange.cpp index 5355ba42b..7b4628c8c 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFrequencyRange.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGFrequencyRange.cpp @@ -34,6 +34,8 @@ SWGFrequencyRange::SWGFrequencyRange() { m_max_isSet = false; step = 0; m_step_isSet = false; + scale = 0.0f; + m_scale_isSet = false; } SWGFrequencyRange::~SWGFrequencyRange() { @@ -48,6 +50,8 @@ SWGFrequencyRange::init() { m_max_isSet = false; step = 0; m_step_isSet = false; + scale = 0.0f; + m_scale_isSet = false; } void @@ -55,6 +59,7 @@ SWGFrequencyRange::cleanup() { + } SWGFrequencyRange* @@ -74,6 +79,8 @@ SWGFrequencyRange::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&step, pJson["step"], "qint32", ""); + ::SWGSDRangel::setValue(&scale, pJson["scale"], "float", ""); + } QString @@ -99,6 +106,9 @@ SWGFrequencyRange::asJsonObject() { if(m_step_isSet){ obj->insert("step", QJsonValue(step)); } + if(m_scale_isSet){ + obj->insert("scale", QJsonValue(scale)); + } return obj; } @@ -133,6 +143,16 @@ SWGFrequencyRange::setStep(qint32 step) { this->m_step_isSet = true; } +float +SWGFrequencyRange::getScale() { + return scale; +} +void +SWGFrequencyRange::setScale(float scale) { + this->scale = scale; + this->m_scale_isSet = true; +} + bool SWGFrequencyRange::isSet(){ @@ -147,6 +167,9 @@ SWGFrequencyRange::isSet(){ if(m_step_isSet){ isObjectUpdated = true; break; } + if(m_scale_isSet){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFrequencyRange.h b/swagger/sdrangel/code/qt5/client/SWGFrequencyRange.h index 0630910ab..2a37d3b33 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFrequencyRange.h +++ b/swagger/sdrangel/code/qt5/client/SWGFrequencyRange.h @@ -50,6 +50,9 @@ public: qint32 getStep(); void setStep(qint32 step); + float getScale(); + void setScale(float scale); + virtual bool isSet() override; @@ -63,6 +66,9 @@ private: qint32 step; bool m_step_isSet; + float scale; + bool m_scale_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGRange.cpp b/swagger/sdrangel/code/qt5/client/SWGRange.cpp index 37065fb83..a5a6400d2 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRange.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGRange.cpp @@ -34,6 +34,8 @@ SWGRange::SWGRange() { m_max_isSet = false; step = 0; m_step_isSet = false; + scale = 0.0f; + m_scale_isSet = false; } SWGRange::~SWGRange() { @@ -48,6 +50,8 @@ SWGRange::init() { m_max_isSet = false; step = 0; m_step_isSet = false; + scale = 0.0f; + m_scale_isSet = false; } void @@ -55,6 +59,7 @@ SWGRange::cleanup() { + } SWGRange* @@ -74,6 +79,8 @@ SWGRange::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&step, pJson["step"], "qint32", ""); + ::SWGSDRangel::setValue(&scale, pJson["scale"], "float", ""); + } QString @@ -99,6 +106,9 @@ SWGRange::asJsonObject() { if(m_step_isSet){ obj->insert("step", QJsonValue(step)); } + if(m_scale_isSet){ + obj->insert("scale", QJsonValue(scale)); + } return obj; } @@ -133,6 +143,16 @@ SWGRange::setStep(qint32 step) { this->m_step_isSet = true; } +float +SWGRange::getScale() { + return scale; +} +void +SWGRange::setScale(float scale) { + this->scale = scale; + this->m_scale_isSet = true; +} + bool SWGRange::isSet(){ @@ -147,6 +167,9 @@ SWGRange::isSet(){ if(m_step_isSet){ isObjectUpdated = true; break; } + if(m_scale_isSet){ + isObjectUpdated = true; break; + } }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGRange.h b/swagger/sdrangel/code/qt5/client/SWGRange.h index e02663fea..3b6b70a1b 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRange.h +++ b/swagger/sdrangel/code/qt5/client/SWGRange.h @@ -50,6 +50,9 @@ public: qint32 getStep(); void setStep(qint32 step); + float getScale(); + void setScale(float scale); + virtual bool isSet() override; @@ -63,6 +66,9 @@ private: qint32 step; bool m_step_isSet; + float scale; + bool m_scale_isSet; + }; }