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

REST API: config: PUT (6): mapper work and rework

This commit is contained in:
f4exb
2019-08-10 05:16:25 +02:00
parent c777ec881d
commit af6218611a
5 changed files with 148 additions and 30 deletions
+5 -5
View File
@@ -160,9 +160,9 @@ int WebAPIAdapterGUI::instanceConfigPutPatch(
{
WebAPIAdapterBase webAPIAdapterBase;
webAPIAdapterBase.setPluginManager(m_mainWindow.getPluginManager());
qDebug("WebAPIAdapterGUI::instanceConfigPutPatch: configKeys:");
configKeys.debug();
return 200;
// qDebug("WebAPIAdapterGUI::instanceConfigPutPatch: configKeys:");
// configKeys.debug();
// return 200;
if (force) {
webAPIAdapterBase.webapiInitConfig(m_mainWindow.m_settings);
@@ -173,7 +173,7 @@ int WebAPIAdapterGUI::instanceConfigPutPatch(
m_mainWindow.m_settings.setPreferences(newPreferences);
Preset *workingPreset = m_mainWindow.m_settings.getWorkingPreset();
webAPIAdapterBase.webapiUpdatePreset(query.getWorkingPreset(), configKeys.m_workingPresetKeys, *workingPreset);
webAPIAdapterBase.webapiUpdatePreset(force, query.getWorkingPreset(), configKeys.m_workingPresetKeys, *workingPreset);
QList<PresetKeys>::const_iterator presetKeysIt = configKeys.m_presetKeys.begin();
int i = 0;
@@ -181,7 +181,7 @@ int WebAPIAdapterGUI::instanceConfigPutPatch(
{
Preset *newPreset = new Preset(); // created with default values
SWGSDRangel::SWGPreset *swgPreset = query.getPresets()->at(i);
webAPIAdapterBase.webapiUpdatePreset(swgPreset, *presetKeysIt, *newPreset);
webAPIAdapterBase.webapiUpdatePreset(force, swgPreset, *presetKeysIt, *newPreset);
m_mainWindow.m_settings.addPreset(newPreset);
}