w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 12:23:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add a rule to deal with KG4 calls not in Gitmo

Browse Source 
The  AD1C  cty.dat  file  does  not resolve  KG4  2x1  and  2x3  calls
correctly, any  that map to Gitmo  are really mainland U.S.   and this
change does that.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7990 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2017-08-02 23:20:35 +00:00
parent 470b1666a6
commit cabb7cc453
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
displaytext.cpp
View File

@ -89,7 +89,7 @@ QString DisplayText::_appendDXCCWorkedB4(QString message, QString const& callsig
call=call.mid(0,i0); call=call.mid(0,i0);
} }
if(call.length()<3) return message; if(call.length()<3) return message;
if(!call.contains(QRegExp("[0-9]")) or !call.contains(QRegExp("[A-Z]"))) return message; if(!call.contains(QRegExp("[0-9]|[A-Z]"))) return message;
logBook.match(/*in*/call,/*out*/countryName,callWorkedBefore,countryWorkedBefore); logBook.match(/*in*/call,/*out*/countryName,callWorkedBefore,countryWorkedBefore);
int charsAvail = 48; int charsAvail = 48;
@ -144,6 +144,17 @@ QString DisplayText::_appendDXCCWorkedB4(QString message, QString const& callsig
countryName.replace ("Asiatic", "AS"); countryName.replace ("Asiatic", "AS");
countryName.replace ("European", "EU"); countryName.replace ("European", "EU");
countryName.replace ("African", "AF"); countryName.replace ("African", "AF");
//
// deal with special rules that cty.dat does not cope with
//
// KG4 2x1 and 2x3 calls that map to Gitmo are mainland US not Gitmo
if (call.startsWith ("KG4") && call.size () != 5)
{
countryName.replace ("Guantanamo Bay", "U.S.A.");
}
message += countryName; message += countryName;
} }
return message; return message;