mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-06-25 06:35:17 -04:00
Fix the nonstandard callsign bug in v2.5.3.
This commit is contained in:
parent
d99c6adf4d
commit
b68c544ef7
@ -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)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user