diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp index 5a48f1770..e9ae6676c 100644 --- a/src/blackmisc/simulation/aircraftmodel.cpp +++ b/src/blackmisc/simulation/aircraftmodel.cpp @@ -576,11 +576,13 @@ namespace BlackMisc 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()); - score += this->getLivery().calculateScore(compareModel.getLivery(), preferColorLiveries); - return 0.5 * score; + const int icaoScore = this->getAircraftIcaoCode().calculateScore(compareModel.getAircraftIcaoCode()); + CMatchingUtils::addLogDetailsToList(log, this->getCallsign(), QString("ICAO score: ").arg(icaoScore)); + 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 diff --git a/src/blackmisc/simulation/aircraftmodel.h b/src/blackmisc/simulation/aircraftmodel.h index df5754ff7..1beeb2acb 100644 --- a/src/blackmisc/simulation/aircraftmodel.h +++ b/src/blackmisc/simulation/aircraftmodel.h @@ -364,7 +364,7 @@ namespace BlackMisc bool matchesModelString(const QString &modelString, Qt::CaseSensitivity sensitivity) const; //! Calculate score - int calculateScore(const CAircraftModel &compareModel, bool preferColorLiveries) const; + int calculateScore(const CAircraftModel &compareModel, bool preferColorLiveries, CStatusMessageList *log = nullptr) const; //! Validate CStatusMessageList validate(bool withNestedObjects) const; diff --git a/src/blackmisc/simulation/aircraftmodellist.cpp b/src/blackmisc/simulation/aircraftmodellist.cpp index 0d82dd97c..2728c03bb 100644 --- a/src/blackmisc/simulation/aircraftmodellist.cpp +++ b/src/blackmisc/simulation/aircraftmodellist.cpp @@ -723,7 +723,7 @@ namespace BlackMisc 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; } scoreMap.insertMulti(score, model); }