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

refs #797, added support for combined type

Browse Source 
* adjusted log messages
* aligned name to combined type
This commit is contained in:
Klaus Basan
2016-11-29 23:13:30 +01:00
parent fc3ac8b323
commit 6befaa32d5
6 changed files with 55 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackmisc/simulation/aircraftmodellist.cpp
View File

@@ -191,14 +191,14 @@ namespace BlackMisc
});
}
CAircraftModelList CAircraftModelList::findByCombinedCode(const QString &combinedCode) const
CAircraftModelList CAircraftModelList::findByCombinedType(const QString &combinedType) const
{
const QString cc(combinedCode.trimmed().toUpper());
if (combinedCode.length() != 3) { return CAircraftModelList(); }
const QString cc(combinedType.trimmed().toUpper());
if (combinedType.length() != 3) { return CAircraftModelList(); }
return this->findBy([ & ](const CAircraftModel & model)
{
const CAircraftIcaoCode icao(model.getAircraftIcaoCode());
return icao.matchesCombinedCode(cc);
return icao.matchesCombinedType(cc);
});
}

2
src/blackmisc/simulation/aircraftmodellist.h
View File

@@ -121,7 +121,7 @@ namespace BlackMisc
CAircraftModelList findByFamily(const QString &family) const;
//! Find by combined code, wildcards possible e.g. L*P, *2J
CAircraftModelList findByCombinedCode(const QString &combinedCode) const;
CAircraftModelList findByCombinedType(const QString &combinedType) const;
//! Find by military flag
CAircraftModelList findByMilitaryFlag(bool military) const;