From 83e44739b1e3dfa3c4038793196d43adb06679e5 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Wed, 17 May 2017 23:05:47 +0200
Subject: [PATCH] NFM demod: use ValueDialZ for channel delta frequency value
 dial

---
 plugins/channelrx/demodnfm/nfmdemodgui.cpp | 33 +++++----------------
 plugins/channelrx/demodnfm/nfmdemodgui.h   |  3 +-
 plugins/channelrx/demodnfm/nfmdemodgui.ui  | 34 +++++++++-------------
 plugins/channelrx/tcpsrc/tcpsrcgui.cpp     |  1 +
 plugins/channelrx/tcpsrc/tcpsrcgui.ui      | 13 +++++++++
 5 files changed, 37 insertions(+), 47 deletions(-)

diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.cpp b/plugins/channelrx/demodnfm/nfmdemodgui.cpp
index 08bceda41..066fdb763 100644
--- a/plugins/channelrx/demodnfm/nfmdemodgui.cpp
+++ b/plugins/channelrx/demodnfm/nfmdemodgui.cpp
@@ -1,4 +1,4 @@
-#include "../../channelrx/demodnfm/nfmdemodgui.h"
+#include "nfmdemodgui.h"
 
 #include <device/devicesourceapi.h>
 #include <dsp/downchannelizer.h>
@@ -6,7 +6,7 @@
 #include <QMainWindow>
 #include <QDebug>
 
-#include "../../../sdrbase/dsp/threadedbasebandsamplesink.h"
+#include "dsp/threadedbasebandsamplesink.h"
 #include "ui_nfmdemodgui.h"
 #include "dsp/nullsink.h"
 #include "plugin/pluginapi.h"
@@ -15,7 +15,7 @@
 #include "gui/basicchannelsettingswidget.h"
 #include "dsp/dspengine.h"
 #include "mainwindow.h"
-#include "../../channelrx/demodnfm/nfmdemod.h"
+#include "nfmdemod.h"
 
 const QString NFMDemodGUI::m_channelID = "de.maintech.sdrangelove.channel.nfm";
 
@@ -163,27 +163,9 @@ void NFMDemodGUI::viewChanged()
 	applySettings();
 }
 
-void NFMDemodGUI::on_deltaMinus_toggled(bool minus)
+void NFMDemodGUI::on_deltaFrequency_changed(qint64 value)
 {
-	int deltaFrequency = m_channelMarker.getCenterFrequency();
-	bool minusDelta = (deltaFrequency < 0);
-
-	if (minus ^ minusDelta) // sign change
-	{
-		m_channelMarker.setCenterFrequency(-deltaFrequency);
-	}
-}
-
-void NFMDemodGUI::on_deltaFrequency_changed(quint64 value)
-{
-	if (ui->deltaMinus->isChecked())
-	{
-		m_channelMarker.setCenterFrequency(-value);
-	}
-	else
-	{
-		m_channelMarker.setCenterFrequency(value);
-	}
+    m_channelMarker.setCenterFrequency(value);
 }
 
 void NFMDemodGUI::on_rfBW_currentIndexChanged(int index)
@@ -322,7 +304,9 @@ NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidg
 
 	ui->audioMute->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); // squelch closed
 
+	ui->deltaFrequencyLabel->setText(QString("%1f").arg(QChar(0x94, 0x03)));
 	ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
+	ui->deltaFrequency->setValueRange(false, 7, -9999999, 9999999);
     ui->channelPowerMeter->setColorTheme(LevelMeterSignalDB::ColorGreenAndBlue);
 
 	m_channelizer = new DownChannelizer(m_nfmDemod);
@@ -370,8 +354,7 @@ void NFMDemodGUI::applySettings()
 			48000,
 			m_channelMarker.getCenterFrequency());
 
-		ui->deltaFrequency->setValue(abs(m_channelMarker.getCenterFrequency()));
-		ui->deltaMinus->setChecked(m_channelMarker.getCenterFrequency() < 0);
+        ui->deltaFrequency->setValue(m_channelMarker.getCenterFrequency());
 
 		m_nfmDemod->configure(m_nfmDemod->getInputMessageQueue(),
 			m_rfBW[ui->rfBW->currentIndex()],
diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.h b/plugins/channelrx/demodnfm/nfmdemodgui.h
index b4aebd08c..56f01ecce 100644
--- a/plugins/channelrx/demodnfm/nfmdemodgui.h
+++ b/plugins/channelrx/demodnfm/nfmdemodgui.h
@@ -41,8 +41,7 @@ public:
 
 private slots:
 	void viewChanged();
-	void on_deltaFrequency_changed(quint64 value);
-	void on_deltaMinus_toggled(bool minus);
+	void on_deltaFrequency_changed(qint64 value);
 	void on_rfBW_currentIndexChanged(int index);
 	void on_afBW_valueChanged(int value);
 	void on_volume_valueChanged(int value);
diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.ui b/plugins/channelrx/demodnfm/nfmdemodgui.ui
index 540d75eb8..2cecce70a 100644
--- a/plugins/channelrx/demodnfm/nfmdemodgui.ui
+++ b/plugins/channelrx/demodnfm/nfmdemodgui.ui
@@ -73,26 +73,20 @@
       <item>
        <layout class="QHBoxLayout" name="DeltaFrequencyLayout">
         <item>
-         <widget class="QToolButton" name="deltaMinus">
-          <property name="toolTip">
-           <string>Frequency shift direction</string>
+         <widget class="QLabel" name="deltaFrequencyLabel">
+          <property name="minimumSize">
+           <size>
+            <width>16</width>
+            <height>0</height>
+           </size>
           </property>
           <property name="text">
-           <string>...</string>
-          </property>
-          <property name="icon">
-           <iconset>
-            <selectedoff>:/plus.png</selectedoff>
-            <selectedon>:/minus.png</selectedon>
-           </iconset>
-          </property>
-          <property name="checkable">
-           <bool>true</bool>
+           <string>Df</string>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="ValueDial" name="deltaFrequency" native="true">
+         <widget class="ValueDialZ" name="deltaFrequency" native="true">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
             <horstretch>0</horstretch>
@@ -618,12 +612,6 @@
    <header>gui/rollupwidget.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>ValueDial</class>
-   <extends>QWidget</extends>
-   <header>gui/valuedial.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>LevelMeterSignalDB</class>
    <extends>QWidget</extends>
@@ -635,6 +623,12 @@
    <extends>QToolButton</extends>
    <header>gui/buttonswitch.h</header>
   </customwidget>
+  <customwidget>
+   <class>ValueDialZ</class>
+   <extends>QWidget</extends>
+   <header>gui/valuedialz.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../../../sdrbase/resources/res.qrc"/>
diff --git a/plugins/channelrx/tcpsrc/tcpsrcgui.cpp b/plugins/channelrx/tcpsrc/tcpsrcgui.cpp
index 7ff551243..4f80f37f5 100644
--- a/plugins/channelrx/tcpsrc/tcpsrcgui.cpp
+++ b/plugins/channelrx/tcpsrc/tcpsrcgui.cpp
@@ -206,6 +206,7 @@ TCPSrcGUI::TCPSrcGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget*
 	m_threadedChannelizer = new ThreadedBasebandSampleSink(m_channelizer, this);
 	m_deviceAPI->addThreadedSink(m_threadedChannelizer);
 
+    ui->deltaFrequencyLabel->setText(QString("%1f").arg(QChar(0x94, 0x03)));
 	ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
     ui->deltaFrequency->setValueRange(false, 7, -9999999, 9999999);
 
diff --git a/plugins/channelrx/tcpsrc/tcpsrcgui.ui b/plugins/channelrx/tcpsrc/tcpsrcgui.ui
index 860de0afb..01e863df9 100644
--- a/plugins/channelrx/tcpsrc/tcpsrcgui.ui
+++ b/plugins/channelrx/tcpsrc/tcpsrcgui.ui
@@ -148,6 +148,19 @@
       <property name="topMargin">
        <number>2</number>
       </property>
+      <item>
+       <widget class="QLabel" name="deltaFrequencyLabel">
+        <property name="maximumSize">
+         <size>
+          <width>16</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Df</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="ValueDialZ" name="deltaFrequency" native="true">
         <property name="sizePolicy">