VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-04 06:54:39 -04:00
Code Issues Projects Releases Wiki Activity

Map updates:

Browse Source 
Add left double click to add marker to 3D map.
Add support for alititudeReference for polygon and polyline.
Add support for plugins to set color of polygons.
This commit is contained in:
Jon Beniston
2023-03-21 11:07:25 +00:00
parent d4b72343fd
commit 50035d40c8
26 changed files with 6090 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/feature/map/czml.cpp
+35 -5
View File
@@ -23,6 +23,8 @@
#include "util/coordinates.h"
const QStringList CZML::m_heightReferences = {"NONE", "CLAMP_TO_GROUND", "RELATIVE_TO_GROUND", "CLIP_TO_GROUND"};
CZML::CZML(const MapSettings *settings) :
m_settings(settings)
{
@@ -82,6 +84,9 @@ QJsonObject CZML::update(PolygonMapItem *mapItem)
return obj;
}
// Need to use perPositionHeight for vertical polygons
bool perPosition = mapItem->m_extrudedHeight == 0;
QJsonArray positions;
for (const auto c : mapItem->m_points)
{
@@ -94,7 +99,12 @@ QJsonObject CZML::update(PolygonMapItem *mapItem)
{"cartographicDegrees", positions},
};
QColor color = QColor::fromRgba(mapItem->m_itemSettings->m_3DTrackColor);
QColor color;
if (mapItem->m_colorValid) {
color = QColor::fromRgba(mapItem->m_color);
} else {
color = QColor::fromRgba(mapItem->m_itemSettings->m_3DTrackColor);
}
QJsonArray colorRGBA {
color.red(), color.green(), color.blue(), color.alpha()
};
@@ -119,12 +129,23 @@ QJsonObject CZML::update(PolygonMapItem *mapItem)
QJsonObject polygon {
{"positions", positionList},
{"height", mapItem->m_altitude},
{"extrudedHeight", mapItem->m_extrudedHeight},
{"material", material},
{"outline", true},
{"outlineColor", outlineColor}
{"outlineColor", outlineColor},
};
if (perPosition)
{
polygon.insert("perPositionHeight", true);
if (mapItem->m_altitudeReference != 0) {
polygon.insert("altitudeReference", m_heightReferences[mapItem->m_altitudeReference]); // Custom code in map3d.html
}
}
else
{
polygon.insert("height", mapItem->m_altitude);
polygon.insert("heightReference", m_heightReferences[mapItem->m_altitudeReference]);
polygon.insert("extrudedHeight", mapItem->m_extrudedHeight);
}
obj.insert("polygon", polygon);
obj.insert("description", mapItem->m_label);
@@ -163,7 +184,12 @@ QJsonObject CZML::update(PolylineMapItem *mapItem)
{"cartographicDegrees", positions},
};
QColor color = QColor::fromRgba(mapItem->m_itemSettings->m_3DTrackColor);
QColor color;
if (mapItem->m_colorValid) {
color = QColor::fromRgba(mapItem->m_color);
} else {
color = QColor::fromRgba(mapItem->m_itemSettings->m_3DTrackColor);
}
QJsonArray colorRGBA {
color.red(), color.green(), color.blue(), color.alpha()
};
@@ -183,6 +209,10 @@ QJsonObject CZML::update(PolylineMapItem *mapItem)
{"positions", positionList},
{"material", material}
};
polyline.insert("clampToGround", mapItem->m_altitudeReference == 1);
if (mapItem->m_altitudeReference == 3) {
polyline.insert("altitudeReference", m_heightReferences[mapItem->m_altitudeReference]); // Custom code in map3d.html
}
obj.insert("polyline", polyline);
obj.insert("description", mapItem->m_label);