diff --git a/ChangeLog.txt b/ChangeLog.txt index b64a40f..a08b499 100644 --- a/ChangeLog.txt +++ b/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 diff --git a/mainwindow.cpp b/mainwindow.cpp index 4b1f711..4db431a 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -85,7 +85,8 @@ MainWindow::MainWindow(QWidget *parent) connect(ui->horizontalSlider_IFshift, &QAbstractSlider::valueChanged, ui->label_IFshiftValue,QOverload::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) diff --git a/mainwindow.h b/mainwindow.h index 436a9de..1940de2 100644 --- a/mainwindow.h +++ b/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: diff --git a/mainwindow.ui b/mainwindow.ui index 96ca1bc..fadaa51 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -265,39 +265,6 @@ RX TX - - - true - - - - 280 - 10 - 140 - 40 - - - - - 0 - 0 - - - - - 18 - - - - Qt::RightToLeft - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - true @@ -318,9 +285,9 @@ 10 - 9 - 181 - 41 + 10 + 180 + 40 @@ -370,6 +337,16 @@ + + + + 280 + 15 + 140 + 35 + + +