From 6108bf6ad15f899e71b26c72302912956e365646 Mon Sep 17 00:00:00 2001
From: Chris Kuethe <chris.kuethe+github@gmail.com>
Date: Sun, 10 May 2015 15:32:36 -0700
Subject: [PATCH] add IF and BB gain knobs to rx_gui

---
 apps/modes_gui  | 20 +++++++++++-
 res/modes_rx.ui | 82 ++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 83 insertions(+), 19 deletions(-)

diff --git a/apps/modes_gui b/apps/modes_gui
index ca44ced..294d19b 100755
--- a/apps/modes_gui
+++ b/apps/modes_gui
@@ -52,6 +52,8 @@ class mainwindow(QtGui.QMainWindow):
 
         #should round to actual achieved gain
         self.ui.line_gain.insert(defaults["gain"])
+        self.ui.line_bb_gain.insert(defaults["bb_gain"])
+        self.ui.line_if_gain.insert(defaults["if_gain"])
 
         #default to 5dB
         self.ui.line_threshold.insert(defaults["threshold"])
@@ -143,6 +145,8 @@ class mainwindow(QtGui.QMainWindow):
         #hook up parameter-changed signals so we can change gain, rate, etc. while running
         self.ui.combo_rate.currentIndexChanged['QString'].connect(self.update_sample_rate)
         self.ui.line_gain.editingFinished.connect(self.update_gain)
+        self.ui.line_bb_gain.editingFinished.connect(self.update_bb_gain)
+        self.ui.line_if_gain.editingFinished.connect(self.update_if_gain)
         self.ui.combo_source.currentIndexChanged['QString'].connect(self.populate_source_options)
 
         #hook up live data text box update signal
@@ -161,6 +165,14 @@ class mainwindow(QtGui.QMainWindow):
         if self.running:
             self._radio.set_gain(float(self.ui.line_gain.text()))
 
+    def update_bb_gain(self):
+        if self.running:
+            self._radio.set_bb_gain(float(self.ui.line_bb_gain.text()))
+
+    def update_if_gain(self):
+        if self.running:
+            self._radio.set_if_gain(float(self.ui.line_if_gain.text()))
+
 ############ widget update functions for non-mapped widgets ############
     def update_heading_widget(self, index):
         if index.model() is not None:
@@ -302,6 +314,8 @@ class mainwindow(QtGui.QMainWindow):
             options.rate = float(self.ui.combo_rate.currentText()) * 1e6
             options.antenna = str(self.ui.combo_ant.currentText())
             options.gain = float(self.ui.line_gain.text())
+            options.bb_gain = float(self.ui.line_bb_gain.text())
+            options.if_gain = float(self.ui.line_if_gain.text())
             options.threshold = float(self.ui.line_threshold.text())
             options.pmf = self.ui.check_pmf.isChecked()
             options.dcblock = self.ui.check_dcblock.isChecked()
@@ -387,6 +401,8 @@ class mainwindow(QtGui.QMainWindow):
             self.prefs["samplerate"] = options.rate
             self.prefs["antenna"] = options.antenna
             self.prefs["gain"] = options.gain
+            self.prefs["bb_gain"] = options.bb_gain
+            self.prefs["if_gain"] = options.if_gain
             self.prefs["pmf"] = "1" if options.pmf else "0"
             self.prefs["dcblock"] = "1" if options.dcblock else "0"
             self.prefs["source"] = self.ui.combo_source.currentText()
@@ -450,7 +466,9 @@ class mainwindow(QtGui.QMainWindow):
         defaults["pmf"] = None
         defaults["dcblock"] = None
         defaults["antenna"] = None
-        defaults["gain"] = "25"
+        defaults["gain"] = "10"
+        defaults["bb_gain"] = "20"
+        defaults["if_gain"] = "20"
         defaults["kml"] = "1"
         defaults["kmlfile"] = "modes.kml"
         defaults["sbs1"] = "0"
diff --git a/res/modes_rx.ui b/res/modes_rx.ui
index 52e5793..5e6a220 100644
--- a/res/modes_rx.ui
+++ b/res/modes_rx.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>687</width>
-    <height>422</height>
+    <height>460</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -103,7 +103,7 @@
               <x>10</x>
               <y>20</y>
               <width>236</width>
-              <height>251</height>
+              <height>300</height>
              </rect>
             </property>
             <property name="title">
@@ -210,7 +210,7 @@
                <x>-1</x>
                <y>117</y>
                <width>221</width>
-               <height>71</height>
+               <height>130</height>
               </rect>
              </property>
              <property name="currentIndex">
@@ -221,7 +221,7 @@
                <property name="geometry">
                 <rect>
                  <x>90</x>
-                 <y>40</y>
+                 <y>100</y>
                  <width>121</width>
                  <height>27</height>
                 </rect>
@@ -237,7 +237,27 @@
                 </rect>
                </property>
               </widget>
-              <widget class="QLabel" name="label_2">
+              <widget class="QLineEdit" name="line_bb_gain">
+               <property name="geometry">
+                <rect>
+                 <x>90</x>
+                 <y>40</y>
+                 <width>71</width>
+                 <height>27</height>
+                </rect>
+               </property>
+              </widget>
+              <widget class="QLineEdit" name="line_if_gain">
+               <property name="geometry">
+                <rect>
+                 <x>90</x>
+                 <y>70</y>
+                 <width>71</width>
+                 <height>27</height>
+                </rect>
+               </property>
+              </widget>
+              <widget class="QLabel" name="label_gain">
                <property name="geometry">
                 <rect>
                  <x>10</x>
@@ -247,10 +267,10 @@
                 </rect>
                </property>
                <property name="text">
-                <string>Gain</string>
+                <string>RF Gain</string>
                </property>
               </widget>
-              <widget class="QLabel" name="label_4">
+              <widget class="QLabel" name="label_bbgain">
                <property name="geometry">
                 <rect>
                  <x>10</x>
@@ -259,11 +279,37 @@
                  <height>17</height>
                 </rect>
                </property>
+               <property name="text">
+                <string>BB Gain</string>
+               </property>
+              </widget>
+              <widget class="QLabel" name="label_ifgain">
+               <property name="geometry">
+                <rect>
+                 <x>10</x>
+                 <y>70</y>
+                 <width>66</width>
+                 <height>17</height>
+                </rect>
+               </property>
+               <property name="text">
+                <string>IF Gain</string>
+               </property>
+              </widget>
+              <widget class="QLabel" name="label_4antenna">
+               <property name="geometry">
+                <rect>
+                 <x>10</x>
+                 <y>100</y>
+                 <width>66</width>
+                 <height>17</height>
+                </rect>
+               </property>
                <property name="text">
                 <string>Antenna</string>
                </property>
               </widget>
-              <widget class="QLabel" name="label_18">
+              <widget class="QLabel" name="label_db">
                <property name="geometry">
                 <rect>
                  <x>160</x>
@@ -307,7 +353,7 @@
              <property name="geometry">
               <rect>
                <x>10</x>
-               <y>200</y>
+               <y>270</y>
                <width>221</width>
                <height>22</height>
               </rect>
@@ -320,7 +366,7 @@
              <property name="geometry">
               <rect>
                <x>10</x>
-               <y>220</y>
+               <y>250</y>
                <width>221</width>
                <height>22</height>
               </rect>
@@ -947,7 +993,7 @@
            </attribute>
            <layout class="QGridLayout" name="gridLayout_8">
             <item row="0" column="0">
-             <widget class="QWebView" name="mapView" native="true"/>
+             <widget class="QWebView" name="mapView"/>
             </item>
            </layout>
           </widget>
@@ -1032,13 +1078,19 @@
      <x>0</x>
      <y>0</y>
      <width>687</width>
-     <height>25</height>
+     <height>27</height>
     </rect>
    </property>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>QWebView</class>
+   <extends>QWidget</extends>
+   <header>QtWebKitWidgets/QWebView</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>QwtDial</class>
    <extends>QWidget</extends>
@@ -1055,12 +1107,6 @@
    <extends>QwtDial</extends>
    <header>qwt_compass.h</header>
   </customwidget>
-  <customwidget>
-   <class>QWebView</class>
-   <extends>QWidget</extends>
-   <header location="global">QtWebKit/qwebview.h</header>
-   <container>1</container>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>