VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-30 13:52:25 -04:00
Code Issues Projects Releases Wiki Activity

Deep redesign: Init sequence review phase #4: Fixing channel GUI init

Browse Source
This commit is contained in:
f4exb 2015-08-19 02:18:15 +02:00
parent fc3e9efa8a
commit 1fdeaa62c3
7 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/channel/am/amdemodgui.cpp
View File

@ -85,6 +85,7 @@ bool AMDemodGUI::deserialize(const QByteArray& data)
qint32 tmp; qint32 tmp;
blockApplySettings(true); blockApplySettings(true);
m_channelMarker->blockSignals(true);
d.readS32(1, &tmp, 0); d.readS32(1, &tmp, 0);
m_channelMarker->setCenterFrequency(tmp); m_channelMarker->setCenterFrequency(tmp);
@ -103,6 +104,7 @@ bool AMDemodGUI::deserialize(const QByteArray& data)
} }
blockApplySettings(false); blockApplySettings(false);
m_channelMarker->blockSignals(false);
applySettings(); applySettings();
return true; return true;
@ -230,7 +232,6 @@ AMDemodGUI::~AMDemodGUI()
void AMDemodGUI::blockApplySettings(bool block) void AMDemodGUI::blockApplySettings(bool block)
{ {
m_channelMarker->blockSignals(block);
m_doApplySettings = !block; m_doApplySettings = !block;
} }

3
plugins/channel/chanalyzer/chanalyzergui.cpp
View File

@ -86,6 +86,7 @@ bool ChannelAnalyzerGUI::deserialize(const QByteArray& data)
bool tmpBool; bool tmpBool;
blockApplySettings(true); blockApplySettings(true);
m_channelMarker->blockSignals(true);
d.readS32(1, &tmp, 0); d.readS32(1, &tmp, 0);
m_channelMarker->setCenterFrequency(tmp); m_channelMarker->setCenterFrequency(tmp);
@ -106,6 +107,7 @@ bool ChannelAnalyzerGUI::deserialize(const QByteArray& data)
ui->scopeGUI->deserialize(bytetmp); ui->scopeGUI->deserialize(bytetmp);
blockApplySettings(false); blockApplySettings(false);
m_channelMarker->blockSignals(false);
applySettings(); applySettings();
return true; return true;
@ -388,7 +390,6 @@ void ChannelAnalyzerGUI::blockApplySettings(bool block)
{ {
ui->glScope->blockSignals(block); ui->glScope->blockSignals(block);
ui->glSpectrum->blockSignals(block); ui->glSpectrum->blockSignals(block);
m_channelMarker->blockSignals(block);
m_doApplySettings = !block; m_doApplySettings = !block;
} }

3
plugins/channel/lora/lorademodgui.cpp
View File

@ -76,6 +76,7 @@ bool LoRaDemodGUI::deserialize(const QByteArray& data)
qint32 tmp; qint32 tmp;
blockApplySettings(true); blockApplySettings(true);
m_channelMarker->blockSignals(true);
d.readS32(1, &tmp, 0); d.readS32(1, &tmp, 0);
m_channelMarker->setCenterFrequency(tmp); m_channelMarker->setCenterFrequency(tmp);
@ -87,6 +88,7 @@ bool LoRaDemodGUI::deserialize(const QByteArray& data)
ui->spectrumGUI->deserialize(bytetmp); ui->spectrumGUI->deserialize(bytetmp);
blockApplySettings(false); blockApplySettings(false);
m_channelMarker->blockSignals(false);
applySettings(); applySettings();
return true; return true;
@ -188,7 +190,6 @@ LoRaDemodGUI::~LoRaDemodGUI()
void LoRaDemodGUI::blockApplySettings(bool block) void LoRaDemodGUI::blockApplySettings(bool block)
{ {
m_channelMarker->blockSignals(block);
m_doApplySettings = !block; m_doApplySettings = !block;
} }

3
plugins/channel/nfm/nfmdemodgui.cpp
View File

@ -87,6 +87,7 @@ bool NFMDemodGUI::deserialize(const QByteArray& data)
qint32 tmp; qint32 tmp;
blockApplySettings(true); blockApplySettings(true);
m_channelMarker->blockSignals(true);
d.readS32(1, &tmp, 0); d.readS32(1, &tmp, 0);
m_channelMarker->setCenterFrequency(tmp); m_channelMarker->setCenterFrequency(tmp);
@ -108,6 +109,7 @@ bool NFMDemodGUI::deserialize(const QByteArray& data)
ui->ctcss->setCurrentIndex(tmp); ui->ctcss->setCurrentIndex(tmp);
blockApplySettings(false); blockApplySettings(false);
m_channelMarker->blockSignals(false);
applySettings(); applySettings();
return true; return true;
@ -311,7 +313,6 @@ void NFMDemodGUI::setCtcssFreq(Real ctcssFreq)
void NFMDemodGUI::blockApplySettings(bool block) void NFMDemodGUI::blockApplySettings(bool block)
{ {
m_channelMarker->blockSignals(block);
m_doApplySettings = !block; m_doApplySettings = !block;
} }

3
plugins/channel/ssb/ssbdemodgui.cpp
View File

@ -84,6 +84,7 @@ bool SSBDemodGUI::deserialize(const QByteArray& data)
qint32 tmp; qint32 tmp;
blockApplySettings(true); blockApplySettings(true);
m_channelMarker->blockSignals(true);
d.readS32(1, &tmp, 0); d.readS32(1, &tmp, 0);
m_channelMarker->setCenterFrequency(tmp); m_channelMarker->setCenterFrequency(tmp);
@ -102,6 +103,7 @@ bool SSBDemodGUI::deserialize(const QByteArray& data)
setNewRate(tmp); setNewRate(tmp);
blockApplySettings(false); blockApplySettings(false);
m_channelMarker->blockSignals(false);
applySettings(); applySettings();
return true; return true;
@ -344,7 +346,6 @@ bool SSBDemodGUI::setNewRate(int spanLog2)
void SSBDemodGUI::blockApplySettings(bool block) void SSBDemodGUI::blockApplySettings(bool block)
{ {
m_channelMarker->blockSignals(block);
m_doApplySettings = !block; m_doApplySettings = !block;
} }

3
plugins/channel/tcpsrc/tcpsrcgui.cpp
View File

@ -80,6 +80,7 @@ bool TCPSrcGUI::deserialize(const QByteArray& data)
Real realtmp; Real realtmp;
blockApplySettings(true); blockApplySettings(true);
m_channelMarker->blockSignals(true);
d.readBlob(1, &bytetmp); d.readBlob(1, &bytetmp);
restoreState(bytetmp); restoreState(bytetmp);
@ -112,6 +113,7 @@ bool TCPSrcGUI::deserialize(const QByteArray& data)
ui->boost->setValue(s32tmp); ui->boost->setValue(s32tmp);
blockApplySettings(false); blockApplySettings(false);
m_channelMarker->blockSignals(false);
applySettings(); applySettings();
return true; return true;
@ -208,7 +210,6 @@ TCPSrcGUI::~TCPSrcGUI()
void TCPSrcGUI::blockApplySettings(bool block) void TCPSrcGUI::blockApplySettings(bool block)
{ {
m_channelizer->blockSignals(block);
m_doApplySettings = !block; m_doApplySettings = !block;
} }

3
plugins/channel/wfm/wfmdemodgui.cpp
View File

@ -96,6 +96,7 @@ bool WFMDemodGUI::deserialize(const QByteArray& data)
qint32 tmp; qint32 tmp;
blockApplySettings(true); blockApplySettings(true);
m_channelMarker->blockSignals(true);
d.readS32(1, &tmp, 0); d.readS32(1, &tmp, 0);
m_channelMarker->setCenterFrequency(tmp); m_channelMarker->setCenterFrequency(tmp);
@ -114,6 +115,7 @@ bool WFMDemodGUI::deserialize(const QByteArray& data)
} }
blockApplySettings(false); blockApplySettings(false);
m_channelMarker->blockSignals(false);
applySettings(); applySettings();
return true; return true;
@ -240,7 +242,6 @@ WFMDemodGUI::~WFMDemodGUI()
void WFMDemodGUI::blockApplySettings(bool block) void WFMDemodGUI::blockApplySettings(bool block)
{ {
m_channelMarker->blockSignals(block);
m_doApplySettings = !block; m_doApplySettings = !block;
} }