VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-28 13:04:17 -04:00
Code Issues Projects Releases Wiki Activity

PER Tester feature: Make settings assignments atomic. Part of #1329

Browse Source
This commit is contained in:
f4exb
2022-11-26 12:35:05 +01:00
parent d5d2ae1ebd
commit ba1dfa97f3
8 changed files with 214 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/feature/pertester/pertesterworker.cpp
+16 -8
View File
@@ -107,7 +107,7 @@ bool PERTesterWorker::handleMessage(const Message& cmd)
QMutexLocker mutexLocker(&m_mutex);
MsgConfigurePERTesterWorker& cfg = (MsgConfigurePERTesterWorker&) cmd;
applySettings(cfg.getSettings(), cfg.getForce());
applySettings(cfg.getSettings(), cfg.getSettingsKeys(), cfg.getForce());
return true;
}
else if (PERTester::MsgResetStats::match(cmd))
@@ -121,22 +121,30 @@ bool PERTesterWorker::handleMessage(const Message& cmd)
}
}
void PERTesterWorker::applySettings(const PERTesterSettings& settings, bool force)
void PERTesterWorker::applySettings(const PERTesterSettings& settings, const QList<QString>& settingsKeys, bool force)
{
qDebug() << "PERTesterWorker::applySettings:"
qDebug() << "PERTesterWorker::applySettings:" << settings.getDebugString(settingsKeys, force)
<< " force: " << force;
if ( (settings.m_rxUDPAddress != m_settings.m_rxUDPAddress)
|| (settings.m_rxUDPPort != m_settings.m_rxUDPPort)
|| force)
// if ( (settings.m_rxUDPAddress != m_settings.m_rxUDPAddress)
// || (settings.m_rxUDPPort != m_settings.m_rxUDPPort)
// || force)
if (settingsKeys.contains("rxUDPAddress")
|| settingsKeys.contains("rxUDPPort")
|| force)
{
openUDP(settings);
}
if ((settings.m_interval != m_settings.m_interval) || force)
if (settingsKeys.contains("interval") || force) {
m_txTimer.setInterval(settings.m_interval * 1000.0);
}
m_settings = settings;
if (force) {
m_settings = settings;
} else {
m_settings.applySettings(settingsKeys, settings);
}
}
void PERTesterWorker::openUDP(const PERTesterSettings& settings)