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

Ref T492, alias in model lists and model

Browse Source 
Search for alias and modelstring in matching
This commit is contained in:
Klaus Basan
2019-01-05 12:18:14 +01:00
committed by Mat Sutcliffe
parent 80e925fe80
commit 58cfdd1bb9
6 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,6 +114,15 @@ namespace BlackMisc
});
}
CAircraftModel CAircraftModelList::findFirstByModelStringAliasOrDefault(const QString &modelString, Qt::CaseSensitivity sensitivity) const
{
if (modelString.isEmpty()) { return CAircraftModel(); }
return this->findFirstByOrDefault([ & ](const CAircraftModel & model)
{
return model.matchesModelStringOrAlias(modelString, sensitivity);
});
}
CAircraftModel CAircraftModelList::findFirstByCallsignOrDefault(const CCallsign &callsign) const
{
if (callsign.isEmpty()) { return CAircraftModel(); }
@@ -817,6 +826,16 @@ namespace BlackMisc
return this->getCombinedTypes().size();
}
int CAircraftModelList::countAliases() const
{
int count = 0;
for (const CAircraftModel &model : (*this))
{
if (model.hasModelStringAlias()) { count++; }
}
return count;
}
void CAircraftModelList::updateDistributor(const CDistributor &distributor)
{
for (CAircraftModel &model : *this)

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

@@ -113,6 +113,9 @@ namespace BlackMisc
//! Find first by model string
CAircraftModel findFirstByModelStringOrDefault(const QString &modelString, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive) const;
//! Find first by model string
CAircraftModel findFirstByModelStringAliasOrDefault(const QString &modelString, Qt::CaseSensitivity sensitivity = Qt::CaseInsensitive) const;
//! Find first by callsign
CAircraftModel findFirstByCallsignOrDefault(const Aviation::CCallsign &callsign) const;
@@ -323,6 +326,9 @@ namespace BlackMisc
//! Count different combined types
int countCombinedTypes() const;
//! Models with aliases
int countAliases() const;
//! Update distributor, all models in list are set to given distributor
void updateDistributor(const CDistributor &distributor);