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

Save column sort as a setting. Fix deserialize of target satellite. For #1474

Browse Source
This commit is contained in:
Jon Beniston
2022-10-28 14:40:34 +01:00
parent c7eaacc098
commit ac2102cd6f
4 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/feature/satellitetracker/satellitetrackersettings.cpp
+6 -1
View File
@@ -79,7 +79,8 @@ void SatelliteTrackerSettings::resetToDefaults()
m_mapFeature = "";
m_fileInputDevice = "";
m_workspaceIndex = 0;
m_columnSort = -1;
m_columnSortOrder = Qt::AscendingOrder;
for (int i = 0; i < SAT_COL_COLUMNS; i++)
{
m_columnIndexes[i] = i;
@@ -138,6 +139,8 @@ QByteArray SatelliteTrackerSettings::serialize() const
s.writeString(44, m_fileInputDevice);
s.writeS32(45, m_workspaceIndex);
s.writeBlob(46, m_geometryBytes);
s.writeS32(47, m_columnSort);
s.writeS32(48, (int)m_columnSortOrder);
for (int i = 0; i < SAT_COL_COLUMNS; i++) {
s.writeS32(100 + i, m_columnIndexes[i]);
@@ -231,6 +234,8 @@ bool SatelliteTrackerSettings::deserialize(const QByteArray& data)
d.readString(44, &m_fileInputDevice, "");
d.readS32(45, &m_workspaceIndex, 0);
d.readBlob(46, &m_geometryBytes);
d.readS32(47, &m_columnSort, -1);
d.readS32(48, (int *)&m_columnSortOrder, (int)Qt::AscendingOrder);
for (int i = 0; i < SAT_COL_COLUMNS; i++) {
d.readS32(100 + i, &m_columnIndexes[i], i);