w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-07-25 11:34:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Logbook:

Browse Source 
-changed log to hash table for faster lookup
  -improved ADIF compatibility
mainwindow.ui
  -fixed typo in menu entry



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3538 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Murray Curtis
2013-08-08 23:51:53 +00:00
parent 436fc96dff
commit 7d198f3d50
9 changed files with 113 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
logbook/countrydat.cpp
+26 -19
View File
@@ -29,8 +29,12 @@ void CountryDat::init(const QString filename)
QString CountryDat::_extractName(const QString line)
{
int s1 = line.indexOf(':');
QString name = line.mid(0,s1);
return name;
if (s1>=0)
{
QString name = line.mid(0,s1);
return name;
}
return "";
}
void CountryDat::_removeBrackets(QString &line, const QString a, const QString b)
@@ -71,7 +75,7 @@ QStringList CountryDat::_extractPrefix(QString &line, bool &more)
void CountryDat::load()
{
_data.clear(); //dictionary was = {}
_data.clear();
_countryNames.clear(); //used by countriesWorked
QFile inputFile(_filename);
@@ -86,23 +90,26 @@ void CountryDat::load()
QString line2 = in.readLine();
QString name = _extractName(line1);
_countryNames << name;
bool more = true;
QStringList prefixs;
while (more)
{
QStringList p = _extractPrefix(line2,more);
prefixs += p;
if (more)
line2 = in.readLine();
}
QString p;
foreach(p,prefixs)
if (name.length()>0)
{
if (p.length() > 0)
_data.insert(p,name);
}
_countryNames << name;
bool more = true;
QStringList prefixs;
while (more)
{
QStringList p = _extractPrefix(line2,more);
prefixs += p;
if (more)
line2 = in.readLine();
}
QString p;
foreach(p,prefixs)
{
if (p.length() > 0)
_data.insert(p,name);
}
}
}
}
inputFile.close();