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

refs #614, formatting and new functions for list/value objects

Browse Source 
* find by aircraft family
* name completer sorting
This commit is contained in:
Klaus Basan
2016-04-04 12:45:05 +02:00
parent 4b621bcb1a
commit a07af2b781
11 changed files with 186 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,21 +96,42 @@ namespace BlackMisc
this->sortBy(&CAircraftIcaoCode::getRank);
}
QStringList CAircraftIcaoCodeList::toCompleterStrings(bool withIataCodes, bool withFamily) const
void CAircraftIcaoCodeList::sortByDesignatorAndRank()
{
this->sortBy(&CAircraftIcaoCode::getDesignator, &CAircraftIcaoCode::getRank);
}
QStringList CAircraftIcaoCodeList::toCompleterStrings(bool withIataCodes, bool withFamily, bool sort) const
{
QStringList c;
for (const CAircraftIcaoCode &icao : *this)
CAircraftIcaoCodeList icaos(*this);
if (sort) { icaos.sortByDesignatorAndRank(); }
// 3 steps to get a proper sort order
for (const CAircraftIcaoCode &icao : as_const(icaos))
{
c.append(icao.getCombinedIcaoStringWithKey());
if (withIataCodes && icao.hasIataCode() && !icao.isIataSameAsDesignator())
{
c.append(icao.getCombinedIataStringWithKey());
}
if (withFamily && icao.hasFamily() && !icao.isFamilySameAsDesignator())
}
if (withFamily)
{
icaos = this->findWithFamily(true);
for (const CAircraftIcaoCode &icao : as_const(icaos))
{
c.append(icao.getCombinedFamilyStringWithKey());
}
}
if (withIataCodes)
{
icaos = icaos.findWithIataCode(true);
if (sort) { icaos.sortBy(&CAircraftIcaoCode::getIataCode, &CAircraftIcaoCode::getRank); }
for (const CAircraftIcaoCode &icao : as_const(icaos))
{
c.append(icao.getCombinedIataStringWithKey());
}
}
return c;
}