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

Correct for "deCallAndGrid" not working for EU VHF contest messages.

Browse Source
This commit is contained in:
Joe Taylor 2020-04-24 10:33:23 -04:00
parent 571ed17089
commit ee04d864cf
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
widgets/mainwindow.cpp
View File

@ -4517,6 +4517,18 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
ui->dxCallEntry->setText(hiscall); ui->dxCallEntry->setText(hiscall);
} }
QStringList w=message.string().mid(22).remove("<").remove(">").split(" ",QString::SkipEmptyParts);
int nw=w.size();
if(nw>=4) {
// Temporary? Correct for the fact that message.deCallAndGrid() does not work for EU VHF contest messages
QString t=message_words.at(nw-2);
int n=w.at(nw-2).toInt();
if(n>=520001 and n<=592047) {
hiscall=w.at(1);
hisgrid=w.at(nw-1);
}
}
bool is_73 = message_words.filter (QRegularExpression {"^(73|RR73)$"}).size (); bool is_73 = message_words.filter (QRegularExpression {"^(73|RR73)$"}).size ();
if (!is_73 and !message.isStandardMessage() and !message.string().contains("<")) { if (!is_73 and !message.isStandardMessage() and !message.string().contains("<")) {
qDebug () << "Not processing message - hiscall:" << hiscall << "hisgrid:" << hisgrid qDebug () << "Not processing message - hiscall:" << hiscall << "hisgrid:" << hisgrid
@ -4577,7 +4589,6 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
|| dtext.contains (" " + m_baseCall + "/") || dtext.contains (" " + m_baseCall + "/")
|| (firstcall == "DE")) { || (firstcall == "DE")) {
QStringList w=message.string().mid(22).remove("<").remove(">").split(" ",QString::SkipEmptyParts);
QString w2; QString w2;
if(w.size()>=3) w2=w.at(2); if(w.size()>=3) w2=w.at(2);
QString w34; QString w34;