From a1f6d29f03ac231adba9d5a284381efdef4f3c88 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Tue, 21 Nov 2017 22:46:39 +0100
Subject: [PATCH] UDP sink: fixed bandwidth channel marker display

---
 plugins/channelrx/udpsrc/udpsrcgui.cpp      |  4 +---
 plugins/channelrx/udpsrc/udpsrcplugin.cpp   |  2 +-
 plugins/channeltx/udpsink/udpsinkgui.cpp    | 25 ++++++++++++---------
 plugins/channeltx/udpsink/udpsinkplugin.cpp |  2 +-
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/plugins/channelrx/udpsrc/udpsrcgui.cpp b/plugins/channelrx/udpsrc/udpsrcgui.cpp
index ad777a196..ff049a8f5 100644
--- a/plugins/channelrx/udpsrc/udpsrcgui.cpp
+++ b/plugins/channelrx/udpsrc/udpsrcgui.cpp
@@ -419,7 +419,7 @@ void UDPSrcGUI::on_rfBandwidth_textEdited(const QString& arg1 __attribute__((unu
     bool ok;
     Real rfBandwidth = ui->rfBandwidth->text().toDouble(&ok);
 
-    if((!ok) || (rfBandwidth > m_settings.m_outputSampleRate))
+    if ((!ok) || (rfBandwidth > m_settings.m_outputSampleRate))
     {
         m_settings.m_rfBandwidth = m_settings.m_outputSampleRate;
         ui->rfBandwidth->setText(QString("%1").arg(m_settings.m_rfBandwidth, 0));
@@ -458,10 +458,8 @@ void UDPSrcGUI::on_applyBtn_clicked()
 {
     if (m_rfBandwidthChanged)
     {
-        blockApplySettings(true);
         m_channelMarker.setBandwidth((int) m_settings.m_rfBandwidth);
         m_rfBandwidthChanged = false;
-        blockApplySettings(false);
     }
 
     ui->glSpectrum->setSampleRate(m_settings.m_outputSampleRate);
diff --git a/plugins/channelrx/udpsrc/udpsrcplugin.cpp b/plugins/channelrx/udpsrc/udpsrcplugin.cpp
index 33f0b9d19..84a2460e1 100644
--- a/plugins/channelrx/udpsrc/udpsrcplugin.cpp
+++ b/plugins/channelrx/udpsrc/udpsrcplugin.cpp
@@ -25,7 +25,7 @@
 
 const PluginDescriptor UDPSrcPlugin::m_pluginDescriptor = {
 	QString("UDP Channel Source"),
-	QString("3.8.2"),
+	QString("3.8.5"),
 	QString("(c) Edouard Griffiths, F4EXB"),
 	QString("https://github.com/f4exb/sdrangel"),
 	true,
diff --git a/plugins/channeltx/udpsink/udpsinkgui.cpp b/plugins/channeltx/udpsink/udpsinkgui.cpp
index 1ab7caea4..b610da96c 100644
--- a/plugins/channeltx/udpsink/udpsinkgui.cpp
+++ b/plugins/channeltx/udpsink/udpsinkgui.cpp
@@ -195,11 +195,11 @@ void UDPSinkGUI::displaySettings()
 {
     m_channelMarker.blockSignals(true);
     m_channelMarker.setCenterFrequency(m_settings.m_inputFrequencyOffset);
-    m_channelMarker.setBandwidth((int)m_settings.m_rfBandwidth);
-    m_channelMarker.setColor(m_settings.m_rgbColor);
+    m_channelMarker.setBandwidth(m_settings.m_rfBandwidth);
     m_channelMarker.setUDPAddress(m_settings.m_udpAddress);
-    m_channelMarker.blockSignals(false);
     m_channelMarker.setUDPReceivePort(m_settings.m_udpPort); // activate signal on the last setting only
+    m_channelMarker.blockSignals(false);
+    m_channelMarker.setColor(m_settings.m_rgbColor);
 
     setTitleColor(m_settings.m_rgbColor);
     this->setWindowTitle(m_channelMarker.getTitle());
@@ -295,13 +295,18 @@ void UDPSinkGUI::on_rfBandwidth_textEdited(const QString& arg1 __attribute__((un
     bool ok;
     Real rfBandwidth = ui->rfBandwidth->text().toDouble(&ok);
 
-    if ((!ok) || (rfBandwidth > m_settings.m_inputSampleRate)) {
+    if ((!ok) || (rfBandwidth > m_settings.m_inputSampleRate))
+    {
         m_settings.m_rfBandwidth = m_settings.m_inputSampleRate;
         ui->rfBandwidth->setText(QString("%1").arg(m_settings.m_rfBandwidth, 0));
-    } else {
+    }
+    else
+    {
         m_settings.m_rfBandwidth = rfBandwidth;
     }
 
+    m_rfBandwidthChanged = true;
+
     ui->applyBtn->setEnabled(true);
     ui->applyBtn->setStyleSheet("QPushButton { background-color : green; }");
 }
@@ -384,13 +389,13 @@ void UDPSinkGUI::on_applyBtn_clicked()
 {
     if (m_rfBandwidthChanged)
     {
-        m_channelMarker.setBandwidth(m_settings.m_rfBandwidth); // will call apply settings
+        m_channelMarker.setBandwidth(m_settings.m_rfBandwidth);
         m_rfBandwidthChanged = false;
     }
-    else
-    {
-        applySettings();
-    }
+
+    ui->glSpectrum->setSampleRate(m_settings.m_inputSampleRate);
+
+    applySettings();
 }
 
 void UDPSinkGUI::on_resetUDPReadIndex_clicked()
diff --git a/plugins/channeltx/udpsink/udpsinkplugin.cpp b/plugins/channeltx/udpsink/udpsinkplugin.cpp
index 5fb246cf6..fac213719 100644
--- a/plugins/channeltx/udpsink/udpsinkplugin.cpp
+++ b/plugins/channeltx/udpsink/udpsinkplugin.cpp
@@ -24,7 +24,7 @@
 
 const PluginDescriptor UDPSinkPlugin::m_pluginDescriptor = {
 	QString("UDP Channel Sink"),
-	QString("3.8.4"),
+	QString("3.8.5"),
 	QString("(c) Edouard Griffiths, F4EXB"),
 	QString("https://github.com/f4exb/sdrangel"),
 	true,