w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Bill Somerville 2017-07-26 01:39:04 +00:00
parent 3cefca20b6
commit 5864c04d26
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mainwindow.cpp
View File

@ -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 ();

3
mainwindow.h
View File

@ -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;

4
mainwindow.ui
View File

@ -1235,7 +1235,7 @@ QLabel[oob="true"] {
</widget>
</item>
<item row="4" column="1" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
<widget class="QRadioButton" name="txrb4">
<widget class="DoubleClickableRadioButton" name="txrb4">
<property name="toolTip">
<string>Send this message in next Tx interval</string>
</property>
@ -1251,7 +1251,7 @@ QLabel[oob=&quot;true&quot;] {
</widget>
</item>
<item row="4" column="2">
<widget class="QPushButton" name="txb4">
<widget class="DoubleClickablePushButton" name="txb4">
<property name="maximumSize">
<size>
<width>30</width>