flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 15:15:50 +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

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

@@ -52,6 +52,7 @@ namespace BlackMisc
CAircraftModel CAircraftModelList::findFirstByModelStringOrDefault(const QString &modelString, Qt::CaseSensitivity sensitivity) const
{
if (modelString.isEmpty()) { return CAircraftModel(); }
return this->findFirstByOrDefault([ = ](const CAircraftModel & model)
{
return model.matchesModelString(modelString, sensitivity);
@@ -94,6 +95,17 @@ namespace BlackMisc
});
}
CAircraftModelList CAircraftModelList::findByLiveryCode(const CLivery &livery) const
{
if (!livery.hasCombinedCode()) { return CAircraftModelList(); }
const QString code(livery.getCombinedCode());
return this->findBy([ = ](const CAircraftModel & model)
{
if (!model.getLivery().hasCombinedCode()) return false;
return model.getLivery().getCombinedCode() == code;
});
}
CAircraftModelList CAircraftModelList::findWithFileName() const
{
return this->findBy([ = ](const CAircraftModel & model)
@@ -127,9 +139,65 @@ namespace BlackMisc
});
}
CAircraftModelList CAircraftModelList::findByManunfacturer(const QString &manufacturer) const
{
if (manufacturer.isEmpty()) { return CAircraftModelList(); }
const QString m(manufacturer.toUpper().trimmed());
return this->findBy([ = ](const CAircraftModel & model)
{
return model.getAircraftIcaoCode().getManufacturer() == m;
});
}
CAircraftModelList CAircraftModelList::findByFamily(const QString &family) const
{
if (family.isEmpty()) { return CAircraftModelList(); }
const QString f(family.toUpper().trimmed());
return this->findBy([ = ](const CAircraftModel & model)
{
const CAircraftIcaoCode icao(model.getAircraftIcaoCode());
if (!icao.hasFamily()) { return false; }
return icao.getFamily() == f;
});
}
CAircraftModelList CAircraftModelList::findByCombinedCode(const QString &combinedCode) const
{
const QString cc(combinedCode.trimmed().toUpper());
if (combinedCode.length() != 3) { return CAircraftModelList(); }
return this->findBy([ = ](const CAircraftModel & model)
{
const CAircraftIcaoCode icao(model.getAircraftIcaoCode());
return icao.matchesCombinedCode(cc);
});
}
CAircraftModelList CAircraftModelList::findByMilitaryFlag(bool military) const
{
return this->findBy([ = ](const CAircraftModel & model)
{
return (model.isMilitary() == military);
});
}
QString CAircraftModelList::designatorToFamily(const CAircraftIcaoCode &aircraftIcaoCode) const
{
if (aircraftIcaoCode.hasFamily()) { return aircraftIcaoCode.getFamily(); }
for (const CAircraftModel &model : (*this))
{
const CAircraftIcaoCode icao(model.getAircraftIcaoCode());
if (!icao.hasFamily()) continue;
if (icao.matchesDesignator(aircraftIcaoCode.getDesignator()))
{
return icao.getFamily();
}
}
return QString();
}
CAircraftModelList CAircraftModelList::matchesSimulator(const CSimulatorInfo &simulator) const
{
return this->findBy([ = ](const CAircraftModel &model)
return this->findBy([ = ](const CAircraftModel & model)
{
return model.matchesSimulator(simulator);
});
@@ -364,6 +432,17 @@ namespace BlackMisc
}
}
QStringList CAircraftModelList::toCompleterStrings(bool sorted) const
{
QStringList c;
for (const CAircraftModel &model : *this)
{
c.append(model.getModelString());
}
if (sorted) { c.sort(); }
return c;
}
CStatusMessageList CAircraftModelList::validateForPublishing() const
{
CAircraftModelList invalidModels;