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

Make message like "CQ YW18FIFA" acceptable.

Browse Source
This commit is contained in:
Joe Taylor 2018-07-27 16:50:58 -04:00
parent ab7b411ec0
commit d9838cf616
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mainwindow.cpp
View File

@ -3058,7 +3058,6 @@ void MainWindow::auto_sequence (DecodedText const& message, unsigned start_toler
auto is_73 = message_words.filter (QRegularExpression {"^(73|RR73)$"}).size (); auto is_73 = message_words.filter (QRegularExpression {"^(73|RR73)$"}).size ();
bool is_OK=false; bool is_OK=false;
if(m_mode=="MSK144" and message.string().indexOf(ui->dxCallEntry->text()+" R ")>0) is_OK=true; if(m_mode=="MSK144" and message.string().indexOf(ui->dxCallEntry->text()+" R ")>0) is_OK=true;
if (message_words.size () > 2 && (message.isStandardMessage () || (is_73 or is_OK))) { if (message_words.size () > 2 && (message.isStandardMessage () || (is_73 or is_OK))) {
auto df = message.frequencyOffset (); auto df = message.frequencyOffset ();
auto within_tolerance = (qAbs (ui->RxFreqSpinBox->value () - df) <= int (start_tolerance) auto within_tolerance = (qAbs (ui->RxFreqSpinBox->value () - df) <= int (start_tolerance)
@ -3073,11 +3072,14 @@ void MainWindow::auto_sequence (DecodedText const& message, unsigned start_toler
|| message_words.contains ("DE"))) || message_words.contains ("DE")))
|| !message.isStandardMessage ()); // free text 73/RR73 || !message.isStandardMessage ()); // free text 73/RR73
QString w2=message_words.at(2); QString w2=message_words.at(2);
QString w34=message_words.at(3); int nrpt=0;
int nrpt=w2.toInt(); if(message_words.size()>3) {
if(w2=="R") { QString w34=message_words.at(3);
nrpt=w34.toInt(); nrpt=w2.toInt();
w34=message_words.at(4); if(w2=="R") {
nrpt=w34.toInt();
w34=message_words.at(4);
}
} }
bool bEUvhf=(nrpt>=520001 and nrpt<=594000); bool bEUvhf=(nrpt>=520001 and nrpt<=594000);
if (m_auto if (m_auto