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

More cleanup of spurious identifications of DXCC entities fron non-callsigns.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7081 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-09-14 16:19:21 +00:00
parent 3b93cd02b6
commit 966d774f09
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
displaytext.cpp
View File

@ -78,7 +78,6 @@ void DisplayText::_appendDXCCWorkedB4(DecodedText& t1, QString& bg,
QColor color_NewCall) QColor color_NewCall)
{ {
QString call = t1.CQersCall (); QString call = t1.CQersCall ();
QString countryName; QString countryName;
bool callWorkedBefore; bool callWorkedBefore;
bool countryWorkedBefore; bool countryWorkedBefore;
@ -89,6 +88,8 @@ void DisplayText::_appendDXCCWorkedB4(DecodedText& t1, QString& bg,
i0=call.indexOf(" "); i0=call.indexOf(" ");
call=call.mid(0,i0); call=call.mid(0,i0);
} }
if(call.length()<3) return;
if(!call.contains(QRegExp("[0-9]")) or !call.contains(QRegExp("[A-Z]"))) return;
logBook.match(/*in*/call,/*out*/countryName,callWorkedBefore,countryWorkedBefore); logBook.match(/*in*/call,/*out*/countryName,callWorkedBefore,countryWorkedBefore);
int charsAvail = 48; int charsAvail = 48;
@ -169,7 +170,6 @@ void DisplayText::displayDecodedText(DecodedText decodedText, QString myCall,
or decodedText.indexOf (" " + myCall + ">") >= 0)) { or decodedText.indexOf (" " + myCall + ">") >= 0)) {
bg=color_MyCall.name(); bg=color_MyCall.name();
} }
// if enabled add the DXCC entity and B4 status to the end of the preformated text line t1 // if enabled add the DXCC entity and B4 status to the end of the preformated text line t1
if (displayDXCCEntity && CQcall) if (displayDXCCEntity && CQcall)
_appendDXCCWorkedB4(/*mod*/decodedText,bg,logBook,color_CQ, _appendDXCCWorkedB4(/*mod*/decodedText,bg,logBook,color_CQ,