From 6e488533f5e8eabec0b1eda05b3dada600d7f3ac Mon Sep 17 00:00:00 2001
From: Mathew Sutcliffe <oktal3700@gmail.com>
Date: Wed, 15 Mar 2017 21:38:53 +0000
Subject: [PATCH] refs #896 Using CInterpolatorMulti in simulator drivers.

---
 src/plugins/simulator/fsxcommon/simconnectobject.cpp   | 5 ++---
 src/plugins/simulator/fsxcommon/simconnectobject.h     | 6 +++---
 src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp | 3 +--
 src/xbus/traffic.h                                     | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/plugins/simulator/fsxcommon/simconnectobject.cpp b/src/plugins/simulator/fsxcommon/simconnectobject.cpp
index 0ac04b464..59d75e0d5 100644
--- a/src/plugins/simulator/fsxcommon/simconnectobject.cpp
+++ b/src/plugins/simulator/fsxcommon/simconnectobject.cpp
@@ -8,8 +8,7 @@
  */
 
 #include "simconnectobject.h"
-#include "blackmisc/simulation/interpolatorlinear.h"
-#include "blackmisc/simulation/interpolatorspline.h"
+#include "blackmisc/simulation/interpolatormulti.h"
 
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Simulation;
@@ -25,7 +24,7 @@ namespace BlackSimPlugin
                                              DWORD requestId,
                                              BlackMisc::Simulation::CInterpolationLogger *logger) :
             m_aircraft(aircraft), m_requestId(requestId), m_validRequestId(true),
-            m_interpolator(QSharedPointer<BlackMisc::Simulation::CInterpolatorSpline>::create(aircraft.getCallsign()))
+            m_interpolator(QSharedPointer<BlackMisc::Simulation::CInterpolatorMulti>::create(aircraft.getCallsign()))
         {
             m_interpolator->attachLogger(logger);
         }
diff --git a/src/plugins/simulator/fsxcommon/simconnectobject.h b/src/plugins/simulator/fsxcommon/simconnectobject.h
index 9b7261a7b..3578cd954 100644
--- a/src/plugins/simulator/fsxcommon/simconnectobject.h
+++ b/src/plugins/simulator/fsxcommon/simconnectobject.h
@@ -21,7 +21,7 @@ namespace BlackMisc
     namespace Simulation
     {
         class CInterpolatorLinear;
-        class CInterpolatorSpline;
+        class CInterpolatorMulti;
         class CInterpolationLogger;
     }
 }
@@ -54,7 +54,7 @@ namespace BlackSimPlugin
             const QString &getAircraftModelString() const { return m_aircraft.getModelString(); }
 
             //! Interpolator
-            BlackMisc::Simulation::CInterpolatorSpline *getInterpolator() const { return m_interpolator.data(); }
+            BlackMisc::Simulation::CInterpolatorMulti *getInterpolator() const { return m_interpolator.data(); }
 
             //! Add parts for interpolator
             void addAircraftParts(const BlackMisc::Aviation::CAircraftParts &parts);
@@ -142,7 +142,7 @@ namespace BlackSimPlugin
             BlackMisc::Aviation::CAircraftLights m_lightsAsSent { nullptr };       //!< lights as sent to simulator
             SIMCONNECT_PERIOD m_requestSimDataPeriod = SIMCONNECT_PERIOD_NEVER;    //!< how often do we query ground elevation
             // QSharedPointer<BlackMisc::Simulation::CInterpolatorLinear> m_interpolator; //!< shared pointer because CSimConnectObject can be copied
-            QSharedPointer<BlackMisc::Simulation::CInterpolatorSpline> m_interpolator; //!< shared pointer because CSimConnectObject can be copied
+            QSharedPointer<BlackMisc::Simulation::CInterpolatorMulti> m_interpolator; //!< shared pointer because CSimConnectObject can be copied
         };
 
         //! Simulator objects (aka AI aircraft)
diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
index 243e7a936..1d54a5d41 100644
--- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
+++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
@@ -14,8 +14,7 @@
 #include "blackmisc/simulation/fscommon/bcdconversions.h"
 #include "blackmisc/simulation/fscommon/fscommonutil.h"
 #include "blackmisc/simulation/aircraftmodel.h"
-#include "blackmisc/simulation/interpolatorlinear.h"
-#include "blackmisc/simulation/interpolatorspline.h"
+#include "blackmisc/simulation/interpolatormulti.h"
 #include "blackmisc/simulation/interpolationhints.h"
 #include "blackmisc/simulation/simulatorplugininfo.h"
 #include "blackmisc/aviation/airportlist.h"
diff --git a/src/xbus/traffic.h b/src/xbus/traffic.h
index 18c482d74..6b90313f4 100644
--- a/src/xbus/traffic.h
+++ b/src/xbus/traffic.h
@@ -16,7 +16,7 @@
 #include "terrainprobe.h"
 #include "blackmisc/aviation/aircraftsituationlist.h"
 #include "blackmisc/aviation/aircraftpartslist.h"
-#include "blackmisc/simulation/interpolatorspline.h"
+#include "blackmisc/simulation/interpolatormulti.h"
 #include <QObject>
 #include <QHash>
 #include <QVector>
@@ -131,7 +131,7 @@ namespace XBus
             bool hasSurfaces = false;
             bool hasXpdr = false;
             char label[32] {};
-            BlackMisc::Simulation::CInterpolatorSpline interpolator;
+            BlackMisc::Simulation::CInterpolatorMulti interpolator;
             CTerrainProbe terrainProbe;
             BlackMisc::Simulation::CInterpolationHints hints();
             XPMPPlaneSurfaces_t surfaces;