Sliders bug fix

#18

mainwindow.cpp

@@ -1081,56 +1081,105 @@ void MainWindow::on_spinBox_RPToffset_valueChanged(int arg1)
 
 //***** Slider *****
 
-void MainWindow::on_verticalSlider_RFpower_valueChanged(int value)
-{
-    if (!rigCmd.rfPower)
-    {
-        if (value < 5) value = 5;
-        rigSet.rfPower = (float)(value)/100;
-        if (rigSet.rfPower != rigGet.rfPower) rigCmd.rfPower = 1;
-    }
-}
-
 void MainWindow::on_verticalSlider_RFgain_valueChanged(int value)
 {
-    if (!rigCmd.rfGain)
+    if (!rigCmd.rfGain && !ui->verticalSlider_RFgain->isSliderDown())
     {
         rigSet.rfGain = (float)(value)/100;
         if (rigSet.rfGain != rigGet.rfGain) rigCmd.rfGain = 1;
     }
 }
 
+void MainWindow::on_verticalSlider_RFgain_sliderReleased()
+{
+    if (!rigCmd.rfGain)
+    {
+        rigSet.rfGain = (float)(ui->verticalSlider_RFgain->value())/100;
+        rigCmd.rfGain = 1;
+    }
+}
+
+
+void MainWindow::on_verticalSlider_RFpower_valueChanged(int value)
+{
+    if (!rigCmd.rfPower && !ui->verticalSlider_RFpower->isSliderDown())
+    {
+        if (value < 5) value = 5;   //to be fixed
+        rigSet.rfPower = (float)(value)/100;
+        if (rigSet.rfPower != rigGet.rfPower) rigCmd.rfPower = 1;
+    }
+}
+
+void MainWindow::on_verticalSlider_RFpower_sliderReleased()
+{
+    if (!rigCmd.rfPower)
+    {
+        rigSet.rfPower = (float)(ui->verticalSlider_RFpower->value())/100;
+        rigCmd.rfPower = 1;
+    }
+}
+
+
 void MainWindow::on_verticalSlider_AFGain_valueChanged(int value)
 {
-    if (!rigCmd.afGain)
+    if (!rigCmd.afGain && !ui->verticalSlider_AFGain->isSliderDown())
     {
         rigSet.afGain = (float)(value)/100;
         if (rigSet.afGain != rigGet.afGain) rigCmd.afGain = 1;
     }
 }
 
+void MainWindow::on_verticalSlider_AFGain_sliderReleased()
+{
+    if (!rigCmd.afGain)
+    {
+        rigSet.afGain = (float)(ui->verticalSlider_AFGain->value())/100;
+        rigCmd.afGain = 1;
+    }
+}
+
 
 void MainWindow::on_verticalSlider_Squelch_valueChanged(int value)
 {
-    if (!rigCmd.squelch)
+    if (!rigCmd.squelch && !ui->verticalSlider_Squelch->isSliderDown())
     {
         rigSet.squelch = (float)(value)/100;
         if (rigSet.squelch != rigGet.squelch) rigCmd.squelch = 1;
     }
 }
 
+void MainWindow::on_verticalSlider_Squelch_sliderReleased()
+{
+    if (!rigCmd.squelch)
+    {
+        rigSet.squelch = (float)(ui->verticalSlider_Squelch->value())/100;
+        rigCmd.squelch = 1;
+    }
+}
+
+
 void MainWindow::on_horizontalSlider_IFshift_valueChanged(int value)
 {
-    if (!rigCmd.ifShift)
+    if (!rigCmd.ifShift && !ui->horizontalSlider_IFshift->isSliderDown())
     {
         rigSet.ifShift = value;
         if (rigSet.ifShift != rigGet.ifShift) rigCmd.ifShift = 1;
     }
 }
 
+void MainWindow::on_horizontalSlider_IFshift_sliderReleased()
+{
+    if (!rigCmd.ifShift)
+    {
+        rigSet.ifShift = ui->horizontalSlider_IFshift->value();
+        rigCmd.ifShift = 1;
+    }
+}
+
+
 void MainWindow::on_horizontalSlider_clar_valueChanged(int value)
 {
-    if (!rigCmd.clar)
+    if (!rigCmd.clar && !ui->horizontalSlider_clar->isSliderDown())
     {
         if (rigSet.rit)
         {
@@ -1145,6 +1194,24 @@ void MainWindow::on_horizontalSlider_clar_valueChanged(int value)
      }
 }
 
+void MainWindow::on_horizontalSlider_clar_sliderReleased()
+{
+    if (!rigCmd.clar)
+    {
+        if (rigSet.rit)
+        {
+            rigSet.ritOffset = ui->horizontalSlider_clar->value();
+            rigCmd.clar = 1;
+        }
+        else
+        {
+            rigSet.xitOffset = ui->horizontalSlider_clar->value();
+            rigCmd.clar = 1;
+        }
+     }
+}
+
+
 //***** Menu *****
 
 void MainWindow::on_action_Connection_triggered()

mainwindow.h

@@ -25,7 +25,7 @@
 
 #define RELEASE_DATE __DATE__
 #define VERSION_MAJ 1
-#define VERSION_MIN 2
+#define VERSION_MIN 3
 #define VERSION_MIC 0
 
 
@@ -173,6 +173,18 @@ private slots:
 
     void on_radioButton_clarXIT_toggled(bool checked);
 
+    void on_verticalSlider_RFpower_sliderReleased();
+
+    void on_verticalSlider_RFgain_sliderReleased();
+
+    void on_verticalSlider_AFGain_sliderReleased();
+
+    void on_verticalSlider_Squelch_sliderReleased();
+
+    void on_horizontalSlider_IFshift_sliderReleased();
+
+    void on_horizontalSlider_clar_sliderReleased();
+
 private:
     Ui::MainWindow *ui;
     QTimer *timer;

mainwindow.ui

@@ -779,7 +779,7 @@
      <string>Filter</string>
     </property>
     <layout class="QGridLayout" name="gridLayout_5">
-     <item row="1" column="0">
+     <item row="2" column="0">
       <widget class="QCheckBox" name="checkBox_NR">
        <property name="toolTip">
         <string>Noise Reduction</string>
@@ -789,27 +789,30 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="0" colspan="2">
-      <widget class="QCheckBox" name="checkBox_NAR">
-       <property name="toolTip">
-        <string>BW Narrow</string>
+     <item row="5" column="2">
+      <widget class="QLabel" name="label_IFshiftValue">
+       <property name="enabled">
+        <bool>true</bool>
        </property>
        <property name="text">
-        <string>NAR</string>
+        <string>0</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
        </property>
       </widget>
      </item>
-     <item row="4" column="0" colspan="2">
-      <widget class="QLabel" name="label_IFshift">
-       <property name="text">
-        <string>IF-Shift</string>
+     <item row="0" column="2">
+      <widget class="QCheckBox" name="checkBox_NB2">
+       <property name="enabled">
+        <bool>false</bool>
        </property>
-       <property name="buddy">
-        <cstring>horizontalSlider_IFshift</cstring>
+       <property name="text">
+        <string>NB2</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
+     <item row="3" column="0">
       <widget class="QCheckBox" name="checkBox_NF">
        <property name="toolTip">
         <string>Notch Filter</string>
@@ -819,7 +822,47 @@
        </property>
       </widget>
      </item>
-     <item row="5" column="0" colspan="3">
+     <item row="2" column="2">
+      <widget class="QSpinBox" name="spinBox_NR">
+       <property name="minimum">
+        <number>1</number>
+       </property>
+       <property name="maximum">
+        <number>15</number>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0" colspan="2">
+      <widget class="QCheckBox" name="checkBox_NAR">
+       <property name="toolTip">
+        <string>BW Narrow</string>
+       </property>
+       <property name="text">
+        <string>NAR</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="0" colspan="2">
+      <widget class="QLabel" name="label_IFshift">
+       <property name="text">
+        <string>IF-Shift</string>
+       </property>
+       <property name="buddy">
+        <cstring>horizontalSlider_IFshift</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QCheckBox" name="checkBox_NB">
+       <property name="toolTip">
+        <string>Noise Blanking</string>
+       </property>
+       <property name="text">
+        <string>NB</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="0" colspan="3">
       <widget class="QSlider" name="horizontalSlider_IFshift">
        <property name="minimum">
         <number>-1200</number>
@@ -841,49 +884,6 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="2">
-      <widget class="QSpinBox" name="spinBox_NR">
-       <property name="minimum">
-        <number>1</number>
-       </property>
-       <property name="maximum">
-        <number>15</number>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="2">
-      <widget class="QLabel" name="label_IFshiftValue">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-       <property name="text">
-        <string>0</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0">
-      <widget class="QCheckBox" name="checkBox_NB">
-       <property name="toolTip">
-        <string>Noise Blanking</string>
-       </property>
-       <property name="text">
-        <string>NB</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1" colspan="2">
-      <widget class="QCheckBox" name="checkBox_NB2">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>NB2</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </widget>
    <widget class="QFrame" name="frame_2">