VFO Display on Sub VFO

#12

ChangeLog.txt

@@ -3,6 +3,7 @@ CatRadio
 (+ New, * Updated, - Removed)
 
 1.2.0 -
+	+ VFO Display on Sub VFO
 	+ Clarifier RIT/XIT commands
 	+ Up/Down VFO buttons
 	+ Repeater shift offset

mainwindow.cpp

@@ -85,7 +85,8 @@ MainWindow::MainWindow(QWidget *parent)
     connect(ui->horizontalSlider_IFshift, &QAbstractSlider::valueChanged, ui->label_IFshiftValue,QOverload<int>::of(&QLabel::setNum));
 
     //* Signal and Slot connection for vfoDisplay
-    connect(ui->lineEdit_vfoMain, &vfoDisplay::on_valueChanged, this, &MainWindow::on_vfoDisplayValueChanged);
+    connect(ui->lineEdit_vfoMain, &vfoDisplay::on_valueChanged, this, &MainWindow::on_vfoDisplayMainValueChanged);
+    connect(ui->lineEdit_vfoSub, &vfoDisplay::on_valueChanged, this, &MainWindow::on_vfoDisplaySubValueChanged);
 
     //* Thread for RigDaemon
     rigDaemon->moveToThread(&workerThread); //
@@ -266,7 +267,7 @@ void MainWindow::guiUpdate()
 
     //* VFOs
     ui->lineEdit_vfoMain->setValue(rigGet.freqMain);
-    ui->lineEdit_vfoSub->setText(QString::number(rigGet.freqSub/1000,'f',2));
+    ui->lineEdit_vfoSub->setValue(rigGet.freqSub);
 
     ui->label_vfoMain->setText(rig_strvfo(rigGet.vfoMain));
     switch (rigGet.vfoMain)
@@ -919,12 +920,18 @@ void MainWindow::on_dial_valueChanged(int value)
     }
 }
 
-void MainWindow::on_vfoDisplayValueChanged(int value)
+void MainWindow::on_vfoDisplayMainValueChanged(int value)
 {
     rigSet.freqMain = value;
     rigCmd.freqMain = 1;
 }
 
+void MainWindow::on_vfoDisplaySubValueChanged(int value)
+{
+    rigSet.freqSub = value;
+    rigCmd.freqSub = 1;
+}
+
 //***** ComboBox *****
 
 void MainWindow::on_comboBox_Mode_activated(int index)

mainwindow.h

@@ -45,7 +45,8 @@ public:
 public slots:
     void guiUpdate();
     void on_rigDaemonResultReady();    //Slot for rigDaemon resultReady
-    void on_vfoDisplayValueChanged(int value); //Slot for vfoDisplay valueChanged
+    void on_vfoDisplayMainValueChanged(int value); //Slot for vfoDisplay Main valueChanged
+    void on_vfoDisplaySubValueChanged(int value); //Slot for vfoDisplay Sub valueChanged
 
 signals:
 

mainwindow.ui

@@ -265,39 +265,6 @@
       <string>RX TX</string>
      </property>
     </widget>
-    <widget class="QLineEdit" name="lineEdit_vfoSub">
-     <property name="enabled">
-      <bool>true</bool>
-     </property>
-     <property name="geometry">
-      <rect>
-       <x>280</x>
-       <y>10</y>
-       <width>140</width>
-       <height>40</height>
-      </rect>
-     </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>18</pointsize>
-      </font>
-     </property>
-     <property name="layoutDirection">
-      <enum>Qt::RightToLeft</enum>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-     <property name="readOnly">
-      <bool>true</bool>
-     </property>
-    </widget>
     <widget class="QComboBox" name="comboBox_ModeSub">
      <property name="enabled">
       <bool>true</bool>
@@ -318,9 +285,9 @@
      <property name="geometry">
       <rect>
        <x>10</x>
-       <y>9</y>
-       <width>181</width>
-       <height>41</height>
+       <y>10</y>
+       <width>180</width>
+       <height>40</height>
       </rect>
      </property>
      <property name="cursor">
@@ -370,6 +337,16 @@
       </item>
      </layout>
     </widget>
+    <widget class="vfoDisplay" name="lineEdit_vfoSub" native="true">
+     <property name="geometry">
+      <rect>
+       <x>280</x>
+       <y>15</y>
+       <width>140</width>
+       <height>35</height>
+      </rect>
+     </property>
+    </widget>
    </widget>
    <widget class="QGroupBox" name="groupBox_Band">
     <property name="geometry">