From d50498fa393c63eaec11e14230243e6f1f8c1dcb Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 5 May 2018 04:45:29 +0200 Subject: [PATCH] Ref T261, also log. scenery offset --- src/blackmisc/simulation/interpolationlogger.cpp | 3 ++- src/blackmisc/simulation/interpolationlogger.h | 15 ++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/blackmisc/simulation/interpolationlogger.cpp b/src/blackmisc/simulation/interpolationlogger.cpp index 4633067b7..97c18578d 100644 --- a/src/blackmisc/simulation/interpolationlogger.cpp +++ b/src/blackmisc/simulation/interpolationlogger.cpp @@ -415,7 +415,8 @@ namespace BlackMisc ) % ( withElevation ? - QStringLiteral("Elev info.: ") % elevationInfo % separator : + QStringLiteral("Elev info.: ") % elevationInfo % + QStringLiteral(" scenery os: ") % sceneryOffset.valueRoundedWithUnit(1) % separator : QStringLiteral("") ) % QStringLiteral("change: ") % change.toQString(true) % diff --git a/src/blackmisc/simulation/interpolationlogger.h b/src/blackmisc/simulation/interpolationlogger.h index 8682cec85..7192245f3 100644 --- a/src/blackmisc/simulation/interpolationlogger.h +++ b/src/blackmisc/simulation/interpolationlogger.h @@ -30,12 +30,12 @@ namespace BlackMisc //! Log entry for situation interpolation struct BLACKMISC_EXPORT SituationLog { - QChar interpolator; //!< what interpolator is used - qint64 tsCurrent = -1; //!< current timestamp - qint64 tsInterpolated = -1; //!< timestamp interpolated - double groundFactor = -1; //!< current ground factor - double vtolAircraft = false; //!< VTOL aircraft - double simTimeFraction = -1; //!< time fraction, expected 0..1 + QChar interpolator; //!< what interpolator is used + qint64 tsCurrent = -1; //!< current timestamp + qint64 tsInterpolated = -1; //!< timestamp interpolated + double groundFactor = -1; //!< current ground factor + double vtolAircraft = false; //!< VTOL aircraft + double simTimeFraction = -1; //!< time fraction, expected 0..1 double deltaSampleTimesMs = -1; //!< delta time between samples (i.e. 2 situations) bool useParts = false; //!< supporting aircraft parts int noNetworkSituations = 0; //!< available network situations @@ -46,7 +46,8 @@ namespace BlackMisc Aviation::CAircraftSituationList interpolationSituations; //!< the interpolator uses 2, 3 situations (oldest at end) Aviation::CAircraftSituation situationCurrent; //!< interpolated situation Aviation::CAircraftSituationChange change; //!< change - PhysicalQuantities::CLength cgAboveGround; //!< center of gravity + PhysicalQuantities::CLength cgAboveGround = PhysicalQuantities::CLength::null(); //!< center of gravity (CG) + PhysicalQuantities::CLength sceneryOffset = PhysicalQuantities::CLength::null(); //!< scenery offset CInterpolationAndRenderingSetupPerCallsign usedSetup; //!< used setup //! Delta time between interpolation and current time