From 8db7c2c1283117da8a66f12f8be1a456473c3f78 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 2 Feb 2023 12:18:28 -0500 Subject: [PATCH] Revert "Implement an option for temporary manual rig control. Useful for CW EME ??" This reverts commit b5a045c63b61ce9f747ea261d3442b3aa7d453a6. --- widgets/mainwindow.cpp | 13 +------------ widgets/mainwindow.ui | 11 +++-------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 535a475d4..f84212f93 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -1075,8 +1075,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, ui->labDXped->setVisible(SpecOp::NONE != m_specOp); ui->labDXped->setStyleSheet("QLabel {background-color: red; color: white;}"); ui->pbBestSP->setVisible(m_mode=="FT4"); - ui->readFreq->setEnabled(true); //To enable manual rig-control option - // this must be the last statement of constructor if (!m_valid) throw std::runtime_error {"Fatal initialization exception"}; @@ -7800,15 +7798,6 @@ void MainWindow::on_readFreq_clicked() { if (m_transmitting) return; -// CTRL+click on the rig-mode button to allow temporary manual rig control. - bool b=QApplication::keyboardModifiers().testFlag(Qt::ControlModifier); - if(b and m_config.is_transceiver_online()) { - m_config.transceiver_offline(); - update_dynamic_property (ui->readFreq, "state", "manual"); - ui->readFreq->setText("M"); - return; - } - if (m_config.transceiver_online ()) { m_config.sync_transceiver (true, true); @@ -7948,7 +7937,7 @@ void MainWindow::handle_transceiver_update (Transceiver::TransceiverState const& displayDialFrequency (); update_dynamic_property (ui->readFreq, "state", "ok"); -// ui->readFreq->setEnabled (false); //Leave it enabled to allow Manual rig control option + ui->readFreq->setEnabled (false); ui->readFreq->setText (s.split () ? "S" : ""); } diff --git a/widgets/mainwindow.ui b/widgets/mainwindow.ui index e1a250cb6..e5ed6cefe 100644 --- a/widgets/mainwindow.ui +++ b/widgets/mainwindow.ui @@ -42,7 +42,6 @@ 10 - 50 false @@ -186,7 +185,6 @@ 10 - 50 false @@ -3102,10 +3100,10 @@ QLabel[oob="true"] { false - <html><head/><body><p>If orange or red there has been a rig control failure, click to reset and read the dial frequency. S implies split mode. CTRL-click for temporary manual rig control, signified by yellow.</p></body></html> + <html><head/><body><p>If orange or red there has been a rig control failure, click to reset and read the dial frequency. S implies split mode.</p></body></html> - <html><head/><body><p>If orange or red there has been a rig control failure, click to reset and read the dial frequency. S implies split mode. CTRL-click for temporary manual rig control, signified by yellow.</p></body></html> + If orange or red there has been a rig control failure, click to reset and read the dial frequency. S implies split mode. QPushButton { @@ -3129,9 +3127,6 @@ QPushButton[state="error"] { QPushButton[state="warning"] { background-color: orange; } -QPushButton[state="manual"] { - background-color: yellow; -} QPushButton[state="ok"] { background-color: #00ff00; } @@ -3156,7 +3151,7 @@ QPushButton[state="ok"] { 0 0 880 - 21 + 22