diff --git a/mainwindow.cpp b/mainwindow.cpp index 65cc98a..5c836c1 100644 --- a/mainwindow.cpp +++ b/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() diff --git a/mainwindow.h b/mainwindow.h index 1940de2..c033bde 100644 --- a/mainwindow.h +++ b/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; diff --git a/mainwindow.ui b/mainwindow.ui index 18b87ad..189cab9 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -779,7 +779,7 @@ Filter - + Noise Reduction @@ -789,27 +789,30 @@ - - - - BW Narrow + + + + true - NAR + 0 + + + Qt::AlignCenter - - - - IF-Shift + + + + false - - horizontalSlider_IFshift + + NB2 - + Notch Filter @@ -819,7 +822,47 @@ - + + + + 1 + + + 15 + + + + + + + BW Narrow + + + NAR + + + + + + + IF-Shift + + + horizontalSlider_IFshift + + + + + + + Noise Blanking + + + NB + + + + -1200 @@ -841,49 +884,6 @@ - - - - 1 - - - 15 - - - - - - - true - - - 0 - - - Qt::AlignCenter - - - - - - - Noise Blanking - - - NB - - - - - - - false - - - NB2 - - -