From a8adc84e89ef27f41e8ce1ea8e27ad9e6608c951 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 18 Mar 2017 17:56:32 +0100 Subject: [PATCH] ATV Demod: since channel marker and window title have fixed colors set both once in the constructor --- plugins/channelrx/demodatv/atvdemodgui.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/channelrx/demodatv/atvdemodgui.cpp b/plugins/channelrx/demodatv/atvdemodgui.cpp index 1c60b93a1..5eb987e06 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.cpp +++ b/plugins/channelrx/demodatv/atvdemodgui.cpp @@ -132,11 +132,11 @@ bool ATVDemodGUI::deserialize(const QByteArray& arrData) d.readS32(1, &tmp, 0); m_objChannelMarker.setCenterFrequency(tmp); - if (d.readU32(2, &u32tmp)) { - m_objChannelMarker.setColor(u32tmp); - } else { - m_objChannelMarker.setColor(Qt::white); - } +// if (d.readU32(2, &u32tmp)) { +// m_objChannelMarker.setColor(u32tmp); +// } else { +// m_objChannelMarker.setColor(Qt::white); +// } d.readS32(3, &tmp, 100); ui->synchLevel->setValue(tmp); @@ -268,6 +268,7 @@ ATVDemodGUI::ATVDemodGUI(PluginAPI* objPluginAPI, DeviceSourceAPI *objDeviceAPI, m_objChannelMarker.setBandwidth(6000000); m_objChannelMarker.setCenterFrequency(0); m_objChannelMarker.setVisible(true); + setTitleColor(m_objChannelMarker.getColor()); connect(&m_objChannelMarker, SIGNAL(changed()), this, SLOT(viewChanged())); @@ -303,7 +304,6 @@ void ATVDemodGUI::applySettings() { if (m_blnDoApplySettings) { - setTitleColor(m_objChannelMarker.getColor()); ui->deltaFrequency->setValue(abs(m_objChannelMarker.getCenterFrequency())); ui->deltaFrequencyMinus->setChecked(m_objChannelMarker.getCenterFrequency() < 0);