From 5864c04d2681be0accebc7f5a101a53ca168b18f Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Wed, 26 Jul 2017 01:39:04 +0000 Subject: [PATCH] Option to use RR73 grid message as RRR message substitutes Enable or disable by double-clicking the Tx4 button or the adjacent radio button. Is auto disabled by a band change as it is expected that the user reassess the conditions to see if message repetitions are unlikely to be needed. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7950 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 18 ++++++++++++++++-- mainwindow.h | 3 +++ mainwindow.ui | 4 ++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 4c598660f..1e1346a73 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -215,6 +215,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, m_waterfallAvg {1}, m_ntx {1}, m_gen_message_is_cq {false}, + m_send_RR73 {false}, m_XIT {0}, m_sec0 {-1}, m_RxLog {1}, //Write Date and Time to RxLog @@ -3484,6 +3485,12 @@ void MainWindow::on_txrb4_toggled(bool status) } } +void MainWindow::on_txrb4_doubleClicked() +{ + m_send_RR73 = !m_send_RR73; + genStdMsgs (m_rpt); +} + void MainWindow::on_txrb5_toggled(bool status) { if (status) { @@ -3546,6 +3553,12 @@ void MainWindow::on_txb4_clicked() if (m_transmitting) m_restart=true; } +void MainWindow::on_txb4_doubleClicked() +{ + m_send_RR73 = !m_send_RR73; + genStdMsgs (m_rpt); +} + void MainWindow::on_txb5_clicked() { m_ntx=5; @@ -4021,7 +4034,7 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional) t=t+" OOO"; msgtype(t, ui->tx2); msgtype("RO", ui->tx3); - msgtype("RRR", ui->tx4); + msgtype(m_send_RR73 ? "RR73" : "RRR", ui->tx4); msgtype("73", ui->tx5->lineEdit ()); } else { int n=rpt.toInt(); @@ -4055,7 +4068,7 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional) t=t0 + "R" + rpt; msgtype(t, ui->tx3); } - t=t0 + "RRR"; + t=t0 + (m_send_RR73 ? "RR73" : "RRR"); if ((m_mode=="JT4" || m_mode=="QRA64") && m_bShMsgs) t="@1500 (RRR)"; msgtype(t, ui->tx4); t=t0 + "73"; @@ -5176,6 +5189,7 @@ void MainWindow::band_changed (Frequency f) // disable auto Tx if "blind" QSY outside of waterfall ui->stopTxButton->click (); // halt any transmission auto_tx_mode (false); // disable auto Tx + m_send_RR73 = false; // force user to reassess on new band } } m_lastBand.clear (); diff --git a/mainwindow.h b/mainwindow.h index 6af2e5e53..4404532da 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -160,6 +160,7 @@ private slots: void on_txrb2_toggled(bool status); void on_txrb3_toggled(bool status); void on_txrb4_toggled(bool status); + void on_txrb4_doubleClicked (); void on_txrb5_toggled(bool status); void on_txrb5_doubleClicked (); void on_txrb6_toggled(bool status); @@ -168,6 +169,7 @@ private slots: void on_txb2_clicked(); void on_txb3_clicked(); void on_txb4_clicked(); + void on_txb4_doubleClicked (); void on_txb5_clicked(); void on_txb5_doubleClicked (); void on_txb6_clicked(); @@ -367,6 +369,7 @@ private: qint32 m_waterfallAvg; qint32 m_ntx; bool m_gen_message_is_cq; + bool m_send_RR73; qint32 m_timeout; qint32 m_XIT; qint32 m_setftx; diff --git a/mainwindow.ui b/mainwindow.ui index 622c7f14c..84a8ff293 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -1235,7 +1235,7 @@ QLabel[oob="true"] { - + Send this message in next Tx interval @@ -1251,7 +1251,7 @@ QLabel[oob="true"] { - + 30