w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-29 04:42:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat-fst280' of bitbucket.org:k1jt/wsjtx into feat-fst280

Browse Source
This commit is contained in:
Joe Taylor 2020-07-23 10:57:39 -04:00
commit 97773af107
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
widgets/displaytext.cpp
View File

@ -434,7 +434,13 @@ void DisplayText::displayDecodedText(DecodedText const& decodedText, QString con
QString extra; QString extra;
if (haveFSpread) if (haveFSpread)
{ {
extra = QString {"%1"}.arg (fSpread, 5, 'f', fSpread < 0.95 ? 3 : 2) + QChar {' '}; extra += QString {"%1"}.arg (fSpread, 5, 'f', fSpread < 0.95 ? 3 : 2) + QChar {' '};
}
auto ap_pos = message.lastIndexOf (QRegularExpression {R"((?:\?\s)?a[0-9]$)"});
if (ap_pos >= 0)
{
extra += message.mid (ap_pos) + QChar {' '};
message = message.left (ap_pos).trimmed ();
} }
m_CQPriority=""; m_CQPriority="";
if (CQcall) if (CQcall)

2
widgets/mainwindow.cpp
View File

@ -5606,6 +5606,8 @@ void MainWindow::on_tx6_editingFinished() //tx6 edited
void MainWindow::on_RoundRobin_currentTextChanged(QString text) void MainWindow::on_RoundRobin_currentTextChanged(QString text)
{ {
ui->sbTxPercent->setEnabled(text=="Random"); ui->sbTxPercent->setEnabled(text=="Random");
m_WSPR_tx_next = false; // cancel any pending Tx to avoid
// undesirable consecutive Tx periods
} }