From 92c8aa78f8da59574be48a4cebe566626da98723 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Mon, 11 May 2015 00:45:00 +0200
Subject: [PATCH] use ValueDial for SSB channel shift thus allowing fine tuning

---
 plugins/channel/ssb/ssbdemodgui.cpp |  23 +++++
 plugins/channel/ssb/ssbdemodgui.h   |   2 +
 plugins/channel/ssb/ssbdemodgui.ui  | 137 ++++++++++++++++++++--------
 3 files changed, 125 insertions(+), 37 deletions(-)

diff --git a/plugins/channel/ssb/ssbdemodgui.cpp b/plugins/channel/ssb/ssbdemodgui.cpp
index 7731f6de0..d4fd82f8a 100644
--- a/plugins/channel/ssb/ssbdemodgui.cpp
+++ b/plugins/channel/ssb/ssbdemodgui.cpp
@@ -33,6 +33,7 @@ void SSBDemodGUI::resetToDefaults()
 {
 	ui->BW->setValue(3);
 	ui->volume->setValue(4);
+	ui->deltaFrequency->setValue(0);
 	applySettings();
 }
 
@@ -88,6 +89,26 @@ void SSBDemodGUI::viewChanged()
 	applySettings();
 }
 
+void SSBDemodGUI::on_deltaMinus_clicked(bool minus)
+{
+	int deltaFrequency = m_channelMarker->getCenterFrequency();
+	bool minusDelta = (deltaFrequency < 0);
+
+	if (minus ^ minusDelta) // sign change
+	{
+		m_channelMarker->setCenterFrequency(-deltaFrequency);
+	}
+}
+
+void SSBDemodGUI::on_deltaFrequency_changed(quint64 value)
+{
+	if (ui->deltaMinus->isChecked()) {
+		m_channelMarker->setCenterFrequency(-value);
+	} else {
+		m_channelMarker->setCenterFrequency(value);
+	}
+}
+
 void SSBDemodGUI::on_BW_valueChanged(int value)
 {
 	ui->BWText->setText(QString("%1 kHz").arg(value));
@@ -172,6 +193,8 @@ SSBDemodGUI::~SSBDemodGUI()
 void SSBDemodGUI::applySettings()
 {
 	setTitleColor(m_channelMarker->getColor());
+	ui->deltaFrequency->setValue(abs(m_channelMarker->getCenterFrequency()));
+	ui->deltaMinus->setChecked(m_channelMarker->getCenterFrequency() < 0);
 	m_channelizer->configure(m_threadedSampleSink->getMessageQueue(),
 		48000,
 		m_channelMarker->getCenterFrequency());
diff --git a/plugins/channel/ssb/ssbdemodgui.h b/plugins/channel/ssb/ssbdemodgui.h
index 58ac19126..ac2d441fe 100644
--- a/plugins/channel/ssb/ssbdemodgui.h
+++ b/plugins/channel/ssb/ssbdemodgui.h
@@ -34,6 +34,8 @@ public:
 
 private slots:
 	void viewChanged();
+	void on_deltaFrequency_changed(quint64 value);
+	void on_deltaMinus_clicked(bool minus);
 	void on_BW_valueChanged(int value);
 	void on_volume_valueChanged(int value);
 	void onWidgetRolled(QWidget* widget, bool rollDown);
diff --git a/plugins/channel/ssb/ssbdemodgui.ui b/plugins/channel/ssb/ssbdemodgui.ui
index 114986e00..caa74d4ed 100644
--- a/plugins/channel/ssb/ssbdemodgui.ui
+++ b/plugins/channel/ssb/ssbdemodgui.ui
@@ -26,20 +26,51 @@
     <string>Settings</string>
    </property>
    <layout class="QGridLayout" name="gridLayout">
-    <property name="margin">
+    <property name="leftMargin">
+     <number>2</number>
+    </property>
+    <property name="topMargin">
+     <number>2</number>
+    </property>
+    <property name="rightMargin">
+     <number>2</number>
+    </property>
+    <property name="bottomMargin">
      <number>2</number>
     </property>
     <property name="spacing">
      <number>3</number>
     </property>
-    <item row="0" column="0">
-     <widget class="QLabel" name="label">
+    <item row="1" column="2">
+     <widget class="QLabel" name="BWText">
+      <property name="minimumSize">
+       <size>
+        <width>50</width>
+        <height>0</height>
+       </size>
+      </property>
       <property name="text">
-       <string>Bandwidth</string>
+       <string>3 kHz</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
       </property>
      </widget>
     </item>
-    <item row="0" column="1">
+    <item row="2" column="1">
+     <widget class="QSlider" name="volume">
+      <property name="maximum">
+       <number>100</number>
+      </property>
+      <property name="value">
+       <number>20</number>
+      </property>
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="1">
      <widget class="QSlider" name="BW">
       <property name="minimum">
        <number>-8</number>
@@ -58,43 +89,14 @@
       </property>
      </widget>
     </item>
-    <item row="0" column="2">
-     <widget class="QLabel" name="BWText">
-      <property name="minimumSize">
-       <size>
-        <width>50</width>
-        <height>0</height>
-       </size>
-      </property>
-      <property name="text">
-       <string>3 kHz</string>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="0">
+    <item row="2" column="0">
      <widget class="QLabel" name="label_2">
       <property name="text">
        <string>Volume</string>
       </property>
      </widget>
     </item>
-    <item row="1" column="1">
-     <widget class="QSlider" name="volume">
-      <property name="maximum">
-       <number>100</number>
-      </property>
-      <property name="value">
-       <number>20</number>
-      </property>
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="2">
+    <item row="2" column="2">
      <widget class="QLabel" name="volumeText">
       <property name="minimumSize">
        <size>
@@ -110,6 +112,58 @@
       </property>
      </widget>
     </item>
+    <item row="1" column="0">
+     <widget class="QLabel" name="label">
+      <property name="text">
+       <string>Bandwidth</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="0">
+     <widget class="QRadioButton" name="deltaMinus">
+      <property name="layoutDirection">
+       <enum>Qt::RightToLeft</enum>
+      </property>
+      <property name="text">
+       <string>Minus</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="1">
+     <widget class="ValueDial" name="deltaFrequency" native="true">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>32</width>
+        <height>16</height>
+       </size>
+      </property>
+      <property name="font">
+       <font>
+        <family>Monospace</family>
+        <pointsize>12</pointsize>
+       </font>
+      </property>
+      <property name="focusPolicy">
+       <enum>Qt::StrongFocus</enum>
+      </property>
+      <property name="toolTip">
+       <string>Demod shift frequency from center in Hz</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="2">
+     <widget class="QLabel" name="deltaUnits">
+      <property name="text">
+       <string>Hz</string>
+      </property>
+     </widget>
+    </item>   
    </layout>
   </widget>
   <widget class="QWidget" name="spectrumContainer" native="true">
@@ -128,7 +182,16 @@
     <property name="spacing">
      <number>2</number>
     </property>
-    <property name="margin">
+    <property name="leftMargin">
+     <number>3</number>
+    </property>
+    <property name="topMargin">
+     <number>3</number>
+    </property>
+    <property name="rightMargin">
+     <number>3</number>
+    </property>
+    <property name="bottomMargin">
      <number>3</number>
     </property>
     <item>