From 1fdeaa62c377bf8bf27a53b0601a9bb0c16a5885 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 19 Aug 2015 02:18:15 +0200 Subject: [PATCH] Deep redesign: Init sequence review phase #4: Fixing channel GUI init --- plugins/channel/am/amdemodgui.cpp | 3 ++- plugins/channel/chanalyzer/chanalyzergui.cpp | 3 ++- plugins/channel/lora/lorademodgui.cpp | 3 ++- plugins/channel/nfm/nfmdemodgui.cpp | 3 ++- plugins/channel/ssb/ssbdemodgui.cpp | 3 ++- plugins/channel/tcpsrc/tcpsrcgui.cpp | 3 ++- plugins/channel/wfm/wfmdemodgui.cpp | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/plugins/channel/am/amdemodgui.cpp b/plugins/channel/am/amdemodgui.cpp index 126c2a17a..8d9adc509 100644 --- a/plugins/channel/am/amdemodgui.cpp +++ b/plugins/channel/am/amdemodgui.cpp @@ -85,6 +85,7 @@ bool AMDemodGUI::deserialize(const QByteArray& data) qint32 tmp; blockApplySettings(true); + m_channelMarker->blockSignals(true); d.readS32(1, &tmp, 0); m_channelMarker->setCenterFrequency(tmp); @@ -103,6 +104,7 @@ bool AMDemodGUI::deserialize(const QByteArray& data) } blockApplySettings(false); + m_channelMarker->blockSignals(false); applySettings(); return true; @@ -230,7 +232,6 @@ AMDemodGUI::~AMDemodGUI() void AMDemodGUI::blockApplySettings(bool block) { - m_channelMarker->blockSignals(block); m_doApplySettings = !block; } diff --git a/plugins/channel/chanalyzer/chanalyzergui.cpp b/plugins/channel/chanalyzer/chanalyzergui.cpp index f61d2faf0..eddc5ec54 100644 --- a/plugins/channel/chanalyzer/chanalyzergui.cpp +++ b/plugins/channel/chanalyzer/chanalyzergui.cpp @@ -86,6 +86,7 @@ bool ChannelAnalyzerGUI::deserialize(const QByteArray& data) bool tmpBool; blockApplySettings(true); + m_channelMarker->blockSignals(true); d.readS32(1, &tmp, 0); m_channelMarker->setCenterFrequency(tmp); @@ -106,6 +107,7 @@ bool ChannelAnalyzerGUI::deserialize(const QByteArray& data) ui->scopeGUI->deserialize(bytetmp); blockApplySettings(false); + m_channelMarker->blockSignals(false); applySettings(); return true; @@ -388,7 +390,6 @@ void ChannelAnalyzerGUI::blockApplySettings(bool block) { ui->glScope->blockSignals(block); ui->glSpectrum->blockSignals(block); - m_channelMarker->blockSignals(block); m_doApplySettings = !block; } diff --git a/plugins/channel/lora/lorademodgui.cpp b/plugins/channel/lora/lorademodgui.cpp index e953a6c2e..2321f01c9 100644 --- a/plugins/channel/lora/lorademodgui.cpp +++ b/plugins/channel/lora/lorademodgui.cpp @@ -76,6 +76,7 @@ bool LoRaDemodGUI::deserialize(const QByteArray& data) qint32 tmp; blockApplySettings(true); + m_channelMarker->blockSignals(true); d.readS32(1, &tmp, 0); m_channelMarker->setCenterFrequency(tmp); @@ -87,6 +88,7 @@ bool LoRaDemodGUI::deserialize(const QByteArray& data) ui->spectrumGUI->deserialize(bytetmp); blockApplySettings(false); + m_channelMarker->blockSignals(false); applySettings(); return true; @@ -188,7 +190,6 @@ LoRaDemodGUI::~LoRaDemodGUI() void LoRaDemodGUI::blockApplySettings(bool block) { - m_channelMarker->blockSignals(block); m_doApplySettings = !block; } diff --git a/plugins/channel/nfm/nfmdemodgui.cpp b/plugins/channel/nfm/nfmdemodgui.cpp index d9745e491..68cf97286 100644 --- a/plugins/channel/nfm/nfmdemodgui.cpp +++ b/plugins/channel/nfm/nfmdemodgui.cpp @@ -87,6 +87,7 @@ bool NFMDemodGUI::deserialize(const QByteArray& data) qint32 tmp; blockApplySettings(true); + m_channelMarker->blockSignals(true); d.readS32(1, &tmp, 0); m_channelMarker->setCenterFrequency(tmp); @@ -108,6 +109,7 @@ bool NFMDemodGUI::deserialize(const QByteArray& data) ui->ctcss->setCurrentIndex(tmp); blockApplySettings(false); + m_channelMarker->blockSignals(false); applySettings(); return true; @@ -311,7 +313,6 @@ void NFMDemodGUI::setCtcssFreq(Real ctcssFreq) void NFMDemodGUI::blockApplySettings(bool block) { - m_channelMarker->blockSignals(block); m_doApplySettings = !block; } diff --git a/plugins/channel/ssb/ssbdemodgui.cpp b/plugins/channel/ssb/ssbdemodgui.cpp index da7de099e..df3451313 100644 --- a/plugins/channel/ssb/ssbdemodgui.cpp +++ b/plugins/channel/ssb/ssbdemodgui.cpp @@ -84,6 +84,7 @@ bool SSBDemodGUI::deserialize(const QByteArray& data) qint32 tmp; blockApplySettings(true); + m_channelMarker->blockSignals(true); d.readS32(1, &tmp, 0); m_channelMarker->setCenterFrequency(tmp); @@ -102,6 +103,7 @@ bool SSBDemodGUI::deserialize(const QByteArray& data) setNewRate(tmp); blockApplySettings(false); + m_channelMarker->blockSignals(false); applySettings(); return true; @@ -344,7 +346,6 @@ bool SSBDemodGUI::setNewRate(int spanLog2) void SSBDemodGUI::blockApplySettings(bool block) { - m_channelMarker->blockSignals(block); m_doApplySettings = !block; } diff --git a/plugins/channel/tcpsrc/tcpsrcgui.cpp b/plugins/channel/tcpsrc/tcpsrcgui.cpp index 1757e3deb..116a094d9 100644 --- a/plugins/channel/tcpsrc/tcpsrcgui.cpp +++ b/plugins/channel/tcpsrc/tcpsrcgui.cpp @@ -80,6 +80,7 @@ bool TCPSrcGUI::deserialize(const QByteArray& data) Real realtmp; blockApplySettings(true); + m_channelMarker->blockSignals(true); d.readBlob(1, &bytetmp); restoreState(bytetmp); @@ -112,6 +113,7 @@ bool TCPSrcGUI::deserialize(const QByteArray& data) ui->boost->setValue(s32tmp); blockApplySettings(false); + m_channelMarker->blockSignals(false); applySettings(); return true; @@ -208,7 +210,6 @@ TCPSrcGUI::~TCPSrcGUI() void TCPSrcGUI::blockApplySettings(bool block) { - m_channelizer->blockSignals(block); m_doApplySettings = !block; } diff --git a/plugins/channel/wfm/wfmdemodgui.cpp b/plugins/channel/wfm/wfmdemodgui.cpp index a8f465363..ebe7b8f3b 100644 --- a/plugins/channel/wfm/wfmdemodgui.cpp +++ b/plugins/channel/wfm/wfmdemodgui.cpp @@ -96,6 +96,7 @@ bool WFMDemodGUI::deserialize(const QByteArray& data) qint32 tmp; blockApplySettings(true); + m_channelMarker->blockSignals(true); d.readS32(1, &tmp, 0); m_channelMarker->setCenterFrequency(tmp); @@ -114,6 +115,7 @@ bool WFMDemodGUI::deserialize(const QByteArray& data) } blockApplySettings(false); + m_channelMarker->blockSignals(false); applySettings(); return true; @@ -240,7 +242,6 @@ WFMDemodGUI::~WFMDemodGUI() void WFMDemodGUI::blockApplySettings(bool block) { - m_channelMarker->blockSignals(block); m_doApplySettings = !block; }