w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-25 13:48:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

New end-of-QSO sequencing logic (possibly temporary) for CQing FT4 station.

Browse Source 
When RR73 is received we log the QSO, turn "Call 1st" OFF, and call CQ again.
Also, allow Alt+C and F6 (the latter only if altenrate F1-F6 bindings
are active) to toggle "Call 1st" ON/OFF.
This commit is contained in:
Joe Taylor 2019-04-15 16:26:41 -04:00
parent f296e37630
commit b43d91240d
4 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Configuration.ui
View File

@ -457,7 +457,7 @@ quiet period when decoding is done.</string>
<item row="4" column="0">
<widget class="QCheckBox" name="alternate_bindings_check_box">
<property name="text">
<string>Alternate F1-F5 bindings</string>
<string>Alternate F1-F6 bindings</string>
</property>
</widget>
</item>
@ -3078,13 +3078,13 @@ Right click for insert and delete options.</string>
</connection>
</connections>
<buttongroups>
<buttongroup name="special_op_activity_button_group"/>
<buttongroup name="TX_mode_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="PTT_method_button_group"/>
<buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="split_mode_button_group"/>
<buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="TX_mode_button_group"/>
<buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="special_op_activity_button_group"/>
<buttongroup name="TX_audio_source_button_group"/>
</buttongroups>
</ui>

2
shortcuts.txt
View File

@ -8,7 +8,7 @@
<tr><td><b>F4 </b></td><td>Clear DX Call, DX Grid, Tx messages 1-4 (Alt: transmit Tx4)</td></tr>
<tr><td><b>Alt+F4 </b></td><td>Exit program</td></tr>
<tr><td><b>F5 </b></td><td>Display special mouse commands (Alt: transmit Tx5)</td></tr>
<tr><td><b>F6 </b></td><td>Open next file in directory</td></tr>
<tr><td><b>F6 </b></td><td>Open next file in directory (Alt: toggle Call 11t)</td></tr>
<tr><td><b>Shift+F6 </b></td><td>Decode all remaining files in directrory</td></tr>
<tr><td><b>F7 </b></td><td>Display Message Averaging window</td></tr>
<tr><td><b>F11 </b></td><td>Move Rx frequency down 1 Hz</td></tr>

39
widgets/mainwindow.cpp
View File

@ -994,9 +994,9 @@ void MainWindow::not_GA_warning_message ()
"<b><p align=\"center\">"
"This is a pre-release version of WSJT-X 2.1.0 made "
"available for testing purposes. It will become nonfunctional "
"after May 1, 2019.");
"after June 1, 2019.");
QDateTime now=QDateTime::currentDateTime();
QDateTime timeout=QDateTime(QDate(2019,5,1));
QDateTime timeout=QDateTime(QDate(2019,6,1));
if(now.daysTo(timeout) < 0) Q_EMIT finished();
}
@ -1892,9 +1892,15 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
}
int n;
bool bAltF1F5=m_config.alternate_bindings();
bool bAltF1F6=m_config.alternate_bindings();
switch(e->key())
{
case Qt::Key_C:
if(m_mode=="FT4" && e->modifiers() & Qt::AltModifier) {
bool b=ui->cbFirst->isChecked();
ui->cbFirst->setChecked(!b);
}
return;
case Qt::Key_D:
if(m_mode != "WSPR" && e->modifiers() & Qt::ShiftModifier) {
if(!m_decoderBusy) {
@ -1906,7 +1912,7 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
}
break;
case Qt::Key_F1:
if(bAltF1F5) {
if(bAltF1F6) {
auto_tx_mode(true);
on_txb6_clicked();
return;
@ -1915,7 +1921,7 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
return;
}
case Qt::Key_F2:
if(bAltF1F5) {
if(bAltF1F6) {
auto_tx_mode(true);
on_txb2_clicked();
return;
@ -1924,7 +1930,7 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
return;
}
case Qt::Key_F3:
if(bAltF1F5) {
if(bAltF1F6) {
auto_tx_mode(true);
on_txb3_clicked();
return;
@ -1933,7 +1939,7 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
return;
}
case Qt::Key_F4:
if(bAltF1F5) {
if(bAltF1F6) {
auto_tx_mode(true);
on_txb4_clicked();
return;
@ -1943,7 +1949,7 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
return;
}
case Qt::Key_F5:
if(bAltF1F5) {
if(bAltF1F6) {
auto_tx_mode(true);
on_txb5_clicked();
return;
@ -1952,8 +1958,16 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
return;
}
case Qt::Key_F6:
if(bAltF1F6) {
bool b=ui->cbFirst->isChecked();
ui->cbFirst->setChecked(!b);
return;
} else {
if(e->modifiers() & Qt::ShiftModifier) {
on_actionDecode_remaining_files_in_directory_triggered();
} else {
on_actionOpen_triggered();
}
return;
}
on_actionOpen_next_in_directory_triggered();
@ -4576,11 +4590,11 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
ui->tx3->setText(t);
m_bTUmsg=true;
} else {
// if(SpecOp::RTTY == m_config.special_op_id()) {
if(false) {
if(SpecOp::RTTY == m_config.special_op_id()) {
logQSOTimer.start(0);
m_ntx=6;
ui->txrb6->setChecked(true);
ui->cbFirst->setChecked(false);
} else {
m_ntx=5;
ui->txrb5->setChecked(true);
@ -5001,7 +5015,6 @@ void MainWindow::genStdMsgs(QString rpt, bool unconditional)
QDateTime now=QDateTime::currentDateTimeUtc();
int sinceTx3 = m_dateTimeSentTx3.secsTo(now);
int sinceRR73 = m_dateTimeRcvdRR73.secsTo(now);
// qDebug() << "aa" << m_bDoubleClicked << sinceTx3 << sinceRR73;
if(m_bDoubleClicked and (sinceTx3 < 15) and (sinceRR73 < 3)) {
t="TU; " + ui->tx3->text();
ui->tx3->setText(t);
@ -5150,8 +5163,7 @@ void MainWindow::TxAgain()
void MainWindow::clearDX ()
{
set_dateTimeQSO (-1);
if (m_QSOProgress != CALLING)
{
if (m_QSOProgress != CALLING) {
auto_tx_mode (false);
}
ui->dxCallEntry->clear ();
@ -8700,7 +8712,6 @@ void MainWindow::on_pbBestSP_clicked()
{
m_bBestSPArmed = !m_bBestSPArmed;
// ui->pbBestSP->setChecked(m_bBestSPArmed);
// qDebug() << "aa" << m_bBestSPArmed;
if(m_bBestSPArmed and !m_transmitting) ui->pbBestSP->setStyleSheet ("QPushButton{color:red}");
if(!m_bBestSPArmed) ui->pbBestSP->setStyleSheet ("");
}

3
widgets/mainwindow.ui
View File

@ -2813,9 +2813,6 @@ list. The list can be maintained in Settings (F2).</string>
<property name="text">
<string>Open next in directory</string>
</property>
<property name="shortcut">
<string>F6</string>
</property>
</action>
<action name="actionDecode_remaining_files_in_directory">
<property name="text">