diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 3cedbfd4c..d13a80921 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -14727,6 +14727,31 @@ margin-bottom: 20px; "type" : "integer", "description" : "Whether to track the specified source plugin" }, + "latitude" : { + "type" : "number", + "format" : "float", + "description" : "Latitude in decimal degrees (North positive) of observation/antenna location" + }, + "longitude" : { + "type" : "number", + "format" : "float", + "description" : "Longitude in decimal degrees (East positive) of observation/antenna location" + }, + "altitude" : { + "type" : "number", + "format" : "float", + "description" : "Altitude in metres of observation/antenna location" + }, + "hpbw" : { + "type" : "number", + "format" : "float", + "description" : "Antenna half-power beam width in degrees" + }, + "useMyPosition" : { + "type" : "number", + "format" : "float", + "description" : "Use My Position instead of latitude/longitude settings" + }, "title" : { "type" : "string" }, @@ -58643,7 +58668,7 @@ except ApiException as e:
- Generated 2024-02-08T12:36:55.592+01:00 + Generated 2024-02-12T10:33:45.606+01:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/SkyMap.yaml b/sdrbase/resources/webapi/doc/swagger/include/SkyMap.yaml index 5ffdf9b90..1ef724a9f 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SkyMap.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SkyMap.yaml @@ -30,6 +30,26 @@ SkyMapSettings: track: description: "Whether to track the specified source plugin" type: integer + latitude: + description: "Latitude in decimal degrees (North positive) of observation/antenna location" + type: number + format: float + longitude: + description: "Longitude in decimal degrees (East positive) of observation/antenna location" + type: number + format: float + altitude: + description: "Altitude in metres of observation/antenna location" + type: number + format: float + hpbw: + description: "Antenna half-power beam width in degrees" + type: number + format: float + useMyPosition: + description: "Use My Position instead of latitude/longitude settings" + type: number + format: float title: type: string rgbColor: diff --git a/swagger/sdrangel/api/swagger/include/SkyMap.yaml b/swagger/sdrangel/api/swagger/include/SkyMap.yaml index 251e290ce..5fc620230 100644 --- a/swagger/sdrangel/api/swagger/include/SkyMap.yaml +++ b/swagger/sdrangel/api/swagger/include/SkyMap.yaml @@ -30,6 +30,26 @@ SkyMapSettings: track: description: "Whether to track the specified source plugin" type: integer + latitude: + description: "Latitude in decimal degrees (North positive) of observation/antenna location" + type: number + format: float + longitude: + description: "Longitude in decimal degrees (East positive) of observation/antenna location" + type: number + format: float + altitude: + description: "Altitude in metres of observation/antenna location" + type: number + format: float + hpbw: + description: "Antenna half-power beam width in degrees" + type: number + format: float + useMyPosition: + description: "Use My Position instead of latitude/longitude settings" + type: number + format: float title: type: string rgbColor: diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 3cedbfd4c..d13a80921 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -14727,6 +14727,31 @@ margin-bottom: 20px; "type" : "integer", "description" : "Whether to track the specified source plugin" }, + "latitude" : { + "type" : "number", + "format" : "float", + "description" : "Latitude in decimal degrees (North positive) of observation/antenna location" + }, + "longitude" : { + "type" : "number", + "format" : "float", + "description" : "Longitude in decimal degrees (East positive) of observation/antenna location" + }, + "altitude" : { + "type" : "number", + "format" : "float", + "description" : "Altitude in metres of observation/antenna location" + }, + "hpbw" : { + "type" : "number", + "format" : "float", + "description" : "Antenna half-power beam width in degrees" + }, + "useMyPosition" : { + "type" : "number", + "format" : "float", + "description" : "Use My Position instead of latitude/longitude settings" + }, "title" : { "type" : "string" }, @@ -58643,7 +58668,7 @@ except ApiException as e:
- Generated 2024-02-08T12:36:55.592+01:00 + Generated 2024-02-12T10:33:45.606+01:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGSkyMapSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSkyMapSettings.cpp index 608da3cc3..3ecac528b 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSkyMapSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGSkyMapSettings.cpp @@ -48,6 +48,16 @@ SWGSkyMapSettings::SWGSkyMapSettings() { m_source_isSet = false; track = 0; m_track_isSet = false; + latitude = 0.0f; + m_latitude_isSet = false; + longitude = 0.0f; + m_longitude_isSet = false; + altitude = 0.0f; + m_altitude_isSet = false; + hpbw = 0.0f; + m_hpbw_isSet = false; + use_my_position = 0.0f; + m_use_my_position_isSet = false; title = nullptr; m_title_isSet = false; rgb_color = 0; @@ -92,6 +102,16 @@ SWGSkyMapSettings::init() { m_source_isSet = false; track = 0; m_track_isSet = false; + latitude = 0.0f; + m_latitude_isSet = false; + longitude = 0.0f; + m_longitude_isSet = false; + altitude = 0.0f; + m_altitude_isSet = false; + hpbw = 0.0f; + m_hpbw_isSet = false; + use_my_position = 0.0f; + m_use_my_position_isSet = false; title = new QString(""); m_title_isSet = false; rgb_color = 0; @@ -130,6 +150,11 @@ SWGSkyMapSettings::cleanup() { delete source; } + + + + + if(title != nullptr) { delete title; } @@ -177,6 +202,16 @@ SWGSkyMapSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&track, pJson["track"], "qint32", ""); + ::SWGSDRangel::setValue(&latitude, pJson["latitude"], "float", ""); + + ::SWGSDRangel::setValue(&longitude, pJson["longitude"], "float", ""); + + ::SWGSDRangel::setValue(&altitude, pJson["altitude"], "float", ""); + + ::SWGSDRangel::setValue(&hpbw, pJson["hpbw"], "float", ""); + + ::SWGSDRangel::setValue(&use_my_position, pJson["useMyPosition"], "float", ""); + ::SWGSDRangel::setValue(&title, pJson["title"], "QString", "QString"); ::SWGSDRangel::setValue(&rgb_color, pJson["rgbColor"], "qint32", ""); @@ -239,6 +274,21 @@ SWGSkyMapSettings::asJsonObject() { if(m_track_isSet){ obj->insert("track", QJsonValue(track)); } + if(m_latitude_isSet){ + obj->insert("latitude", QJsonValue(latitude)); + } + if(m_longitude_isSet){ + obj->insert("longitude", QJsonValue(longitude)); + } + if(m_altitude_isSet){ + obj->insert("altitude", QJsonValue(altitude)); + } + if(m_hpbw_isSet){ + obj->insert("hpbw", QJsonValue(hpbw)); + } + if(m_use_my_position_isSet){ + obj->insert("useMyPosition", QJsonValue(use_my_position)); + } if(title != nullptr && *title != QString("")){ toJsonValue(QString("title"), title, obj, QString("QString")); } @@ -367,6 +417,56 @@ SWGSkyMapSettings::setTrack(qint32 track) { this->m_track_isSet = true; } +float +SWGSkyMapSettings::getLatitude() { + return latitude; +} +void +SWGSkyMapSettings::setLatitude(float latitude) { + this->latitude = latitude; + this->m_latitude_isSet = true; +} + +float +SWGSkyMapSettings::getLongitude() { + return longitude; +} +void +SWGSkyMapSettings::setLongitude(float longitude) { + this->longitude = longitude; + this->m_longitude_isSet = true; +} + +float +SWGSkyMapSettings::getAltitude() { + return altitude; +} +void +SWGSkyMapSettings::setAltitude(float altitude) { + this->altitude = altitude; + this->m_altitude_isSet = true; +} + +float +SWGSkyMapSettings::getHpbw() { + return hpbw; +} +void +SWGSkyMapSettings::setHpbw(float hpbw) { + this->hpbw = hpbw; + this->m_hpbw_isSet = true; +} + +float +SWGSkyMapSettings::getUseMyPosition() { + return use_my_position; +} +void +SWGSkyMapSettings::setUseMyPosition(float use_my_position) { + this->use_my_position = use_my_position; + this->m_use_my_position_isSet = true; +} + QString* SWGSkyMapSettings::getTitle() { return title; @@ -482,6 +582,21 @@ SWGSkyMapSettings::isSet(){ if(m_track_isSet){ isObjectUpdated = true; break; } + if(m_latitude_isSet){ + isObjectUpdated = true; break; + } + if(m_longitude_isSet){ + isObjectUpdated = true; break; + } + if(m_altitude_isSet){ + isObjectUpdated = true; break; + } + if(m_hpbw_isSet){ + isObjectUpdated = true; break; + } + if(m_use_my_position_isSet){ + isObjectUpdated = true; break; + } if(title && *title != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSkyMapSettings.h b/swagger/sdrangel/code/qt5/client/SWGSkyMapSettings.h index 3fa1c35ed..325068ea2 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSkyMapSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGSkyMapSettings.h @@ -73,6 +73,21 @@ public: qint32 getTrack(); void setTrack(qint32 track); + float getLatitude(); + void setLatitude(float latitude); + + float getLongitude(); + void setLongitude(float longitude); + + float getAltitude(); + void setAltitude(float altitude); + + float getHpbw(); + void setHpbw(float hpbw); + + float getUseMyPosition(); + void setUseMyPosition(float use_my_position); + QString* getTitle(); void setTitle(QString* title); @@ -131,6 +146,21 @@ private: qint32 track; bool m_track_isSet; + float latitude; + bool m_latitude_isSet; + + float longitude; + bool m_longitude_isSet; + + float altitude; + bool m_altitude_isSet; + + float hpbw; + bool m_hpbw_isSet; + + float use_my_position; + bool m_use_my_position_isSet; + QString* title; bool m_title_isSet;