1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-07 00:14:49 -04:00

Map Updates

Fix 3D map for Qt < 5.15.
Add 3D map label scale setting.
Add 3D map time to Web report.
Reduce height of display settings dialog to fit on smaller screens.
This commit is contained in:
Jon Beniston
2022-02-09 16:41:40 +00:00
parent 73848c94e4
commit 29b2941951
18 changed files with 646 additions and 437 deletions
+3
View File
@@ -251,6 +251,7 @@ void MapSettings::MapItemSettings::resetToDefaults()
m_display3DTrack = true;
m_3DTrackColor = QColor(150, 0, 20).rgb();
m_3DModelMinPixelSize = 0;
m_3DLabelScale = 0.5f;
}
QByteArray MapSettings::MapItemSettings::serialize() const
@@ -271,6 +272,7 @@ QByteArray MapSettings::MapItemSettings::serialize() const
s.writeBool(12, m_display3DTrack);
s.writeU32(13, m_3DTrackColor);
s.writeS32(14, m_3DModelMinPixelSize);
s.writeFloat(15, m_3DLabelScale);
return s.final();
}
@@ -301,6 +303,7 @@ bool MapSettings::MapItemSettings::deserialize(const QByteArray& data)
d.readBool(12, &m_display3DTrack, true);
d.readU32(13, &m_3DTrackColor, QColor(150, 0, 20).rgb());
d.readS32(14, &m_3DModelMinPixelSize, 0);
d.readFloat(15, &m_3DLabelScale, 0.5f);
return true;
}
else