flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-03 07:35:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #681, FSD UI at login screen

Browse Source 
* plus completers for login GUI (ICAO, ...)
* some utility functions in related value object classed
This commit is contained in:
Klaus Basan
2016-06-28 21:23:16 +02:00
parent b4a9531357
commit 6f97e7290b
9 changed files with 244 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackmisc/aviation/aircrafticaocode.cpp
View File

@@ -490,9 +490,10 @@ namespace BlackMisc
return s;
}
const QString CAircraftIcaoCode::normalizeDesignator(const QString candidate)
QString CAircraftIcaoCode::normalizeDesignator(const QString candidate)
{
QString n(candidate.trimmed().toUpper());
if (n.contains(' ')) { n = n.left(n.indexOf(' ')); } // cutoff as first space
if (n.isEmpty()) { return n; }
static QThreadStorage<QRegularExpression> tsRegex;

2
src/blackmisc/aviation/aircrafticaocode.h
View File

@@ -259,7 +259,7 @@ namespace BlackMisc
static const QStringList &getSpecialDesignators();
//! Normalize designator, remove illegal characters
static const QString normalizeDesignator(const QString candidate);
static QString normalizeDesignator(const QString candidate);
//! Create relaxed combined codes, e.g "L2J" -> "L3J", ...
static QStringList alternativeCombinedCodes(const QString &combinedCode);

12
src/blackmisc/aviation/airlineicaocode.cpp
View File

@@ -263,6 +263,18 @@ namespace BlackMisc
return (regexp.match(airline).hasMatch());
}
QString CAirlineIcaoCode::normalizeDesignator(const QString candidate)
{
QString n(candidate.trimmed().toUpper());
if (n.contains(' ')) { n = n.left(n.indexOf(' ')); } // cutoff as first space
if (n.isEmpty()) { return n; }
static QThreadStorage<QRegularExpression> tsRegex;
if (! tsRegex.hasLocalData()) { tsRegex.setLocalData(QRegularExpression("[^a-zA-Z\\d\\s]")); }
const QRegularExpression &regexp = tsRegex.localData();
return n.remove(regexp);
}
QString CAirlineIcaoCode::getCombinedStringWithKey() const
{
QString s(getVDesignator());

3
src/blackmisc/aviation/airlineicaocode.h
View File

@@ -180,6 +180,9 @@ namespace BlackMisc
//! Valid designator?
static bool isValidAirlineDesignator(const QString &airline);
//! Normalize string as airline designator
static QString normalizeDesignator(const QString candidate);
//! From our DB JSON
static CAirlineIcaoCode fromDatabaseJson(const QJsonObject &json, const QString &prefix = QString());

14
src/blackmisc/aviation/airlineicaocodelist.cpp
View File

@@ -154,6 +154,20 @@ namespace BlackMisc
return c;
}
QStringList CAirlineIcaoCodeList::toIcaoDesignatorNameCountryCompleterStrings(bool sort) const
{
QStringList c;
for (const CAirlineIcaoCode &icao : *this)
{
if (!icao.hasValidDesignator()) { continue; }
const QString cs(icao.getDesignatorNameCountry());
if (cs.isEmpty()) { continue; }
c.append(cs);
}
if (sort) { c.sort(); }
return c;
}
QStringList CAirlineIcaoCodeList::toNameCompleterStrings(bool sort) const
{
QStringList c;

3
src/blackmisc/aviation/airlineicaocodelist.h
View File

@@ -75,6 +75,9 @@ namespace BlackMisc
//! String list for completion by ICAO designator
QStringList toIcaoDesignatorCompleterStrings(bool combinedString = true, bool sort = true) const;
//! String list for completion by ICAO designator plus Name
QStringList toIcaoDesignatorNameCountryCompleterStrings(bool sort = true) const;
//! String list for completion by name
QStringList toNameCompleterStrings(bool sort = true) const;