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

Make rollup state a serializable object so that it can be dumped in JSON format for the API. Prerequisite tp #1050

Browse Source
This commit is contained in:
f4exb
2022-01-09 05:27:12 +01:00
parent e2fc5aa87c
commit 98b305f320
599 changed files with 6183 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/feature/map/map.cpp
+18
View File
@@ -31,6 +31,7 @@
#include "device/deviceset.h"
#include "channel/channelapi.h"
#include "feature/featureset.h"
#include "settings/serializable.h"
#include "maincore.h"
#include "map.h"
@@ -260,6 +261,20 @@ void Map::webapiFormatFeatureSettings(
response.getMapSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getMapSettings()->setReverseApiFeatureSetIndex(settings.m_reverseAPIFeatureSetIndex);
response.getMapSettings()->setReverseApiFeatureIndex(settings.m_reverseAPIFeatureIndex);
if (settings.m_rollupState)
{
if (response.getMapSettings()->getRollupState())
{
settings.m_rollupState->formatTo(response.getMapSettings()->getRollupState());
}
else
{
SWGSDRangel::SWGRollupState *swgRollupState = new SWGSDRangel::SWGRollupState();
settings.m_rollupState->formatTo(swgRollupState);
response.getMapSettings()->setRollupState(swgRollupState);
}
}
}
void Map::webapiUpdateFeatureSettings(
@@ -291,6 +306,9 @@ void Map::webapiUpdateFeatureSettings(
if (featureSettingsKeys.contains("reverseAPIFeatureIndex")) {
settings.m_reverseAPIFeatureIndex = response.getMapSettings()->getReverseApiFeatureIndex();
}
if (settings.m_rollupState && featureSettingsKeys.contains("rollupState")) {
settings.m_rollupState->updateFrom(featureSettingsKeys, response.getMapSettings()->getRollupState());
}
}
void Map::webapiReverseSendSettings(QList<QString>& featureSettingsKeys, const MapSettings& settings, bool force)