Ref T524, filter by combined type/manufacturer

This commit is contained in:
Klaus Basan
2019-01-27 17:18:09 +01:00
committed by Mat Sutcliffe
parent df19d74b39
commit 509a60d06f
4 changed files with 35 additions and 3 deletions

View File

@@ -311,6 +311,21 @@ namespace BlackMisc
return this->findByCombinedTypeAndWtc(combinedType, wtc).findColorLiveries();
}
CAircraftModelList CAircraftModelList::findByCombinedAndManufacturer(const CAircraftIcaoCode &icao) const
{
return this->findByCombinedAndManufacturer(icao.getCombinedType(), icao.getManufacturer());
}
CAircraftModelList CAircraftModelList::findByCombinedAndManufacturer(const QString &combinedType, const QString &manufacturer) const
{
if (manufacturer.isEmpty()) { return this->findByCombinedType(combinedType); }
if (combinedType.isEmpty()) { return this->findByManufacturer(manufacturer); }
return this->findBy([ & ](const CAircraftModel & model)
{
return model.getAircraftIcaoCode().matchesCombinedTypeAndManufacturer(combinedType, manufacturer);
});
}
CAircraftModelList CAircraftModelList::findColorLiveries() const
{
return this->findBy([ = ](const CAircraftModel & model)