From 4627be2e50a588af05bff764ed817f3d5562cebd Mon Sep 17 00:00:00 2001 From: srcejon Date: Tue, 4 Feb 2025 13:51:52 +0000 Subject: [PATCH] Add labelDateTime to MapItem --- sdrbase/resources/webapi/doc/html2/index.html | 10 +++++++- .../webapi/doc/swagger/include/Map.yaml | 3 +++ swagger/sdrangel/api/swagger/include/Map.yaml | 3 +++ swagger/sdrangel/code/html2/index.html | 10 +++++++- .../sdrangel/code/qt5/client/SWGMapItem.cpp | 25 +++++++++++++++++++ swagger/sdrangel/code/qt5/client/SWGMapItem.h | 6 +++++ .../sdrangel/code/qt5/client/SWGMapItem_2.cpp | 25 +++++++++++++++++++ .../sdrangel/code/qt5/client/SWGMapItem_2.h | 6 +++++ 8 files changed, 86 insertions(+), 2 deletions(-) diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 84939fe23..3df10f6cf 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -10231,6 +10231,10 @@ margin-bottom: 20px; "format" : "float", "description" : "Vertical offset to position label at" }, + "labelDateTime" : { + "type" : "string", + "description" : "Date and time from when this label applies (ISO 8601 extended format). Leave empty if label should apply for all time." + }, "modelAltitudeOffset" : { "type" : "number", "format" : "float", @@ -10398,6 +10402,10 @@ margin-bottom: 20px; "format" : "float", "description" : "Vertical offset to position label at" }, + "labelDateTime" : { + "type" : "string", + "description" : "Date and time from when this label applies (ISO 8601 extended format). Leave empty if label should apply for all time." + }, "modelAltitudeOffset" : { "type" : "number", "format" : "float", @@ -59582,7 +59590,7 @@ except ApiException as e:
- Generated 2025-01-05T21:46:55.221+01:00 + Generated 2025-02-04T14:51:14.949+01:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/Map.yaml b/sdrbase/resources/webapi/doc/swagger/include/Map.yaml index 4bba4ff1d..0cded2bc8 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/Map.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/Map.yaml @@ -116,6 +116,9 @@ MapItem: description: "Vertical offset to position label at" type: number format: float + labelDateTime: + description: "Date and time from when this label applies (ISO 8601 extended format). Leave empty if label should apply for all time." + type: string modelAltitudeOffset: description: "Vertical offset to adjust model by to prevent it from going underground when altitude is 0" type: number diff --git a/swagger/sdrangel/api/swagger/include/Map.yaml b/swagger/sdrangel/api/swagger/include/Map.yaml index 9896bd179..9e50e4ed2 100644 --- a/swagger/sdrangel/api/swagger/include/Map.yaml +++ b/swagger/sdrangel/api/swagger/include/Map.yaml @@ -116,6 +116,9 @@ MapItem: description: "Vertical offset to position label at" type: number format: float + labelDateTime: + description: "Date and time from when this label applies (ISO 8601 extended format). Leave empty if label should apply for all time." + type: string modelAltitudeOffset: description: "Vertical offset to adjust model by to prevent it from going underground when altitude is 0" type: number diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 84939fe23..3df10f6cf 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -10231,6 +10231,10 @@ margin-bottom: 20px; "format" : "float", "description" : "Vertical offset to position label at" }, + "labelDateTime" : { + "type" : "string", + "description" : "Date and time from when this label applies (ISO 8601 extended format). Leave empty if label should apply for all time." + }, "modelAltitudeOffset" : { "type" : "number", "format" : "float", @@ -10398,6 +10402,10 @@ margin-bottom: 20px; "format" : "float", "description" : "Vertical offset to position label at" }, + "labelDateTime" : { + "type" : "string", + "description" : "Date and time from when this label applies (ISO 8601 extended format). Leave empty if label should apply for all time." + }, "modelAltitudeOffset" : { "type" : "number", "format" : "float", @@ -59582,7 +59590,7 @@ except ApiException as e:
- Generated 2025-01-05T21:46:55.221+01:00 + Generated 2025-02-04T14:51:14.949+01:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGMapItem.cpp b/swagger/sdrangel/code/qt5/client/SWGMapItem.cpp index eed7b99da..1ad899e03 100644 --- a/swagger/sdrangel/code/qt5/client/SWGMapItem.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGMapItem.cpp @@ -66,6 +66,8 @@ SWGMapItem::SWGMapItem() { m_label_isSet = false; label_altitude_offset = 0.0f; m_label_altitude_offset_isSet = false; + label_date_time = nullptr; + m_label_date_time_isSet = false; model_altitude_offset = 0.0f; m_model_altitude_offset_isSet = false; altitude_reference = 0; @@ -144,6 +146,8 @@ SWGMapItem::init() { m_label_isSet = false; label_altitude_offset = 0.0f; m_label_altitude_offset_isSet = false; + label_date_time = new QString(""); + m_label_date_time_isSet = false; model_altitude_offset = 0.0f; m_model_altitude_offset_isSet = false; altitude_reference = 0; @@ -225,6 +229,9 @@ SWGMapItem::cleanup() { delete label; } + if(label_date_time != nullptr) { + delete label_date_time; + } if(animations != nullptr) { @@ -310,6 +317,8 @@ SWGMapItem::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&label_altitude_offset, pJson["labelAltitudeOffset"], "float", ""); + ::SWGSDRangel::setValue(&label_date_time, pJson["labelDateTime"], "QString", "QString"); + ::SWGSDRangel::setValue(&model_altitude_offset, pJson["modelAltitudeOffset"], "float", ""); ::SWGSDRangel::setValue(&altitude_reference, pJson["altitudeReference"], "qint32", ""); @@ -415,6 +424,9 @@ SWGMapItem::asJsonObject() { if(m_label_altitude_offset_isSet){ obj->insert("labelAltitudeOffset", QJsonValue(label_altitude_offset)); } + if(label_date_time != nullptr && *label_date_time != QString("")){ + toJsonValue(QString("labelDateTime"), label_date_time, obj, QString("QString")); + } if(m_model_altitude_offset_isSet){ obj->insert("modelAltitudeOffset", QJsonValue(model_altitude_offset)); } @@ -657,6 +669,16 @@ SWGMapItem::setLabelAltitudeOffset(float label_altitude_offset) { this->m_label_altitude_offset_isSet = true; } +QString* +SWGMapItem::getLabelDateTime() { + return label_date_time; +} +void +SWGMapItem::setLabelDateTime(QString* label_date_time) { + this->label_date_time = label_date_time; + this->m_label_date_time_isSet = true; +} + float SWGMapItem::getModelAltitudeOffset() { return model_altitude_offset; @@ -879,6 +901,9 @@ SWGMapItem::isSet(){ if(m_label_altitude_offset_isSet){ isObjectUpdated = true; break; } + if(label_date_time && *label_date_time != QString("")){ + isObjectUpdated = true; break; + } if(m_model_altitude_offset_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGMapItem.h b/swagger/sdrangel/code/qt5/client/SWGMapItem.h index c4168c1f4..ae4402424 100644 --- a/swagger/sdrangel/code/qt5/client/SWGMapItem.h +++ b/swagger/sdrangel/code/qt5/client/SWGMapItem.h @@ -103,6 +103,9 @@ public: float getLabelAltitudeOffset(); void setLabelAltitudeOffset(float label_altitude_offset); + QString* getLabelDateTime(); + void setLabelDateTime(QString* label_date_time); + float getModelAltitudeOffset(); void setModelAltitudeOffset(float model_altitude_offset); @@ -212,6 +215,9 @@ private: float label_altitude_offset; bool m_label_altitude_offset_isSet; + QString* label_date_time; + bool m_label_date_time_isSet; + float model_altitude_offset; bool m_model_altitude_offset_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGMapItem_2.cpp b/swagger/sdrangel/code/qt5/client/SWGMapItem_2.cpp index 9ca68eb19..be758a8dc 100644 --- a/swagger/sdrangel/code/qt5/client/SWGMapItem_2.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGMapItem_2.cpp @@ -66,6 +66,8 @@ SWGMapItem_2::SWGMapItem_2() { m_label_isSet = false; label_altitude_offset = 0.0f; m_label_altitude_offset_isSet = false; + label_date_time = nullptr; + m_label_date_time_isSet = false; model_altitude_offset = 0.0f; m_model_altitude_offset_isSet = false; altitude_reference = 0; @@ -144,6 +146,8 @@ SWGMapItem_2::init() { m_label_isSet = false; label_altitude_offset = 0.0f; m_label_altitude_offset_isSet = false; + label_date_time = new QString(""); + m_label_date_time_isSet = false; model_altitude_offset = 0.0f; m_model_altitude_offset_isSet = false; altitude_reference = 0; @@ -225,6 +229,9 @@ SWGMapItem_2::cleanup() { delete label; } + if(label_date_time != nullptr) { + delete label_date_time; + } if(animations != nullptr) { @@ -310,6 +317,8 @@ SWGMapItem_2::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&label_altitude_offset, pJson["labelAltitudeOffset"], "float", ""); + ::SWGSDRangel::setValue(&label_date_time, pJson["labelDateTime"], "QString", "QString"); + ::SWGSDRangel::setValue(&model_altitude_offset, pJson["modelAltitudeOffset"], "float", ""); ::SWGSDRangel::setValue(&altitude_reference, pJson["altitudeReference"], "qint32", ""); @@ -415,6 +424,9 @@ SWGMapItem_2::asJsonObject() { if(m_label_altitude_offset_isSet){ obj->insert("labelAltitudeOffset", QJsonValue(label_altitude_offset)); } + if(label_date_time != nullptr && *label_date_time != QString("")){ + toJsonValue(QString("labelDateTime"), label_date_time, obj, QString("QString")); + } if(m_model_altitude_offset_isSet){ obj->insert("modelAltitudeOffset", QJsonValue(model_altitude_offset)); } @@ -657,6 +669,16 @@ SWGMapItem_2::setLabelAltitudeOffset(float label_altitude_offset) { this->m_label_altitude_offset_isSet = true; } +QString* +SWGMapItem_2::getLabelDateTime() { + return label_date_time; +} +void +SWGMapItem_2::setLabelDateTime(QString* label_date_time) { + this->label_date_time = label_date_time; + this->m_label_date_time_isSet = true; +} + float SWGMapItem_2::getModelAltitudeOffset() { return model_altitude_offset; @@ -879,6 +901,9 @@ SWGMapItem_2::isSet(){ if(m_label_altitude_offset_isSet){ isObjectUpdated = true; break; } + if(label_date_time && *label_date_time != QString("")){ + isObjectUpdated = true; break; + } if(m_model_altitude_offset_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGMapItem_2.h b/swagger/sdrangel/code/qt5/client/SWGMapItem_2.h index 5e445dbdc..ee7406e95 100644 --- a/swagger/sdrangel/code/qt5/client/SWGMapItem_2.h +++ b/swagger/sdrangel/code/qt5/client/SWGMapItem_2.h @@ -103,6 +103,9 @@ public: float getLabelAltitudeOffset(); void setLabelAltitudeOffset(float label_altitude_offset); + QString* getLabelDateTime(); + void setLabelDateTime(QString* label_date_time); + float getModelAltitudeOffset(); void setModelAltitudeOffset(float model_altitude_offset); @@ -212,6 +215,9 @@ private: float label_altitude_offset; bool m_label_altitude_offset_isSet; + QString* label_date_time; + bool m_label_date_time_isSet; + float model_altitude_offset; bool m_model_altitude_offset_isSet;