From 06b4a8f664884b8d8b4854462e5c9fd9a7d0b62a Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 28 Dec 2018 13:24:03 -0500 Subject: [PATCH] Allow recognition of "CQ G DB5KN JO31" and similar as standard messages. --- decodedtext.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/decodedtext.cpp b/decodedtext.cpp index f466bb8d9..88f6bd621 100644 --- a/decodedtext.cpp +++ b/decodedtext.cpp @@ -65,7 +65,7 @@ QStringList DecodedText::messageWords () const QString DecodedText::CQersCall() const { - QRegularExpression callsign_re {R"(^(CQ|DE|QRZ)(\s?DX|\s([A-Z]{2,4}|\d{3}))?\s(?[A-Z0-9/]{2,})(\s[A-R]{2}[0-9]{2})?)"}; + QRegularExpression callsign_re {R"(^(CQ|DE|QRZ)(\s?DX|\s([A-Z]{1,4}|\d{3}))?\s(?[A-Z0-9/]{2,})(\s[A-R]{2}[0-9]{2})?)"}; return callsign_re.match (message_).captured ("callsign"); } @@ -167,9 +167,8 @@ void DecodedText::deCallAndGrid(/*out*/QString& call, QString& grid) const call = match.captured ("word2"); grid = match.captured ("word3"); if ("R" == grid) grid = match.captured ("word4"); - if(match.captured("word1")=="CQ" and call.length()>=3 and call.length()<=4 - and !call.contains(QRegExp("[0-9]"))) { - //Second word has length 3 or 4 and contains no digits + if(match.captured("word1")=="CQ" and call.length()<=4 and !call.contains(QRegExp("[0-9]"))) { + //Second word has length 1-4 and contains no digits call = match.captured ("word3"); grid = match.captured ("word4"); }