From 88a5b54ef694e58c061e428eafad28167e95984a Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 10 Mar 2017 04:02:29 +0100 Subject: [PATCH] refs #827, use matching logs (CMatchingUtils) with score functions --- src/blackmisc/simulation/aircraftmodellist.cpp | 8 +++++++- src/blackmisc/simulation/aircraftmodellist.h | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/blackmisc/simulation/aircraftmodellist.cpp b/src/blackmisc/simulation/aircraftmodellist.cpp index ddf74db1b..2c8d2ea27 100644 --- a/src/blackmisc/simulation/aircraftmodellist.cpp +++ b/src/blackmisc/simulation/aircraftmodellist.cpp @@ -8,6 +8,7 @@ */ #include "blackmisc/simulation/aircraftmodellist.h" +#include "blackmisc/simulation/matchingutils.h" #include "blackmisc/aviation/aircrafticaocode.h" #include "blackmisc/aviation/callsign.h" #include "blackmisc/aviation/livery.h" @@ -15,6 +16,7 @@ #include "blackmisc/iterator.h" #include "blackmisc/range.h" #include "blackmisc/statusmessage.h" +#include "blackmisc/stringutils.h" #include #include @@ -584,12 +586,16 @@ namespace BlackMisc } } - ScoredModels CAircraftModelList::scoreFull(const CAircraftModel &remoteModel, bool ignoreZeroScores) const + ScoredModels CAircraftModelList::scoreFull(const CAircraftModel &remoteModel, 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())); + for (const CAircraftModel &model : *this) { const int score = model.calculateScore(remoteModel, preferColorLiveries); diff --git a/src/blackmisc/simulation/aircraftmodellist.h b/src/blackmisc/simulation/aircraftmodellist.h index 48aceb5d2..9734d7290 100644 --- a/src/blackmisc/simulation/aircraftmodellist.h +++ b/src/blackmisc/simulation/aircraftmodellist.h @@ -226,7 +226,7 @@ namespace BlackMisc void normalizeFileNamesForDb(); //! Score by aircraft ICAO code - ScoredModels scoreFull(const CAircraftModel &remoteModel, bool ignoreZeroScores = true) const; + ScoredModels scoreFull(const CAircraftModel &remoteModel, bool ignoreZeroScores = true, CStatusMessageList *log = nullptr) const; //! Completer strings QStringList toCompleterStrings(bool sorted = true) const;