From 9fdff1e028b32f79bf2f4aace310d08c360c44cc Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Tue, 8 Dec 2015 02:23:58 +0100
Subject: [PATCH] BFM and WFM demods: Fixed initial RF BW display on
 deserialization

---
 plugins/channel/bfm/bfmdemodgui.cpp | 6 ++++++
 plugins/channel/bfm/bfmdemodgui.ui  | 9 ++++++---
 plugins/channel/wfm/wfmdemodgui.cpp | 6 ++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/plugins/channel/bfm/bfmdemodgui.cpp b/plugins/channel/bfm/bfmdemodgui.cpp
index ad6151301..9d83409c4 100644
--- a/plugins/channel/bfm/bfmdemodgui.cpp
+++ b/plugins/channel/bfm/bfmdemodgui.cpp
@@ -128,12 +128,18 @@ bool BFMDemodGUI::deserialize(const QByteArray& data)
 
 		d.readS32(1, &tmp, 0);
 		m_channelMarker.setCenterFrequency(tmp);
+
 		d.readS32(2, &tmp, 4);
 		ui->rfBW->setValue(tmp);
+		ui->rfBWText->setText(QString("%1 kHz").arg(m_rfBW[tmp] / 1000.0));
+		m_channelMarker.setBandwidth(m_rfBW[tmp]);
+
 		d.readS32(3, &tmp, 3);
 		ui->afBW->setValue(tmp);
+
 		d.readS32(4, &tmp, 20);
 		ui->volume->setValue(tmp);
+
 		d.readS32(5, &tmp, -40);
 		ui->squelch->setValue(tmp);
 
diff --git a/plugins/channel/bfm/bfmdemodgui.ui b/plugins/channel/bfm/bfmdemodgui.ui
index 93889e499..dc984a364 100644
--- a/plugins/channel/bfm/bfmdemodgui.ui
+++ b/plugins/channel/bfm/bfmdemodgui.ui
@@ -7,19 +7,22 @@
     <x>0</x>
     <y>0</y>
     <width>252</width>
-    <height>324</height>
+    <height>333</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Broadcast FM Demod</string>
   </property>
+  <property name="toolTip">
+   <string/>
+  </property>
   <widget class="QWidget" name="settingsContainer" native="true">
    <property name="geometry">
     <rect>
      <x>10</x>
      <y>20</y>
      <width>235</width>
-     <height>111</height>
+     <height>121</height>
     </rect>
    </property>
    <property name="windowTitle">
@@ -339,7 +342,7 @@
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>150</y>
+     <y>160</y>
      <width>231</width>
      <height>156</height>
     </rect>
diff --git a/plugins/channel/wfm/wfmdemodgui.cpp b/plugins/channel/wfm/wfmdemodgui.cpp
index 1c076e40f..169b007a0 100644
--- a/plugins/channel/wfm/wfmdemodgui.cpp
+++ b/plugins/channel/wfm/wfmdemodgui.cpp
@@ -108,12 +108,18 @@ bool WFMDemodGUI::deserialize(const QByteArray& data)
 
 		d.readS32(1, &tmp, 0);
 		m_channelMarker.setCenterFrequency(tmp);
+
 		d.readS32(2, &tmp, 4);
 		ui->rfBW->setValue(tmp);
+		ui->rfBWText->setText(QString("%1 kHz").arg(m_rfBW[tmp] / 1000.0));
+		m_channelMarker.setBandwidth(m_rfBW[tmp]);
+
 		d.readS32(3, &tmp, 3);
 		ui->afBW->setValue(tmp);
+
 		d.readS32(4, &tmp, 20);
 		ui->volume->setValue(tmp);
+
 		d.readS32(5, &tmp, -40);
 		ui->squelch->setValue(tmp);