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

refs #768, update of value objects

Browse Source 
* Adjusted validation
* Use default airline object when a color livery is created (refs #774 also)
* Added/improved completer strings (e.g. getVDesignatorDbKey())
* utility functions in lists
This commit is contained in:
Klaus Basan
2016-10-17 02:29:14 +02:00
parent ab20b6c713
commit 8718260623
9 changed files with 74 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,6 +56,18 @@ namespace BlackMisc
return QString("V").append(this->m_designator);
}
QString CAirlineIcaoCode::getVDesignatorDbKey() const
{
if (this->isLoadedFromDb())
{
return this->getVDesignator() + " " + this->getDbKeyAsStringInParentheses();
}
else
{
return this->getVDesignator();
}
}
void CAirlineIcaoCode::setDesignator(const QString &icaoDesignator)
{
this->m_designator = icaoDesignator.trimmed().toUpper();
@@ -286,7 +298,7 @@ namespace BlackMisc
bool CAirlineIcaoCode::isValidAirlineDesignator(const QString &airline)
{
// allow 2 chars for IATA
if (airline.length() < 2 || airline.length() > 5) return false;
if (airline.length() < 2 || airline.length() > 5) { return false; }
auto chars = makeRange(airline.begin(), airline.end());
if (chars.containsBy([](QChar c) { return !c.isUpper() && !c.isDigit(); })) { return false; }
return true;
@@ -377,11 +389,16 @@ namespace BlackMisc
{
if (!existsKey(json, prefix))
{
// when using relationship, this can be null
// when using relationship, this can be null (e.g. for color liveries)
return CAirlineIcaoCode();
}
const QString designator(json.value(prefix + "designator").toString());
QString designator(json.value(prefix + "designator").toString());
if (!CAirlineIcaoCode::isValidAirlineDesignator(designator))
{
designator = CAirlineIcaoCode::normalizeDesignator(designator);
}
const QString iata(json.value(prefix + "iata").toString());
const QString telephony(json.value(prefix + "callsign").toString());
const QString name(json.value(prefix + "name").toString());