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

Jogdial Controller feature: Make settings assignments atomic. Part of #1329

Browse Source
This commit is contained in:
f4exb
2022-11-24 21:30:12 +01:00
parent 005cee925d
commit e50d9dc78a
6 changed files with 104 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/feature/jogdialcontroller/jogdialcontrollergui.cpp
+18 -2
View File
@@ -73,7 +73,13 @@ bool JogdialControllerGUI::handleMessage(const Message& message)
{
qDebug("JogdialControllerGUI::handleMessage: JogdialController::MsgConfigureJogdialController");
const JogdialController::MsgConfigureJogdialController& cfg = (JogdialController::MsgConfigureJogdialController&) message;
m_settings = cfg.getSettings();
if (cfg.getForce()) {
m_settings = cfg.getSettings();
} else {
m_settings.applySettings(cfg.getSettingsKeys(), cfg.getSettings());
}
blockApplySettings(true);
displaySettings();
blockApplySettings(false);
@@ -264,6 +270,14 @@ void JogdialControllerGUI::onMenuDialogCalled(const QPoint &p)
setTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor);
m_settingsKeys.append("title");
m_settingsKeys.append("rgbColor");
m_settingsKeys.append("useReverseAPI");
m_settingsKeys.append("reverseAPIAddress");
m_settingsKeys.append("reverseAPIPort");
m_settingsKeys.append("reverseAPIFeatureSetIndex");
m_settingsKeys.append("reverseAPIFeatureIndex");
applySettings();
}
@@ -344,9 +358,11 @@ void JogdialControllerGUI::applySettings(bool force)
{
if (m_doApplySettings)
{
JogdialController::MsgConfigureJogdialController* message = JogdialController::MsgConfigureJogdialController::create( m_settings, force);
JogdialController::MsgConfigureJogdialController* message = JogdialController::MsgConfigureJogdialController::create( m_settings, m_settingsKeys, force);
m_jogdialController->getInputMessageQueue()->push(message);
}
m_settingsKeys.clear();
}
void JogdialControllerGUI::focusInEvent(QFocusEvent*)