From 117487555194478ac3b646025569b133d77a0090 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Tue, 21 Feb 2017 04:57:44 +0100
Subject: [PATCH] Channel Analyzer NG: reviewed deserialization sequence

---
 .../channelrx/chanalyzerng/chanalyzerng.cpp   | 21 ++++++------
 .../chanalyzerng/chanalyzernggui.cpp          | 34 +++++++++++--------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/plugins/channelrx/chanalyzerng/chanalyzerng.cpp b/plugins/channelrx/chanalyzerng/chanalyzerng.cpp
index aa5a4cc76..4f5aa0e8c 100644
--- a/plugins/channelrx/chanalyzerng/chanalyzerng.cpp
+++ b/plugins/channelrx/chanalyzerng/chanalyzerng.cpp
@@ -132,9 +132,7 @@ void ChannelAnalyzerNG::stop()
 
 bool ChannelAnalyzerNG::handleMessage(const Message& cmd)
 {
-	float band, lowCutoff;
-
-	qDebug() << "ChannelAnalyzerNG::handleMessage";
+	float bandwidth, lowCutoff;
 
 	if (DownChannelizer::MsgChannelizerNotification::match(cmd))
 	{
@@ -142,6 +140,8 @@ bool ChannelAnalyzerNG::handleMessage(const Message& cmd)
 
 		m_sampleRate = notif.getSampleRate();
 		m_nco.setFreq(-notif.getFrequencyOffset(), m_sampleRate);
+        SSBFilter->create_filter(m_LowCutoff / m_sampleRate, m_Bandwidth / m_sampleRate);
+        DSBFilter->create_dsb_filter(m_Bandwidth / m_sampleRate);
 
 		qDebug() << "ChannelAnalyzerNG::handleMessage: MsgChannelizerNotification: m_sampleRate: " << m_sampleRate
 				<< " frequencyOffset: " << notif.getFrequencyOffset();
@@ -152,12 +152,12 @@ bool ChannelAnalyzerNG::handleMessage(const Message& cmd)
 	{
 		MsgConfigureChannelAnalyzer& cfg = (MsgConfigureChannelAnalyzer&) cmd;
 
-		band = cfg.getBandwidth();
+		bandwidth = cfg.getBandwidth();
 		lowCutoff = cfg.getLoCutoff();
 
-		if (band < 0)
+		if (bandwidth < 0)
 		{
-			band = -band;
+			bandwidth = -bandwidth;
 			lowCutoff = -lowCutoff;
 			m_usb = false;
 		}
@@ -166,15 +166,15 @@ bool ChannelAnalyzerNG::handleMessage(const Message& cmd)
 			m_usb = true;
 		}
 
-		if (band < 100.0f)
+		if (bandwidth < 100.0f)
 		{
-			band = 100.0f;
+			bandwidth = 100.0f;
 			lowCutoff = 0;
 		}
 
 		m_settingsMutex.lock();
 
-		m_Bandwidth = band;
+		m_Bandwidth = bandwidth;
 		m_LowCutoff = lowCutoff;
 
 		SSBFilter->create_filter(m_LowCutoff / m_sampleRate, m_Bandwidth / m_sampleRate);
@@ -185,7 +185,8 @@ bool ChannelAnalyzerNG::handleMessage(const Message& cmd)
 
 		m_settingsMutex.unlock();
 
-		qDebug() << "  - MsgConfigureChannelAnalyzer: m_Bandwidth: " << m_Bandwidth
+		qDebug() << "ChannelAnalyzerNG::handleMessage: MsgConfigureChannelAnalyzer:"
+		        << " m_Bandwidth: " << m_Bandwidth
 				<< " m_LowCutoff: " << m_LowCutoff
 				<< " m_spanLog2: " << m_spanLog2
 				<< " m_ssb: " << m_ssb;
diff --git a/plugins/channelrx/chanalyzerng/chanalyzernggui.cpp b/plugins/channelrx/chanalyzerng/chanalyzernggui.cpp
index bd357c545..eb6fee514 100644
--- a/plugins/channelrx/chanalyzerng/chanalyzernggui.cpp
+++ b/plugins/channelrx/chanalyzerng/chanalyzernggui.cpp
@@ -111,16 +111,16 @@ bool ChannelAnalyzerNGGUI::deserialize(const QByteArray& data)
     {
 		QByteArray bytetmp;
 		quint32 u32tmp;
-		qint32 tmp, bw, lowCut;
+		qint32 tmp, spanLog2, bw, lowCut;
 		bool tmpBool;
 
-		blockApplySettings(true);
+        blockApplySettings(true);
 	    m_channelMarker.blockSignals(true);
 
 		d.readS32(1, &tmp, 0);
 		m_channelMarker.setCenterFrequency(tmp);
-		d.readS32(2, &bw, 30);
-		ui->BW->setValue(bw);
+        d.readS32(2, &bw, 30);
+        ui->BW->setValue(bw);
 		d.readBlob(3, &bytetmp);
 		ui->spectrumGUI->deserialize(bytetmp);
 
@@ -129,23 +129,28 @@ bool ChannelAnalyzerNGGUI::deserialize(const QByteArray& data)
 			m_channelMarker.setColor(u32tmp);
 		}
 
-		d.readS32(5, &lowCut, 3);
-		ui->lowCut->setValue(lowCut);
-		d.readS32(6, &tmp, 20);
-		ui->spanLog2->setValue(tmp);
-		setNewRate(tmp);
-		d.readBool(7, &tmpBool, false);
-		ui->ssb->setChecked(tmpBool);
+        d.readS32(5, &lowCut, 3);
+        ui->lowCut->setValue(lowCut);
+        d.readS32(6, &spanLog2, 3);
+        ui->spanLog2->setValue(spanLog2);
+        d.readBool(7, &tmpBool, false);
+        ui->ssb->setChecked(tmpBool);
 		d.readBlob(8, &bytetmp);
 		ui->scopeGUI->deserialize(bytetmp);
 
 		blockApplySettings(false);
 	    m_channelMarker.blockSignals(false);
 
-		ui->BW->setValue(bw);
-		ui->lowCut->setValue(lowCut); // does applySettings();
+//	    qDebug() << "ChannelAnalyzerNGGUI::deserialize:"
+//            << " spanLog2: " << spanLog2
+//            << " bw: " << bw
+//            << " lowCut: " << lowCut;
 
-		return true;
+	    setNewRate(spanLog2);
+        ui->BW->setValue(bw);
+        ui->lowCut->setValue(lowCut);
+
+        return true;
 	}
     else
     {
@@ -258,7 +263,6 @@ void ChannelAnalyzerNGGUI::on_spanLog2_valueChanged(int value)
 	if (setNewRate(value)) {
 		applySettings();
 	}
-
 }
 
 void ChannelAnalyzerNGGUI::on_ssb_toggled(bool checked)