w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-02-03 09:44:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix the nonstandard callsign bug in v2.5.3.

Browse Source
This commit is contained in:
Joe Taylor 2021-12-27 12:26:22 -05:00
parent d99c6adf4d
commit b68c544ef7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
widgets/mainwindow.cpp
View File

@ -3643,9 +3643,8 @@ void MainWindow::auto_sequence (DecodedText const& message, unsigned start_toler
{ {
auto const& message_words = message.messageWords (); auto const& message_words = message.messageWords ();
auto is_73 = message_words.filter (QRegularExpression {"^(73|RR73)$"}).size(); auto is_73 = message_words.filter (QRegularExpression {"^(73|RR73)$"}).size();
auto const& msg_no_hash = message.clean_string ().mid(22).remove("<").remove(">");
bool is_OK=false; bool is_OK=false;
if(m_mode=="MSK144" && msg_no_hash.indexOf(ui->dxCallEntry->text()+" R ")>0) is_OK=true; if(m_mode=="MSK144" and message.clean_string ().indexOf(ui->dxCallEntry->text()+" R ")>0) is_OK=true;
if (message_words.size () > 3 && (message.isStandardMessage() || (is_73 or is_OK))) { if (message_words.size () > 3 && (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)
@ -3660,7 +3659,7 @@ 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
auto const& w = msg_no_hash.split(" ",SkipEmptyParts); QStringList w=message.clean_string ().mid(22).remove("<").remove(">").split(" ",SkipEmptyParts);
QString w2; QString w2;
int nrpt=0; int nrpt=0;
if (w.size () > 2) if (w.size () > 2)
@ -7770,7 +7769,7 @@ void MainWindow::replyToCQ (QTime time, qint32 snr, float delta_time, quint32 de
QString format_string {"%1 %2 %3 %4 %5 %6"}; QString format_string {"%1 %2 %3 %4 %5 %6"};
auto const& time_string = time.toString ("~" == mode || "&" == mode || "+" == mode auto const& time_string = time.toString ("~" == mode || "&" == mode || "+" == mode
|| (m_TRperiod < 60. && ("`" == mode || ":" == mode)) || (m_TRperiod < 60. && ("`" == mode || ":" == mode))
? "hhmmss" : "hhmm"); ? "hhmmss" : "hhmm");
auto text = message_text; auto text = message_text;
auto ap_pos = text.lastIndexOf (QRegularExpression {R"((?:\?\s)?(?:a[0-9]|q[0-9][0-9]?)$)"}); auto ap_pos = text.lastIndexOf (QRegularExpression {R"((?:\?\s)?(?:a[0-9]|q[0-9][0-9]?)$)"});
if (ap_pos >= 0) if (ap_pos >= 0)