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

Ref T182, matching log can be used with calculateScore

Browse Source
This commit is contained in:
Klaus Basan
2017-11-07 01:42:22 +01:00
parent 89db83f3c7
commit 31e47f013c
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackmisc/simulation/aircraftmodel.cpp
View File

@@ -576,11 +576,13 @@ namespace BlackMisc
m_modelString.startsWith(modelString, sensitivity); m_modelString.startsWith(modelString, sensitivity);
} }
int CAircraftModel::calculateScore(const CAircraftModel &compareModel, bool preferColorLiveries) const int CAircraftModel::calculateScore(const CAircraftModel &compareModel, bool preferColorLiveries, CStatusMessageList *log) const
{ {
int score = this->getAircraftIcaoCode().calculateScore(compareModel.getAircraftIcaoCode()); const int icaoScore = this->getAircraftIcaoCode().calculateScore(compareModel.getAircraftIcaoCode());
score += this->getLivery().calculateScore(compareModel.getLivery(), preferColorLiveries); CMatchingUtils::addLogDetailsToList(log, this->getCallsign(), QString("ICAO score: ").arg(icaoScore));
return 0.5 * score; const int liveryScore = this->getLivery().calculateScore(compareModel.getLivery(), preferColorLiveries);
CMatchingUtils::addLogDetailsToList(log, this->getCallsign(), QString("Livery score: ").arg(liveryScore));
return 0.5 * (icaoScore + liveryScore);
} }
CStatusMessageList CAircraftModel::validate(bool withNestedObjects) const CStatusMessageList CAircraftModel::validate(bool withNestedObjects) const

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

@@ -364,7 +364,7 @@ namespace BlackMisc
bool matchesModelString(const QString &modelString, Qt::CaseSensitivity sensitivity) const; bool matchesModelString(const QString &modelString, Qt::CaseSensitivity sensitivity) const;
//! Calculate score //! Calculate score
int calculateScore(const CAircraftModel &compareModel, bool preferColorLiveries) const; int calculateScore(const CAircraftModel &compareModel, bool preferColorLiveries, CStatusMessageList *log = nullptr) const;
//! Validate //! Validate
CStatusMessageList validate(bool withNestedObjects) const; CStatusMessageList validate(bool withNestedObjects) const;

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

@@ -723,7 +723,7 @@ namespace BlackMisc
for (const CAircraftModel &model : *this) for (const CAircraftModel &model : *this)
{ {
const int score = model.calculateScore(remoteModel, preferColorLiveries); const int score = model.calculateScore(remoteModel, preferColorLiveries, log);
if (ignoreZeroScores && score < 1) { continue; } if (ignoreZeroScores && score < 1) { continue; }
scoreMap.insertMulti(score, model); scoreMap.insertMulti(score, model);
} }