From 46f509c367d346c0cd80551304f0431146441040 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Fri, 27 Apr 2018 03:16:25 +0200
Subject: [PATCH] Ref T261, logger support for situation change

---
 .../simulation/interpolationlogger.cpp        | 26 ++++++++++---------
 .../simulation/interpolationlogger.h          |  3 ++-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/blackmisc/simulation/interpolationlogger.cpp b/src/blackmisc/simulation/interpolationlogger.cpp
index 2391780da..4633067b7 100644
--- a/src/blackmisc/simulation/interpolationlogger.cpp
+++ b/src/blackmisc/simulation/interpolationlogger.cpp
@@ -408,24 +408,26 @@ namespace BlackMisc
             const CAircraftSituation situationOldInterpolation = this->oldestInterpolationSituation();
             const CAircraftSituation situationNewInterpolation = this->newestInterpolationSituation();
 
-            return QStringLiteral("CS: ") % callsign.asString() % separator %
-                   QStringLiteral("ts: ") % CInterpolationLogger::msSinceEpochToTimeAndTimestamp(tsCurrent) %
-                   QStringLiteral(" | type: ") % this->interpolationType() %
-                   QStringLiteral(" | gnd.fa.: ") % QString::number(groundFactor) %
-                   QStringLiteral(" | CG: ") % cgAboveGround.valueRoundedWithUnit(CLengthUnit::m(), 1) %
-                   QStringLiteral(" | alt.cor.: ") % altCorrection %
-                   QStringLiteral(" | #nw.sit.: ") % QString::number(noNetworkSituations) %
-                   (
+            return (
                        withSetup ?
-                       separator % QStringLiteral("setup: ") % usedSetup.toQString(true) :
+                       QStringLiteral("setup: ") % usedSetup.toQString(true) % separator :
                        QStringLiteral("")
                    ) %
                    (
                        withElevation ?
-                       separator %
-                       QStringLiteral("Elev info.: ") % elevationInfo :
+                       QStringLiteral("Elev info.: ") % elevationInfo % separator :
                        QStringLiteral("")
                    ) %
+                   QStringLiteral("change: ") % change.toQString(true) %
+                   separator %
+                   QStringLiteral("Interpolation CS: ") % callsign.asString() % separator %
+                   QStringLiteral("ts: ") % CInterpolationLogger::msSinceEpochToTimeAndTimestamp(tsCurrent) %
+                   QStringLiteral(" | type: ") % this->interpolationType() %
+                   QStringLiteral(" | gnd.fa.: ") % QString::number(groundFactor) %
+                   QStringLiteral(" | CG: ") % cgAboveGround.valueRoundedWithUnit(CLengthUnit::m(), 1) %
+                   QStringLiteral(" ") % cgAboveGround.valueRoundedWithUnit(CLengthUnit::ft(), 1) %
+                   QStringLiteral(" | alt.cor.: ") % altCorrection %
+                   QStringLiteral(" | #nw.sit.: ") % QString::number(noNetworkSituations) %
                    (
                        withDeltaTimes ?
                        separator %
@@ -442,7 +444,7 @@ namespace BlackMisc
                    (
                        withCurrentSituation ?
                        separator %
-                       QStringLiteral("sit.: ") % situationCurrent.toQString(true) :
+                       QStringLiteral("cur.sit.(interpolated): ") % situationCurrent.toQString(true) :
                        QStringLiteral("")
                    ) %
                    (
diff --git a/src/blackmisc/simulation/interpolationlogger.h b/src/blackmisc/simulation/interpolationlogger.h
index 96e75c73e..8682cec85 100644
--- a/src/blackmisc/simulation/interpolationlogger.h
+++ b/src/blackmisc/simulation/interpolationlogger.h
@@ -14,9 +14,9 @@
 
 #include "interpolationrenderingsetup.h"
 #include "blackmisc/simulation/remoteaircraftprovider.h"
-#include "blackmisc/aviation/aircraftpartslist.h"
 #include "blackmisc/aviation/aircraftsituationlist.h"
 #include "blackmisc/aviation/aircraftpartslist.h"
+#include "blackmisc/aviation/aircraftsituationchange.h"
 #include "blackmisc/logcategorylist.h"
 #include <QObject>
 #include <QStringList>
@@ -45,6 +45,7 @@ namespace BlackMisc
             Aviation::CAircraftParts parts; //!< corresponding parts used in interpolator
             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
             CInterpolationAndRenderingSetupPerCallsign usedSetup; //!< used setup