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

refs #720, improved distributor and airline/livery detection

Browse Source 
* mark data read from DB (req. for string key where existing key value is not reliable indicator for DB data)
* detect distributors by part of model string
* use a simplified name (no spaces, no special characters) to find a match
* allow to obtain model strings (=keys) as set and list
This commit is contained in:
Klaus Basan
2016-08-09 01:24:47 +02:00
committed by Mathew Sutcliffe
parent 39dae7ed45
commit f9922353c4
21 changed files with 220 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/blackmisc/simulation/distributorlist.cpp
View File

@@ -7,7 +7,9 @@
* contained in the LICENSE file.
*/
#include "blackmisc/simulation/distributorlist.h"
#include "distributorlist.h"
#include "simulatorinfo.h"
#include "aircraftmodel.h"
#include "blackmisc/metaclassprivate.h"
#include <tuple>
@@ -32,20 +34,40 @@ namespace BlackMisc
return CDistributor();
}
CDistributor CDistributorList::smartDistributorSelector(const CDistributor &distributorPattern) const
CDistributor CDistributorList::findByModelData(const CAircraftModel &model) const
{
if (distributorPattern.hasValidDbKey())
// some stuipd hardcoded resolutions
if (model.getDistributor().hasValidDbKey()) { return model.getDistributor(); }
if (model.getModelString().startsWith("WOA", Qt::CaseInsensitive)) { return this->findByKeyOrAlias("WOAI"); }
if (model.getDescription().contains("WOA", Qt::CaseInsensitive)) { return this->findByKeyOrAlias("WOAI"); }
if (model.getDescription().contains("IVAO", Qt::CaseInsensitive)) { return this->findByKeyOrAlias("IVAO"); }
return CDistributor();
}
CDistributor CDistributorList::smartDistributorSelector(const CDistributor &distributor) const
{
// key is not necessarily a DB key, so use complete data, happens when key is set from raw data
if (distributor.isLoadedFromDb()) { return distributor; }
if (distributor.hasValidDbKey())
{
QString k(distributorPattern.getDbKey());
CDistributor d(this->findByKey(k));
const QString key(distributor.getDbKey());
CDistributor d(this->findByKey(key));
if (d.hasCompleteData()) { return d; }
// more lenient search
return this->findByKeyOrAlias(k);
return this->findByKeyOrAlias(key);
}
return CDistributor();
}
CDistributor CDistributorList::smartDistributorSelector(const CDistributor &distributorPattern, const CAircraftModel &model) const
{
const CDistributor d = this->smartDistributorSelector(distributorPattern);
// key is not necessarily a DB key, so use complete data, happens when key is set from raw data
if (d.hasCompleteData()) { return d; }
return this->findByModelData(model);
}
bool CDistributorList::matchesAnyKeyOrAlias(const QString &keyOrAlias) const
{
for (const CDistributor &distributor : (*this))