From cd5a92520856c94bb83b40f955b2519b8ac7512e Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 5 Dec 2022 13:17:46 -0500 Subject: [PATCH] Removing more unneeded GUI items. --- q65w/mainwindow.cpp | 45 ----------------------- q65w/mainwindow.h | 2 -- q65w/mainwindow.ui | 88 ++++++++------------------------------------- 3 files changed, 14 insertions(+), 121 deletions(-) diff --git a/q65w/mainwindow.cpp b/q65w/mainwindow.cpp index 7a5c28e89..19dbf34a3 100644 --- a/q65w/mainwindow.cpp +++ b/q65w/mainwindow.cpp @@ -754,26 +754,6 @@ void MainWindow::on_actionAbout_triggered() //Display "About" dlg.exec(); } -void MainWindow::on_autoButton_clicked() //Auto -{ - m_auto = !m_auto; - if(m_auto) { - ui->autoButton->setStyleSheet(m_pbAutoOn_style); - ui->autoButton->setText("Auto is ON"); - } else { - btxok=false; - ui->autoButton->setStyleSheet(""); - ui->autoButton->setText("Auto is OFF"); - on_monitorButton_clicked(); - } -} - -void MainWindow::on_stopTxButton_clicked() //Stop Tx -{ - if(m_auto) on_autoButton_clicked(); - btxok=false; -} - void MainWindow::keyPressEvent( QKeyEvent *e ) //keyPressEvent { switch(e->key()) @@ -1369,9 +1349,6 @@ void MainWindow::guiUpdate() } qint64 ms = QDateTime::currentMSecsSinceEpoch() % 86400000; int nsec=ms/1000; - double tsec=0.001*ms; - double t2p=fmod(tsec,120.0); - bool bTxTime = (t2p >= tx1) and (t2p < tx2); if(bTune0 and !bTune) { btxok=false; @@ -1381,28 +1358,6 @@ void MainWindow::guiUpdate() if(bTune and !bTune0) bMonitoring0=m_monitoring; bTune0=bTune; - if(m_auto or bTune) { - if((bTxTime or bTune) and iptt==0 and !m_txMute) { - int itx=1; - int ierr = ptt_(&m_pttPort,&itx,&iptt); // Raise PTT - if(ierr != 0) { - on_stopTxButton_clicked(); - char s[18]; - sprintf(s,"Cannot open COM%d",m_pttPort); - msgBox(s); - } - - if(m_bIQxt) m_wide_graph_window->tx570(); // Set Si570 to Tx Freq - - if(!soundOutThread.isRunning()) { - soundOutThread.start(QThread::HighPriority); - } - } - if((!bTxTime and !bTune) or m_txMute) { - btxok=false; - } - } - // If PTT was just raised, start a countdown for raising TxOK: if(iptt==1 && iptt0==0) nc1=-9; // TxDelay = 0.8 s if(nc1 <= 0) nc1++; diff --git a/q65w/mainwindow.h b/q65w/mainwindow.h index f067476c3..44db5e814 100644 --- a/q65w/mainwindow.h +++ b/q65w/mainwindow.h @@ -61,8 +61,6 @@ private slots: void on_actionAbout_triggered(); void on_actionLinrad_triggered(); void on_actionCuteSDR_triggered(); - void on_autoButton_clicked(); - void on_stopTxButton_clicked(); void on_tolSpinBox_valueChanged(int arg1); void on_actionAstro_Data_triggered(); void on_stopButton_clicked(); diff --git a/q65w/mainwindow.ui b/q65w/mainwindow.ui index ba778778f..5f61e48b1 100644 --- a/q65w/mainwindow.ui +++ b/q65w/mainwindow.ui @@ -6,7 +6,7 @@ 0 0 - 635 + 472 523 @@ -18,7 +18,7 @@ - 635 + 472 0 @@ -111,19 +111,6 @@ p, li { white-space: pre-wrap; } - - - - - 50 - 0 - - - - Log &QSO - - - @@ -188,44 +175,6 @@ p, li { white-space: pre-wrap; } - - - - - 0 - 0 - - - - - 50 - 0 - - - - &Auto is OFF - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - St&op Tx - - - @@ -647,17 +596,17 @@ p, li { white-space: pre-wrap; } - - - - - - - - - - - + + + Qt::Horizontal + + + + 40 + 20 + + + @@ -670,7 +619,7 @@ p, li { white-space: pre-wrap; } 0 0 - 635 + 472 21 @@ -682,12 +631,9 @@ p, li { white-space: pre-wrap; } - - - @@ -697,12 +643,6 @@ p, li { white-space: pre-wrap; } - - - - - -