mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-25 18:25:42 +08:00
committed by
Mathew Sutcliffe
parent
7427847bb4
commit
5e19431d2b
@@ -590,7 +590,7 @@ namespace BlackCore
|
|||||||
{
|
{
|
||||||
const int maxScore = map.lastKey();
|
const int maxScore = map.lastKey();
|
||||||
const CAircraftModelList maxScoreAircraft(map.values(maxScore));
|
const CAircraftModelList maxScoreAircraft(map.values(maxScore));
|
||||||
CMatchingUtils::addLogDetailsToList(log, remoteAircraft, QString("Scores:<br>%1").arg(scoresToString(map).replace("\n", "<br>")), getLogCategories());
|
CMatchingUtils::addLogDetailsToList(log, remoteAircraft, QString("Scores: %1").arg(scoresToString(map).replace("\n", "<br>")), getLogCategories());
|
||||||
CMatchingUtils::addLogDetailsToList(log, remoteAircraft, QString("Scoring with score %1 out of %2 models yielded %3 models").arg(maxScore).arg(map.size()).arg(maxScoreAircraft.size()), getLogCategories());
|
CMatchingUtils::addLogDetailsToList(log, remoteAircraft, QString("Scoring with score %1 out of %2 models yielded %3 models").arg(maxScore).arg(map.size()).arg(maxScoreAircraft.size()), getLogCategories());
|
||||||
|
|
||||||
const CAircraftModel pickedModel = (maxScoreAircraft.size() > 1) ?
|
const CAircraftModel pickedModel = (maxScoreAircraft.size() > 1) ?
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ namespace BlackMisc
|
|||||||
|
|
||||||
template <typename Derived>
|
template <typename Derived>
|
||||||
CAircraftSituation CInterpolator<Derived>::getInterpolatedSituation(qint64 currentTimeMsSinceEpoc,
|
CAircraftSituation CInterpolator<Derived>::getInterpolatedSituation(qint64 currentTimeMsSinceEpoc,
|
||||||
const CInterpolationAndRenderingSetup &setup, const CInterpolationHints &hints, CInterpolationStatus &status)
|
const CInterpolationAndRenderingSetup &setup, const CInterpolationHints &hints, CInterpolationStatus &status)
|
||||||
{
|
{
|
||||||
status.reset();
|
status.reset();
|
||||||
CInterpolationLogger::SituationLog log;
|
CInterpolationLogger::SituationLog log;
|
||||||
@@ -176,7 +176,7 @@ namespace BlackMisc
|
|||||||
|
|
||||||
template <typename Derived>
|
template <typename Derived>
|
||||||
CAircraftParts CInterpolator<Derived>::getInterpolatedParts(qint64 currentTimeMsSinceEpoch,
|
CAircraftParts CInterpolator<Derived>::getInterpolatedParts(qint64 currentTimeMsSinceEpoch,
|
||||||
const CInterpolationAndRenderingSetup &setup, CPartsStatus &partsStatus, bool log)
|
const CInterpolationAndRenderingSetup &setup, CPartsStatus &partsStatus, bool log)
|
||||||
{
|
{
|
||||||
Q_UNUSED(setup);
|
Q_UNUSED(setup);
|
||||||
partsStatus.reset();
|
partsStatus.reset();
|
||||||
|
|||||||
@@ -71,8 +71,8 @@ namespace BlackMisc
|
|||||||
void attachLogger(CInterpolationLogger *logger) { m_logger = logger; }
|
void attachLogger(CInterpolationLogger *logger) { m_logger = logger; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
BlackMisc::Aviation::CAircraftSituationList m_aircraftSituations; //!< recent situations
|
BlackMisc::Aviation::CAircraftSituationList m_aircraftSituations; //!< recent situations for one aircraft
|
||||||
BlackMisc::Aviation::CAircraftPartsList m_aircraftParts; //!< recent parts
|
BlackMisc::Aviation::CAircraftPartsList m_aircraftParts; //!< recent parts for one aircraft
|
||||||
BlackMisc::Aviation::CCallsign m_callsign; //!< callsign
|
BlackMisc::Aviation::CCallsign m_callsign; //!< callsign
|
||||||
bool m_isFirstInterpolation = true; //!< set to false after the first successful interpolation
|
bool m_isFirstInterpolation = true; //!< set to false after the first successful interpolation
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user