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

Completer sort order and ICAO code string building

Browse Source
This commit is contained in:
Klaus Basan
2018-08-26 00:45:44 +02:00
parent 3ec3bb8e15
commit 09e8b3ffcf
4 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -468,32 +468,30 @@ namespace BlackMisc
QString CAircraftIcaoCode::getCombinedIcaoStringWithKey() const
{
QString s(hasDesignator() ? getDesignator() : "????");
if (hasManufacturer()) { s = s.append(" ").append(getManufacturer()); }
if (hasModelDescription()) { s = s.append(" ").append(getModelDescription()); }
return s.append(getDbKeyAsStringInParentheses(" "));
return (this->hasDesignator() ? this->getDesignator() : QStringLiteral("????")) %
(this->hasManufacturer() ? (QStringLiteral(" ") % this->getManufacturer()) : QStringLiteral("")) %
(this->hasModelDescription() ? (QStringLiteral(" ") % this->getModelDescription()) : QStringLiteral("")) %
this->getDbKeyAsStringInParentheses(" ");
}
QString CAircraftIcaoCode::getCombinedIataStringWithKey() const
{
if (!this->hasIataCode()) { return ""; }
QString s(getIataCode());
s = s.append(" [IATA]");
if (hasDesignator()) { s.append(" ").append(getDesignator()); }
if (hasManufacturer()) { s = s.append(" ").append(getManufacturer()); }
if (hasModelDescription()) { s = s.append(" ").append(getModelDescription()); }
return s.append(getDbKeyAsStringInParentheses(" "));
return this->getIataCode() % QStringLiteral(" [IATA") %
(this->hasDesignator() ? (QStringLiteral(" ") % this->getDesignator()) : QStringLiteral("")) %
(this->hasManufacturer() ? (QStringLiteral(" ") % this->getManufacturer()) : QStringLiteral("")) %
(this->hasModelDescription() ? (QStringLiteral(" ") % this->getModelDescription()) : QStringLiteral("")) %
this->getDbKeyAsStringInParentheses(" ");
}
QString CAircraftIcaoCode::getCombinedFamilyStringWithKey() const
{
if (!this->hasFamily()) { return ""; }
QString s(getFamily());
s = s.append(" [family]");
if (hasDesignator()) { s.append(" ").append(getDesignator()); }
if (hasManufacturer()) { s.append(" ").append(getManufacturer()); }
if (hasModelDescription()) { s.append(" ").append(getModelDescription()); }
return s.append(getDbKeyAsStringInParentheses(" "));
return this->getFamily() % QStringLiteral(" [family") %
(this->hasDesignator() ? (QStringLiteral(" ") % this->getDesignator()) : QStringLiteral("")) %
(this->hasManufacturer() ? (QStringLiteral(" ") % this->getManufacturer()) : QStringLiteral("")) %
(this->hasModelDescription() ? (QStringLiteral(" ") % this->getModelDescription()) : QStringLiteral("")) %
this->getDbKeyAsStringInParentheses(" ");
}
bool CAircraftIcaoCode::hasCompleteData() const

6
src/blackmisc/aviation/aircrafticaocodelist.cpp
View File

@@ -222,7 +222,7 @@ namespace BlackMisc
CAircraftIcaoCodeList icaos(*this);
if (sort) { icaos.sortByDesignatorAndRank(); }
// 3 steps to get a proper sort order
// 3 steps to get a proper sort order of the string list
for (const CAircraftIcaoCode &icao : as_const(icaos))
{
c.append(icao.getCombinedIcaoStringWithKey());
@@ -230,8 +230,8 @@ namespace BlackMisc
if (withFamily)
{
icaos = this->findWithFamily(true);
for (const CAircraftIcaoCode &icao : as_const(icaos))
const CAircraftIcaoCodeList icaosFamily = icaos.findWithFamily(true);
for (const CAircraftIcaoCode &icao : icaosFamily)
{
c.append(icao.getCombinedFamilyStringWithKey());
}