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

refs #827, preferColorLiveries as parameter for scoreFull

Browse Source 
flag will be set in aircraft matcher
This commit is contained in:
Klaus Basan
2017-03-11 00:38:36 +01:00
committed by Mathew Sutcliffe
parent 423d18b0cd
commit fce4cb8a4d
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -586,12 +586,9 @@ namespace BlackMisc
}
}
ScoredModels CAircraftModelList::scoreFull(const CAircraftModel &remoteModel, bool ignoreZeroScores, CStatusMessageList *log) const
ScoredModels CAircraftModelList::scoreFull(const CAircraftModel &remoteModel, bool preferColorLiveries, bool ignoreZeroScores, CStatusMessageList *log) const
{
ScoredModels scoreMap;
// prefer colors if there is no airline
const bool hasAirlineDesignator = remoteModel.hasAirlineDesignator() && this->contains(&CAircraftModel::getAirlineIcaoCodeDesignator, remoteModel.getAirlineIcaoCodeDesignator());
const bool preferColorLiveries = !hasAirlineDesignator;
// prefer colors if there is no airline
CMatchingUtils::addLogDetailsToList(log, remoteModel.getCallsign(), QString("Prefer color liveries: %1, airline: '%2'").arg(boolToYesNo(preferColorLiveries), remoteModel.getAirlineIcaoCodeDesignator()));

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

@@ -226,7 +226,7 @@ namespace BlackMisc
void normalizeFileNamesForDb();
//! Score by aircraft ICAO code
ScoredModels scoreFull(const CAircraftModel &remoteModel, bool ignoreZeroScores = true, CStatusMessageList *log = nullptr) const;
ScoredModels scoreFull(const CAircraftModel &remoteModel, bool preferColorLiveries, bool ignoreZeroScores = true, CStatusMessageList *log = nullptr) const;
//! Completer strings
QStringList toCompleterStrings(bool sorted = true) const;