SoapySDR: fixed some GUI issues

app/main.cpp

@@ -35,7 +35,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
 */
 	QCoreApplication::setOrganizationName("f4exb");
 	QCoreApplication::setApplicationName("SDRangel");
-    QCoreApplication::setApplicationVersion("4.4.3");
+    QCoreApplication::setApplicationVersion("4.4.4");
 #if QT_VERSION >= 0x050600
 	QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support
     QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps

appbench/main.cpp

@@ -57,7 +57,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
 
     QCoreApplication::setOrganizationName("f4exb");
     QCoreApplication::setApplicationName("SDRangelBench");
-    QCoreApplication::setApplicationVersion("4.4.3");
+    QCoreApplication::setApplicationVersion("4.4.4");
 
     int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP};
     std::vector<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int));

appsrv/main.cpp

@@ -56,7 +56,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
 
     QCoreApplication::setOrganizationName("f4exb");
     QCoreApplication::setApplicationName("SDRangelSrv");
-    QCoreApplication::setApplicationVersion("4.4.3");
+    QCoreApplication::setApplicationVersion("4.4.4");
 
     int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP};
     std::vector<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int));

debian/changelog

@@ -1,3 +1,9 @@
+sdrangel (4.4.4-1) unstable; urgency=medium
+
+  * SoapySDR: fixed some GUI issues
+
+ -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Sun, 10 Feb 2019 10:14:18 +0100
+  
 sdrangel (4.4.3-1) unstable; urgency=medium
 
   * Migration of SDRDaemon* devices to Remote* devices 

plugins/samplesink/soapysdroutput/soapysdroutputgui.ui

@@ -245,6 +245,9 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_ppm">
+     <property name="bottomMargin">
+      <number>4</number>
+     </property>
      <item>
       <widget class="QLabel" name="LOppmLabel">
        <property name="text">
@@ -289,6 +292,13 @@
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QScrollArea" name="scrollArea">
      <property name="widgetResizable">
@@ -300,7 +310,7 @@
         <x>0</x>
         <y>0</y>
         <width>318</width>
-        <height>53</height>
+        <height>49</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_3">

plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp

@@ -31,7 +31,7 @@
 
 const PluginDescriptor SoapySDROutputPlugin::m_pluginDescriptor = {
     QString("SoapySDR Output"),
-    QString("4.4.1"),
+    QString("4.4.4"),
     QString("(c) Edouard Griffiths, F4EXB"),
     QString("https://github.com/f4exb/sdrangel"),
     true,

plugins/samplesource/soapysdrinput/soapysdrinputgui.ui

@@ -321,6 +321,9 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_ppm">
+     <property name="bottomMargin">
+      <number>4</number>
+     </property>
      <item>
       <widget class="QLabel" name="LOppmLabel">
        <property name="text">
@@ -365,6 +368,13 @@
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QScrollArea" name="scrollArea">
      <property name="verticalScrollBarPolicy">
@@ -379,7 +389,7 @@
         <x>0</x>
         <y>0</y>
         <width>318</width>
-        <height>53</height>
+        <height>49</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_3">

plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp

@@ -30,7 +30,7 @@
 
 const PluginDescriptor SoapySDRInputPlugin::m_pluginDescriptor = {
     QString("SoapySDR Input"),
-    QString("4.4.1"),
+    QString("4.4.4"),
     QString("(c) Edouard Griffiths, F4EXB"),
     QString("https://github.com/f4exb/sdrangel"),
     true,

sdrgui/soapygui/complexfactorgui.cpp

@@ -47,12 +47,16 @@ bool ComplexFactorGUI::getAutomatic() const
 
 void ComplexFactorGUI::setModule(double value)
 {
-    ui->module->setValue((int) (value < -1.0 ? -1.0 : value > 1.0 ? 1.0 : value)*100.0f);
+    double modValue = value < -1.0 ? -1.0 : value > 1.0 ? 1.0 : value;
+    ui->module->setValue((int) modValue*100.0f);
+    ui->moduleText->setText(tr("%1").arg(modValue, 0, 'f', 2));
 }
 
 void ComplexFactorGUI::setArgument(double value)
 {
-    ui->module->setValue((int) (value < -180.0 ? -180.0 : value > 180.0 ? 180.0 : value));
+    int argValue = (int) (value < -180.0 ? -180.0 : value > 180.0 ? 180.0 : value);
+    ui->arg->setValue(argValue);
+    ui->argText->setText(tr("%1").arg(value));
 }
 
 void ComplexFactorGUI::setAutomatic(bool automatic)
@@ -84,10 +88,12 @@ void ComplexFactorGUI::on_automatic_toggled(bool set)
 
 void ComplexFactorGUI::on_module_valueChanged(int value)
 {
-    emit moduleChanged(value / 100.0f);
+    ui->moduleText->setText(tr("%1").arg(value/100.0f, 0, 'f', 2));
+    emit moduleChanged(value/100.0f);
 }
 
 void ComplexFactorGUI::on_arg_valueChanged(int value)
 {
+    ui->argText->setText(tr("%1").arg(value));
     emit argumentChanged(value);
 }

sdrgui/soapygui/complexfactorgui.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>307</width>
+    <width>300</width>
-    <height>51</height>
+    <height>58</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -18,8 +18,8 @@
   </property>
   <property name="minimumSize">
    <size>
-    <width>0</width>
+    <width>300</width>
-    <height>30</height>
+    <height>58</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -53,6 +53,9 @@
     </item>
     <item>
      <widget class="QCheckBox" name="automatic">
+      <property name="toolTip">
+       <string>Automatic setting</string>
+      </property>
       <property name="layoutDirection">
        <enum>Qt::RightToLeft</enum>
       </property>
@@ -67,6 +70,9 @@ QCheckBox::indicator::checked {background: rgb(255, 157, 38);}</string>
     </item>
     <item>
      <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="spacing">
+       <number>0</number>
+      </property>
       <property name="leftMargin">
        <number>6</number>
       </property>
@@ -91,7 +97,7 @@ QCheckBox::indicator::checked {background: rgb(255, 157, 38);}</string>
         <item>
          <widget class="QSlider" name="module">
           <property name="toolTip">
-           <string>Normalized module</string>
+           <string>Complex modulus normalized</string>
           </property>
           <property name="minimum">
            <number>0</number>
@@ -143,7 +149,7 @@ QCheckBox::indicator::checked {background: rgb(255, 157, 38);}</string>
         <item>
          <widget class="QSlider" name="arg">
           <property name="toolTip">
-           <string>Argument (angle) in degrees</string>
+           <string>Complex argument (angle) in degrees</string>
           </property>
           <property name="minimum">
            <number>-180</number>