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

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

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
@@ -30,6 +30,7 @@
#include "dsp/dspengine.h"
#include "util/weather.h"
#include "util/units.h"
#include "settings/serializable.h"
#include "maincore.h"
#include "startrackerreport.h"
@@ -485,6 +486,20 @@ void StarTracker::webapiFormatFeatureSettings(
response.getStarTrackerSettings()->setB(settings.m_b);
response.getStarTrackerSettings()->setAzimuthOffset(settings.m_azOffset);
response.getStarTrackerSettings()->setElevationOffset(settings.m_elOffset);
if (settings.m_rollupState)
{
if (response.getStarTrackerSettings()->getRollupState())
{
settings.m_rollupState->formatTo(response.getStarTrackerSettings()->getRollupState());
}
else
{
SWGSDRangel::SWGRollupState *swgRollupState = new SWGSDRangel::SWGRollupState();
settings.m_rollupState->formatTo(swgRollupState);
response.getStarTrackerSettings()->setRollupState(swgRollupState);
}
}
}
void StarTracker::webapiUpdateFeatureSettings(
@@ -579,6 +594,9 @@ void StarTracker::webapiUpdateFeatureSettings(
if (featureSettingsKeys.contains("elevationOffset")) {
settings.m_elOffset = response.getStarTrackerSettings()->getElevationOffset();
}
if (settings.m_rollupState && featureSettingsKeys.contains("rollupState")) {
settings.m_rollupState->updateFrom(featureSettingsKeys, response.getStarTrackerSettings()->getRollupState());
}
}
void StarTracker::webapiReverseSendSettings(QList<QString>& featureSettingsKeys, const StarTrackerSettings& settings, bool force)