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

Repair some QSO sequencing defects

Browse Source
This commit is contained in:
Bill Somerville 2021-03-12 23:28:33 +00:00
parent 24b4e4a540
commit 834630e2d4
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Decoder/decodedtext.cpp
View File

@ -23,7 +23,7 @@ DecodedText::DecodedText (QString const& the_string)
, is_standard_ {false} , is_standard_ {false}
{ {
// discard appended AP info // discard appended AP info
clean_string_.replace (QRegularExpression {R"(^(.*)(?:(?:\?\s)?a[0-9].*)$)"}, "\\1"); clean_string_.replace (QRegularExpression {R"(^(.*?)(?:\?\s)?a[0-9].*$)"}, "\\1");
// qDebug () << "DecodedText: the_string:" << the_string << "Nbsp pos:" << the_string.indexOf (QChar::Nbsp); // qDebug () << "DecodedText: the_string:" << the_string << "Nbsp pos:" << the_string.indexOf (QChar::Nbsp);
if (message_.length() >= 1) if (message_.length() >= 1)

24
widgets/mainwindow.cpp
View File

@ -4984,7 +4984,7 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
auto const& word_3 = message_words.at (3); auto const& word_3 = message_words.at (3);
auto word_3_as_number = word_3.toInt (); auto word_3_as_number = word_3.toInt ();
if (("RRR" == word_3 if (("RRR" == word_3
|| word_3_as_number == 73 || (word_3_as_number == 73 && ROGERS == m_QSOProgress)
|| "RR73" == word_3 || "RR73" == word_3
|| ("R" == word_3 && m_QSOProgress != REPORT))) { || ("R" == word_3 && m_QSOProgress != REPORT))) {
if(m_mode=="FT4" and "RR73" == word_3) m_dateTimeRcvdRR73=QDateTime::currentDateTimeUtc(); if(m_mode=="FT4" and "RR73" == word_3) m_dateTimeRcvdRR73=QDateTime::currentDateTimeUtc();
@ -5013,11 +5013,31 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
m_ntx=4; m_ntx=4;
ui->txrb4->setChecked(true); ui->txrb4->setChecked(true);
} }
else else if ((m_QSOProgress > CALLING && m_QSOProgress < ROGERS)
|| word_3.contains (QRegularExpression {"^RR(?:R|73)$"}))
{ {
m_ntx=5; m_ntx=5;
ui->txrb5->setChecked(true); ui->txrb5->setChecked(true);
} }
else if (ROGERS == m_QSOProgress)
{
logQSOTimer.start(0);
m_ntx=6;
ui->txrb6->setChecked(true);
}
else
{
// just work them (again)
if (ui->tx1->isEnabled ()) {
m_ntx = 1;
m_QSOProgress = REPLYING;
ui->txrb1->setChecked (true);
} else {
m_ntx=2;
m_QSOProgress = REPORT;
ui->txrb2->setChecked (true);
}
}
} }
if (m_QSOProgress >= ROGER_REPORT) if (m_QSOProgress >= ROGER_REPORT)
{ {