Browse Source

Regenerate swagger

chirpmodem-v8.0.0
srcejon 2 months ago
parent
commit
2f0296c048
  1. 7
      sdrbase/resources/webapi/doc/html2/index.html
  2. 2
      sdrbase/resources/webapi/doc/swagger/include/BFMDemod.yaml
  3. 2
      sdrbase/resources/webapi/doc/swagger/include/DABDemod.yaml
  4. 2
      sdrbase/resources/webapi/doc/swagger/include/GLSpectrum.yaml
  5. 1
      sdrbase/resources/webapi/doc/swagger/include/Map.yaml
  6. 7
      swagger/sdrangel/code/html2/index.html
  7. 10
      swagger/sdrangel/code/qt5/client/SWGDABDemodReport.cpp
  8. 8
      swagger/sdrangel/code/qt5/client/SWGDABDemodReport.h
  9. 40
      swagger/sdrangel/code/qt5/client/SWGGLSpectrum.cpp
  10. 13
      swagger/sdrangel/code/qt5/client/SWGGLSpectrum.h
  11. 20
      swagger/sdrangel/code/qt5/client/SWGMapSettings.cpp
  12. 7
      swagger/sdrangel/code/qt5/client/SWGMapSettings.h

7
sdrbase/resources/webapi/doc/html2/index.html

@ -6269,7 +6269,7 @@ margin-bottom: 20px; @@ -6269,7 +6269,7 @@ margin-bottom: 20px;
"type" : "array",
"description" : "Programme services discovered in the currently tuned ensemble.",
"items" : {
"$ref" : "#/DABProgram"
"$ref" : "#/definitions/DABProgram"
}
},
"selectedProgram" : {
@ -10231,11 +10231,13 @@ margin-bottom: 20px; @@ -10231,11 +10231,13 @@ margin-bottom: 20px;
},
"frequencyZoomFactor" : {
"type" : "number",
"format" : "float",
"description" : "Horizontal frequency zoom factor.",
"minimum" : 1
},
"frequencyZoomPos" : {
"type" : "number",
"format" : "float",
"description" : "Horizontal frequency-zoom position as a fraction of the span.",
"minimum" : 0,
"maximum" : 1
@ -14211,6 +14213,7 @@ margin-bottom: 20px; @@ -14211,6 +14213,7 @@ margin-bottom: 20px;
},
"lightIntensity" : {
"type" : "number",
"format" : "float",
"description" : "Camera light intensity used by the 3D map.",
"minimum" : 0
},
@ -66334,7 +66337,7 @@ except ApiException as e: @@ -66334,7 +66337,7 @@ except ApiException as e:
</div>
<div id="generator">
<div class="content">
Generated 2026-09-11T09:18:28.785+02:00
Generated 2026-09-11T11:04:13.600+02:00
</div>
</div>
</div>

2
sdrbase/resources/webapi/doc/swagger/include/BFMDemod.yaml

@ -130,7 +130,7 @@ BFMDemodReport: @@ -130,7 +130,7 @@ BFMDemodReport:
type: number
format: float
rdsReport:
$ref: "#/RDSReport"
$ref: "/doc/swagger/include/BFMDemod.yaml#/RDSReport"
description: "RDS decoder status and decoded programme information."
RDSReport:

2
sdrbase/resources/webapi/doc/swagger/include/DABDemod.yaml

@ -111,7 +111,7 @@ DABDemodReport: @@ -111,7 +111,7 @@ DABDemodReport:
type: array
description: "Programme services discovered in the currently tuned ensemble."
items:
$ref: "#/DABProgram"
$ref: "/doc/swagger/include/DABDemod.yaml#/DABProgram"
selectedProgram:
type: string
description: "Exact service label currently requested by the program setting."

2
sdrbase/resources/webapi/doc/swagger/include/GLSpectrum.yaml

@ -235,10 +235,12 @@ GLSpectrum: @@ -235,10 +235,12 @@ GLSpectrum:
frequencyZoomFactor:
description: Horizontal frequency zoom factor.
type: number
format: float
minimum: 1
frequencyZoomPos:
description: Horizontal frequency-zoom position as a fraction of the span.
type: number
format: float
minimum: 0
maximum: 1
waterfallTimeUnits:

1
sdrbase/resources/webapi/doc/swagger/include/Map.yaml

@ -52,6 +52,7 @@ MapSettings: @@ -52,6 +52,7 @@ MapSettings:
lightIntensity:
description: Camera light intensity used by the 3D map.
type: number
format: float
minimum: 0
eciCamera:
description: Use an ECI rather than ECEF camera frame (1 for yes, 0 for no).

7
swagger/sdrangel/code/html2/index.html

@ -6269,7 +6269,7 @@ margin-bottom: 20px; @@ -6269,7 +6269,7 @@ margin-bottom: 20px;
"type" : "array",
"description" : "Programme services discovered in the currently tuned ensemble.",
"items" : {
"$ref" : "#/DABProgram"
"$ref" : "#/definitions/DABProgram"
}
},
"selectedProgram" : {
@ -10231,11 +10231,13 @@ margin-bottom: 20px; @@ -10231,11 +10231,13 @@ margin-bottom: 20px;
},
"frequencyZoomFactor" : {
"type" : "number",
"format" : "float",
"description" : "Horizontal frequency zoom factor.",
"minimum" : 1
},
"frequencyZoomPos" : {
"type" : "number",
"format" : "float",
"description" : "Horizontal frequency-zoom position as a fraction of the span.",
"minimum" : 0,
"maximum" : 1
@ -14211,6 +14213,7 @@ margin-bottom: 20px; @@ -14211,6 +14213,7 @@ margin-bottom: 20px;
},
"lightIntensity" : {
"type" : "number",
"format" : "float",
"description" : "Camera light intensity used by the 3D map.",
"minimum" : 0
},
@ -66334,7 +66337,7 @@ except ApiException as e: @@ -66334,7 +66337,7 @@ except ApiException as e:
</div>
<div id="generator">
<div class="content">
Generated 2026-09-11T09:18:28.785+02:00
Generated 2026-09-11T11:04:13.600+02:00
</div>
</div>
</div>

10
swagger/sdrangel/code/qt5/client/SWGDABDemodReport.cpp

@ -94,7 +94,7 @@ SWGDABDemodReport::init() { @@ -94,7 +94,7 @@ SWGDABDemodReport::init() {
m_ensemble_name_isSet = false;
ensemble_id = 0;
m_ensemble_id_isSet = false;
programs = new QList<SWG#/DABProgram*>();
programs = new QList<SWGDABProgram*>();
m_programs_isSet = false;
selected_program = new QString("");
m_selected_program_isSet = false;
@ -193,7 +193,7 @@ SWGDABDemodReport::fromJsonObject(QJsonObject &pJson) { @@ -193,7 +193,7 @@ SWGDABDemodReport::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&ensemble_id, pJson["ensembleId"], "qint32", "");
::SWGSDRangel::setValue(&programs, pJson["programs"], "QList", "SWG#/DABProgram");
::SWGSDRangel::setValue(&programs, pJson["programs"], "QList", "SWGDABProgram");
::SWGSDRangel::setValue(&selected_program, pJson["selectedProgram"], "QString", "QString");
::SWGSDRangel::setValue(&audio_active, pJson["audioActive"], "qint32", "");
@ -259,7 +259,7 @@ SWGDABDemodReport::asJsonObject() { @@ -259,7 +259,7 @@ SWGDABDemodReport::asJsonObject() {
obj->insert("ensembleId", QJsonValue(ensemble_id));
}
if(programs && programs->size() > 0){
toJsonArray((QList<void*>*)programs, obj, "programs", "SWG#/DABProgram");
toJsonArray((QList<void*>*)programs, obj, "programs", "SWGDABProgram");
}
if(selected_program != nullptr && *selected_program != QString("")){
toJsonValue(QString("selectedProgram"), selected_program, obj, QString("QString"));
@ -381,12 +381,12 @@ SWGDABDemodReport::setEnsembleId(qint32 ensemble_id) { @@ -381,12 +381,12 @@ SWGDABDemodReport::setEnsembleId(qint32 ensemble_id) {
this->m_ensemble_id_isSet = true;
}
QList<SWG#/DABProgram*>*
QList<SWGDABProgram*>*
SWGDABDemodReport::getPrograms() {
return programs;
}
void
SWGDABDemodReport::setPrograms(QList<SWG#/DABProgram*>* programs) {
SWGDABDemodReport::setPrograms(QList<SWGDABProgram*>* programs) {
this->programs = programs;
this->m_programs_isSet = true;
}

8
swagger/sdrangel/code/qt5/client/SWGDABDemodReport.h

@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
#include <QJsonObject>
#include "SWG#/DABProgram.h"
#include "SWGDABProgram.h"
#include <QList>
#include <QString>
@ -68,8 +68,8 @@ public: @@ -68,8 +68,8 @@ public:
qint32 getEnsembleId();
void setEnsembleId(qint32 ensemble_id);
QList<SWG#/DABProgram*>* getPrograms();
void setPrograms(QList<SWG#/DABProgram*>* programs);
QList<SWGDABProgram*>* getPrograms();
void setPrograms(QList<SWGDABProgram*>* programs);
QString* getSelectedProgram();
void setSelectedProgram(QString* selected_program);
@ -135,7 +135,7 @@ private: @@ -135,7 +135,7 @@ private:
qint32 ensemble_id;
bool m_ensemble_id_isSet;
QList<SWG#/DABProgram*>* programs;
QList<SWGDABProgram*>* programs;
bool m_programs_isSet;
QString* selected_program;

40
swagger/sdrangel/code/qt5/client/SWGGLSpectrum.cpp

@ -76,9 +76,9 @@ SWGGLSpectrum::SWGGLSpectrum() { @@ -76,9 +76,9 @@ SWGGLSpectrum::SWGGLSpectrum() {
m_find_histogram_peaks_isSet = false;
show_controls = 0;
m_show_controls_isSet = false;
frequency_zoom_factor = nullptr;
frequency_zoom_factor = 0.0f;
m_frequency_zoom_factor_isSet = false;
frequency_zoom_pos = nullptr;
frequency_zoom_pos = 0.0f;
m_frequency_zoom_pos_isSet = false;
waterfall_time_units = 0;
m_waterfall_time_units_isSet = false;
@ -214,9 +214,9 @@ SWGGLSpectrum::init() { @@ -214,9 +214,9 @@ SWGGLSpectrum::init() {
m_find_histogram_peaks_isSet = false;
show_controls = 0;
m_show_controls_isSet = false;
frequency_zoom_factor = 0.0;
frequency_zoom_factor = 0.0f;
m_frequency_zoom_factor_isSet = false;
frequency_zoom_pos = 0.0;
frequency_zoom_pos = 0.0f;
m_frequency_zoom_pos_isSet = false;
waterfall_time_units = 0;
m_waterfall_time_units_isSet = false;
@ -326,12 +326,8 @@ SWGGLSpectrum::cleanup() { @@ -326,12 +326,8 @@ SWGGLSpectrum::cleanup() {
if(frequency_zoom_factor != nullptr) {
delete frequency_zoom_factor;
}
if(frequency_zoom_pos != nullptr) {
delete frequency_zoom_pos;
}
if(waterfall_time_format != nullptr) {
delete waterfall_time_format;
@ -466,9 +462,9 @@ SWGGLSpectrum::fromJsonObject(QJsonObject &pJson) { @@ -466,9 +462,9 @@ SWGGLSpectrum::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&show_controls, pJson["showControls"], "qint32", "");
::SWGSDRangel::setValue(&frequency_zoom_factor, pJson["frequencyZoomFactor"], "SWGNumber", "SWGNumber");
::SWGSDRangel::setValue(&frequency_zoom_factor, pJson["frequencyZoomFactor"], "float", "");
::SWGSDRangel::setValue(&frequency_zoom_pos, pJson["frequencyZoomPos"], "SWGNumber", "SWGNumber");
::SWGSDRangel::setValue(&frequency_zoom_pos, pJson["frequencyZoomPos"], "float", "");
::SWGSDRangel::setValue(&waterfall_time_units, pJson["waterfallTimeUnits"], "qint32", "");
@ -636,11 +632,11 @@ SWGGLSpectrum::asJsonObject() { @@ -636,11 +632,11 @@ SWGGLSpectrum::asJsonObject() {
if(m_show_controls_isSet){
obj->insert("showControls", QJsonValue(show_controls));
}
if((frequency_zoom_factor != nullptr) && (frequency_zoom_factor->isSet())){
toJsonValue(QString("frequencyZoomFactor"), frequency_zoom_factor, obj, QString("SWGNumber"));
if(m_frequency_zoom_factor_isSet){
obj->insert("frequencyZoomFactor", QJsonValue(frequency_zoom_factor));
}
if((frequency_zoom_pos != nullptr) && (frequency_zoom_pos->isSet())){
toJsonValue(QString("frequencyZoomPos"), frequency_zoom_pos, obj, QString("SWGNumber"));
if(m_frequency_zoom_pos_isSet){
obj->insert("frequencyZoomPos", QJsonValue(frequency_zoom_pos));
}
if(m_waterfall_time_units_isSet){
obj->insert("waterfallTimeUnits", QJsonValue(waterfall_time_units));
@ -1003,22 +999,22 @@ SWGGLSpectrum::setShowControls(qint32 show_controls) { @@ -1003,22 +999,22 @@ SWGGLSpectrum::setShowControls(qint32 show_controls) {
this->m_show_controls_isSet = true;
}
SWGNumber*
float
SWGGLSpectrum::getFrequencyZoomFactor() {
return frequency_zoom_factor;
}
void
SWGGLSpectrum::setFrequencyZoomFactor(SWGNumber* frequency_zoom_factor) {
SWGGLSpectrum::setFrequencyZoomFactor(float frequency_zoom_factor) {
this->frequency_zoom_factor = frequency_zoom_factor;
this->m_frequency_zoom_factor_isSet = true;
}
SWGNumber*
float
SWGGLSpectrum::getFrequencyZoomPos() {
return frequency_zoom_pos;
}
void
SWGGLSpectrum::setFrequencyZoomPos(SWGNumber* frequency_zoom_pos) {
SWGGLSpectrum::setFrequencyZoomPos(float frequency_zoom_pos) {
this->frequency_zoom_pos = frequency_zoom_pos;
this->m_frequency_zoom_pos_isSet = true;
}
@ -1490,10 +1486,10 @@ SWGGLSpectrum::isSet(){ @@ -1490,10 +1486,10 @@ SWGGLSpectrum::isSet(){
if(m_show_controls_isSet){
isObjectUpdated = true; break;
}
if(frequency_zoom_factor && frequency_zoom_factor->isSet()){
if(m_frequency_zoom_factor_isSet){
isObjectUpdated = true; break;
}
if(frequency_zoom_pos && frequency_zoom_pos->isSet()){
if(m_frequency_zoom_pos_isSet){
isObjectUpdated = true; break;
}
if(m_waterfall_time_units_isSet){

13
swagger/sdrangel/code/qt5/client/SWGGLSpectrum.h

@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@
#include <QJsonObject>
#include "SWGNumber.h"
#include "SWGSpectrumAnnotationMarker.h"
#include "SWGSpectrumCalibrationPoint.h"
#include "SWGSpectrumHistogramMarker.h"
@ -121,11 +120,11 @@ public: @@ -121,11 +120,11 @@ public:
qint32 getShowControls();
void setShowControls(qint32 show_controls);
SWGNumber* getFrequencyZoomFactor();
void setFrequencyZoomFactor(SWGNumber* frequency_zoom_factor);
float getFrequencyZoomFactor();
void setFrequencyZoomFactor(float frequency_zoom_factor);
SWGNumber* getFrequencyZoomPos();
void setFrequencyZoomPos(SWGNumber* frequency_zoom_pos);
float getFrequencyZoomPos();
void setFrequencyZoomPos(float frequency_zoom_pos);
qint32 getWaterfallTimeUnits();
void setWaterfallTimeUnits(qint32 waterfall_time_units);
@ -320,10 +319,10 @@ private: @@ -320,10 +319,10 @@ private:
qint32 show_controls;
bool m_show_controls_isSet;
SWGNumber* frequency_zoom_factor;
float frequency_zoom_factor;
bool m_frequency_zoom_factor_isSet;
SWGNumber* frequency_zoom_pos;
float frequency_zoom_pos;
bool m_frequency_zoom_pos_isSet;
qint32 waterfall_time_units;

20
swagger/sdrangel/code/qt5/client/SWGMapSettings.cpp

@ -52,7 +52,7 @@ SWGMapSettings::SWGMapSettings() { @@ -52,7 +52,7 @@ SWGMapSettings::SWGMapSettings() {
m_buildings_isSet = false;
sun_light_enabled = 0;
m_sun_light_enabled_isSet = false;
light_intensity = nullptr;
light_intensity = 0.0f;
m_light_intensity_isSet = false;
eci_camera = 0;
m_eci_camera_isSet = false;
@ -148,7 +148,7 @@ SWGMapSettings::init() { @@ -148,7 +148,7 @@ SWGMapSettings::init() {
m_buildings_isSet = false;
sun_light_enabled = 0;
m_sun_light_enabled_isSet = false;
light_intensity = 0.0;
light_intensity = 0.0f;
m_light_intensity_isSet = false;
eci_camera = 0;
m_eci_camera_isSet = false;
@ -240,9 +240,7 @@ SWGMapSettings::cleanup() { @@ -240,9 +240,7 @@ SWGMapSettings::cleanup() {
delete buildings;
}
if(light_intensity != nullptr) {
delete light_intensity;
}
@ -321,7 +319,7 @@ SWGMapSettings::fromJsonObject(QJsonObject &pJson) { @@ -321,7 +319,7 @@ SWGMapSettings::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&sun_light_enabled, pJson["sunLightEnabled"], "qint32", "");
::SWGSDRangel::setValue(&light_intensity, pJson["lightIntensity"], "SWGNumber", "SWGNumber");
::SWGSDRangel::setValue(&light_intensity, pJson["lightIntensity"], "float", "");
::SWGSDRangel::setValue(&eci_camera, pJson["eciCamera"], "qint32", "");
@ -437,8 +435,8 @@ SWGMapSettings::asJsonObject() { @@ -437,8 +435,8 @@ SWGMapSettings::asJsonObject() {
if(m_sun_light_enabled_isSet){
obj->insert("sunLightEnabled", QJsonValue(sun_light_enabled));
}
if((light_intensity != nullptr) && (light_intensity->isSet())){
toJsonValue(QString("lightIntensity"), light_intensity, obj, QString("SWGNumber"));
if(m_light_intensity_isSet){
obj->insert("lightIntensity", QJsonValue(light_intensity));
}
if(m_eci_camera_isSet){
obj->insert("eciCamera", QJsonValue(eci_camera));
@ -657,12 +655,12 @@ SWGMapSettings::setSunLightEnabled(qint32 sun_light_enabled) { @@ -657,12 +655,12 @@ SWGMapSettings::setSunLightEnabled(qint32 sun_light_enabled) {
this->m_sun_light_enabled_isSet = true;
}
SWGNumber*
float
SWGMapSettings::getLightIntensity() {
return light_intensity;
}
void
SWGMapSettings::setLightIntensity(SWGNumber* light_intensity) {
SWGMapSettings::setLightIntensity(float light_intensity) {
this->light_intensity = light_intensity;
this->m_light_intensity_isSet = true;
}
@ -1018,7 +1016,7 @@ SWGMapSettings::isSet(){ @@ -1018,7 +1016,7 @@ SWGMapSettings::isSet(){
if(m_sun_light_enabled_isSet){
isObjectUpdated = true; break;
}
if(light_intensity && light_intensity->isSet()){
if(m_light_intensity_isSet){
isObjectUpdated = true; break;
}
if(m_eci_camera_isSet){

7
swagger/sdrangel/code/qt5/client/SWGMapSettings.h

@ -22,7 +22,6 @@ @@ -22,7 +22,6 @@
#include <QJsonObject>
#include "SWGNumber.h"
#include "SWGRollupState.h"
#include <QString>
@ -80,8 +79,8 @@ public: @@ -80,8 +79,8 @@ public:
qint32 getSunLightEnabled();
void setSunLightEnabled(qint32 sun_light_enabled);
SWGNumber* getLightIntensity();
void setLightIntensity(SWGNumber* light_intensity);
float getLightIntensity();
void setLightIntensity(float light_intensity);
qint32 getEciCamera();
void setEciCamera(qint32 eci_camera);
@ -216,7 +215,7 @@ private: @@ -216,7 +215,7 @@ private:
qint32 sun_light_enabled;
bool m_sun_light_enabled_isSet;
SWGNumber* light_intensity;
float light_intensity;
bool m_light_intensity_isSet;
qint32 eci_camera;

Loading…
Cancel
Save