From 333a92ff63ca1b6be48299d62a206b783a005400 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 19 Mar 2018 20:07:31 +0100 Subject: [PATCH] Ref T259, Ref T243 renaming to CInterpolationAndRenderingSetupPerCallsign --- src/blackmisc/simulation/interpolationlogger.h | 2 +- src/blackmisc/simulation/interpolator.cpp | 7 +++---- src/blackmisc/simulation/interpolator.h | 5 ++--- src/blackmisc/simulation/interpolatordummy.h | 4 ++-- src/blackmisc/simulation/interpolatorlinear.cpp | 8 ++++---- src/blackmisc/simulation/interpolatorlinear.h | 6 +++--- src/blackmisc/simulation/interpolatormulti.cpp | 7 +++---- src/blackmisc/simulation/interpolatormulti.h | 7 +++---- src/blackmisc/simulation/interpolatorspline.cpp | 8 ++++---- src/blackmisc/simulation/interpolatorspline.h | 11 +++++------ src/plugins/simulator/emulated/simulatoremulated.cpp | 4 ++-- src/plugins/simulator/fsxcommon/simconnectobject.cpp | 5 +++-- src/plugins/simulator/fsxcommon/simconnectobject.h | 4 ++-- src/plugins/simulator/xplane/xplanempaircraft.cpp | 5 +++-- src/plugins/simulator/xplane/xplanempaircraft.h | 4 ++-- src/xswiftbus/traffic.cpp | 7 ++++--- tests/blackmisc/testinterpolatorlinear.cpp | 2 +- tests/blackmisc/testinterpolatorparts.cpp | 2 +- 18 files changed, 48 insertions(+), 50 deletions(-) diff --git a/src/blackmisc/simulation/interpolationlogger.h b/src/blackmisc/simulation/interpolationlogger.h index 3eb4887b4..3e73c13fc 100644 --- a/src/blackmisc/simulation/interpolationlogger.h +++ b/src/blackmisc/simulation/interpolationlogger.h @@ -47,7 +47,7 @@ namespace BlackMisc Aviation::CAircraftSituationList interpolationSituations; //!< the interpolator uses 2, 3 situations (oldest at end) Aviation::CAircraftSituation situationCurrent; //!< interpolated situation PhysicalQuantities::CLength cgAboveGround; //!< center of gravity - CInterpolationAndRenderingSetup usedSetup; //!< used setup + CInterpolationAndRenderingSetupPerCallsign usedSetup; //!< used setup CInterpolationHints usedHints; //!< hints //! Delta time between interpolation and current time diff --git a/src/blackmisc/simulation/interpolator.cpp b/src/blackmisc/simulation/interpolator.cpp index f2bc3376e..6c7a850dc 100644 --- a/src/blackmisc/simulation/interpolator.cpp +++ b/src/blackmisc/simulation/interpolator.cpp @@ -54,7 +54,7 @@ namespace BlackMisc template CAircraftSituation CInterpolator::getInterpolatedSituation( qint64 currentTimeMsSinceEpoc, - const CInterpolationAndRenderingSetup &setup, const CInterpolationHints &hints, + const CInterpolationAndRenderingSetupPerCallsign &setup, const CInterpolationHints &hints, CInterpolationStatus &status) { Q_ASSERT_X(!m_callsign.isEmpty(), Q_FUNC_INFO, "Missing callsign"); @@ -224,9 +224,8 @@ namespace BlackMisc } template - CAircraftParts CInterpolator::getInterpolatedParts( - qint64 currentTimeMsSinceEpoch, - const CInterpolationAndRenderingSetup &setup, CPartsStatus &partsStatus, bool log) const + CAircraftParts CInterpolator::getInterpolatedParts(qint64 currentTimeMsSinceEpoch, + const CInterpolationAndRenderingSetupPerCallsign &setup, CPartsStatus &partsStatus, bool log) const { // (!) this code is used by linear and spline interpolator Q_UNUSED(setup); diff --git a/src/blackmisc/simulation/interpolator.h b/src/blackmisc/simulation/interpolator.h index e6f02e0e1..d8c2deb23 100644 --- a/src/blackmisc/simulation/interpolator.h +++ b/src/blackmisc/simulation/interpolator.h @@ -45,12 +45,11 @@ namespace BlackMisc const CLogCategoryList &getLogCategories(); //! Current interpolated situation - Aviation::CAircraftSituation getInterpolatedSituation( - qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetup &setup, const CInterpolationHints &hints, CInterpolationStatus &status); + Aviation::CAircraftSituation getInterpolatedSituation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, const CInterpolationHints &hints, CInterpolationStatus &status); //! Parts before given offset time (aka pending parts) Aviation::CAircraftParts getInterpolatedParts( - qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetup &setup, CPartsStatus &partsStatus, bool log = false) const; + qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, CPartsStatus &partsStatus, bool log = false) const; //! Add a new aircraft situation void addAircraftSituation(const Aviation::CAircraftSituation &situation); diff --git a/src/blackmisc/simulation/interpolatordummy.h b/src/blackmisc/simulation/interpolatordummy.h index d0689db19..8e873cbdf 100644 --- a/src/blackmisc/simulation/interpolatordummy.h +++ b/src/blackmisc/simulation/interpolatordummy.h @@ -38,11 +38,11 @@ namespace BlackMisc //! \copydoc CInterpolator::getInterpolatedSituation BlackMisc::Aviation::CAircraftSituation getInterpolatedSituation( - qint64, const CInterpolationAndRenderingSetup &, const CInterpolationHints &, CInterpolationStatus &) { return {}; } + qint64, const CInterpolationAndRenderingSetupGlobal &, const CInterpolationHints &, CInterpolationStatus &) { return {}; } //! \copydoc CInterpolator::getInterpolatedParts BlackMisc::Aviation::CAircraftParts getInterpolatedParts( - qint64, const CInterpolationAndRenderingSetup &, CPartsStatus &, bool = false) const { return {}; } + qint64, const CInterpolationAndRenderingSetupGlobal &, CPartsStatus &, bool = false) const { return {}; } //! \copydoc CInterpolator::addAircraftSituation void addAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &) {} diff --git a/src/blackmisc/simulation/interpolatorlinear.cpp b/src/blackmisc/simulation/interpolatorlinear.cpp index 1b9f6bd5c..d2adbc82d 100644 --- a/src/blackmisc/simulation/interpolatorlinear.cpp +++ b/src/blackmisc/simulation/interpolatorlinear.cpp @@ -50,7 +50,7 @@ namespace BlackMisc {} CInterpolatorLinear::Interpolant CInterpolatorLinear::getInterpolant(qint64 currentTimeMsSinceEpoc, - const CInterpolationAndRenderingSetup &setup, const CInterpolationHints &hints, CInterpolationStatus &status, SituationLog &log) const + const CInterpolationAndRenderingSetupPerCallsign &setup, const CInterpolationHints &hints, CInterpolationStatus &status, SituationLog &log) const { Q_UNUSED(setup); Q_UNUSED(hints); @@ -68,7 +68,7 @@ namespace BlackMisc // find the first situation earlier than the current time const CAircraftSituationList &validSituations = m_aircraftSituations; // if needed, we could also copy here - const auto pivot = std::partition_point(validSituations.begin(), validSituations.end(), [ = ](auto && s) { return s.getAdjustedMSecsSinceEpoch() > currentTimeMsSinceEpoc; }); + const auto pivot = std::partition_point(validSituations.begin(), validSituations.end(), [ = ](auto &&s) { return s.getAdjustedMSecsSinceEpoch() > currentTimeMsSinceEpoc; }); const auto situationsNewer = makeRange(validSituations.begin(), pivot); const auto situationsOlder = makeRange(pivot, validSituations.end()); @@ -159,7 +159,7 @@ namespace BlackMisc return { oldSituation, newSituation, simulationTimeFraction, interpolatedTime }; } - CCoordinateGeodetic CInterpolatorLinear::Interpolant::interpolatePosition(const CInterpolationAndRenderingSetup &setup, const CInterpolationHints &hints) const + CCoordinateGeodetic CInterpolatorLinear::Interpolant::interpolatePosition(const CInterpolationAndRenderingSetupPerCallsign &setup, const CInterpolationHints &hints) const { Q_UNUSED(setup); Q_UNUSED(hints); @@ -175,7 +175,7 @@ namespace BlackMisc return currentPosition; } - CAltitude CInterpolatorLinear::Interpolant::interpolateAltitude(const CInterpolationAndRenderingSetup &setup, const CInterpolationHints &hints) const + CAltitude CInterpolatorLinear::Interpolant::interpolateAltitude(const CInterpolationAndRenderingSetupPerCallsign &setup, const CInterpolationHints &hints) const { Q_UNUSED(setup); Q_UNUSED(hints); diff --git a/src/blackmisc/simulation/interpolatorlinear.h b/src/blackmisc/simulation/interpolatorlinear.h index 7040e1927..9f007c94d 100644 --- a/src/blackmisc/simulation/interpolatorlinear.h +++ b/src/blackmisc/simulation/interpolatorlinear.h @@ -49,8 +49,8 @@ namespace BlackMisc //! Perform the interpolation //! @{ - Geo::CCoordinateGeodetic interpolatePosition(const CInterpolationAndRenderingSetup &setup, const CInterpolationHints &hints) const; - Aviation::CAltitude interpolateAltitude(const CInterpolationAndRenderingSetup &setup, const CInterpolationHints &hints) const; + Geo::CCoordinateGeodetic interpolatePosition(const CInterpolationAndRenderingSetupPerCallsign &setup, const CInterpolationHints &hints) const; + Aviation::CAltitude interpolateAltitude(const CInterpolationAndRenderingSetupPerCallsign &setup, const CInterpolationHints &hints) const; //! @} //! Interpolator for pitch, bank, heading, groundspeed @@ -75,7 +75,7 @@ namespace BlackMisc }; //! Get the interpolant for the given time point - Interpolant getInterpolant(qint64 currentTimeMsSinceEpoc, const CInterpolationAndRenderingSetup &setup, + Interpolant getInterpolant(qint64 currentTimeMsSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, const CInterpolationHints &hints, CInterpolationStatus &status, SituationLog &log) const; }; } // ns diff --git a/src/blackmisc/simulation/interpolatormulti.cpp b/src/blackmisc/simulation/interpolatormulti.cpp index 05d54bb3e..30510613b 100644 --- a/src/blackmisc/simulation/interpolatormulti.cpp +++ b/src/blackmisc/simulation/interpolatormulti.cpp @@ -23,9 +23,8 @@ namespace BlackMisc m_linear(callsign, this) {} - CAircraftSituation CInterpolatorMulti::getInterpolatedSituation( - qint64 currentTimeSinceEpoc, - const CInterpolationAndRenderingSetup &setup, + CAircraftSituation CInterpolatorMulti::getInterpolatedSituation(qint64 currentTimeSinceEpoc, + const CInterpolationAndRenderingSetupPerCallsign &setup, const CInterpolationHints &hints, CInterpolationStatus &status) { switch (m_mode) @@ -38,7 +37,7 @@ namespace BlackMisc } CAircraftParts CInterpolatorMulti::getInterpolatedParts( - qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetup &setup, + qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, CPartsStatus &partsStatus, bool log) const { switch (m_mode) diff --git a/src/blackmisc/simulation/interpolatormulti.h b/src/blackmisc/simulation/interpolatormulti.h index d742b1a0b..d4d53f96a 100644 --- a/src/blackmisc/simulation/interpolatormulti.h +++ b/src/blackmisc/simulation/interpolatormulti.h @@ -33,13 +33,12 @@ namespace BlackMisc //! \copydoc CInterpolator::getInterpolatedSituation Aviation::CAircraftSituation getInterpolatedSituation( qint64 currentTimeSinceEpoc, - const CInterpolationAndRenderingSetup &setup, + const CInterpolationAndRenderingSetupPerCallsign &setup, const CInterpolationHints &hints, CInterpolationStatus &status); //! \copydoc CInterpolator::getInterpolatedParts - Aviation::CAircraftParts getInterpolatedParts( - qint64 currentTimeSinceEpoc, - const CInterpolationAndRenderingSetup &setup, + Aviation::CAircraftParts getInterpolatedParts(qint64 currentTimeSinceEpoc, + const CInterpolationAndRenderingSetupPerCallsign &setup, CPartsStatus &partsStatus, bool log = false) const; //! \copydoc CInterpolator::addAircraftSituation diff --git a/src/blackmisc/simulation/interpolatorspline.cpp b/src/blackmisc/simulation/interpolatorspline.cpp index 66390680d..27de1a920 100644 --- a/src/blackmisc/simulation/interpolatorspline.cpp +++ b/src/blackmisc/simulation/interpolatorspline.cpp @@ -96,7 +96,7 @@ namespace BlackMisc } CInterpolatorSpline::Interpolant CInterpolatorSpline::getInterpolant(qint64 currentTimeMsSinceEpoc, - const CInterpolationAndRenderingSetup &setup, const CInterpolationHints &hints, CInterpolationStatus &status, + const CInterpolationAndRenderingSetupPerCallsign &setup, const CInterpolationHints &hints, CInterpolationStatus &status, SituationLog &log) { Q_UNUSED(hints); @@ -117,7 +117,7 @@ namespace BlackMisc // find the first situation earlier than the current time const CAircraftSituationList &validSituations = m_aircraftSituations; // if needed, we could also copy here - const auto pivot = std::partition_point(validSituations.begin(), validSituations.end(), [ = ](auto && s) { return s.getAdjustedMSecsSinceEpoch() > currentTimeMsSinceEpoc; }); + const auto pivot = std::partition_point(validSituations.begin(), validSituations.end(), [ = ](auto &&s) { return s.getAdjustedMSecsSinceEpoch() > currentTimeMsSinceEpoc; }); const auto situationsNewer = makeRange(validSituations.begin(), pivot); const auto situationsOlder = makeRange(pivot, validSituations.end()); @@ -205,7 +205,7 @@ namespace BlackMisc return m_interpolant; } - CCoordinateGeodetic CInterpolatorSpline::Interpolant::interpolatePosition(const CInterpolationAndRenderingSetup &setup, const CInterpolationHints &hints) const + CCoordinateGeodetic CInterpolatorSpline::Interpolant::interpolatePosition(const CInterpolationAndRenderingSetupPerCallsign &setup, const CInterpolationHints &hints) const { Q_UNUSED(setup); Q_UNUSED(hints); @@ -219,7 +219,7 @@ namespace BlackMisc return currentPosition; } - CAltitude CInterpolatorSpline::Interpolant::interpolateAltitude(const CInterpolationAndRenderingSetup &setup, const CInterpolationHints &hints) const + CAltitude CInterpolatorSpline::Interpolant::interpolateAltitude(const CInterpolationAndRenderingSetupPerCallsign &setup, const CInterpolationHints &hints) const { Q_UNUSED(setup); Q_UNUSED(hints); diff --git a/src/blackmisc/simulation/interpolatorspline.h b/src/blackmisc/simulation/interpolatorspline.h index b969eec07..d3f904324 100644 --- a/src/blackmisc/simulation/interpolatorspline.h +++ b/src/blackmisc/simulation/interpolatorspline.h @@ -63,8 +63,8 @@ namespace BlackMisc //! Perform the interpolation //! @{ - Geo::CCoordinateGeodetic interpolatePosition(const CInterpolationAndRenderingSetup &setup, const CInterpolationHints &hints) const; - Aviation::CAltitude interpolateAltitude(const CInterpolationAndRenderingSetup &setup, const CInterpolationHints &hints) const; + Geo::CCoordinateGeodetic interpolatePosition(const CInterpolationAndRenderingSetupPerCallsign &setup, const CInterpolationHints &hints) const; + Aviation::CAltitude interpolateAltitude(const CInterpolationAndRenderingSetupPerCallsign &setup, const CInterpolationHints &hints) const; //! @} //! Interpolator for pitch, bank, heading, groundspeed @@ -91,10 +91,9 @@ namespace BlackMisc }; //! Strategy used by CInterpolator::getInterpolatedSituation - Interpolant getInterpolant( - qint64 currentTimeMsSinceEpoc, - const CInterpolationAndRenderingSetup &setup, - const CInterpolationHints &hints, CInterpolationStatus &status, SituationLog &log); + Interpolant getInterpolant(qint64 currentTimeMsSinceEpoc, + const CInterpolationAndRenderingSetupPerCallsign &setup, + const CInterpolationHints &hints, CInterpolationStatus &status, SituationLog &log); private: qint64 m_prevSampleAdjustedTime = 0; //!< previous sample time + offset diff --git a/src/plugins/simulator/emulated/simulatoremulated.cpp b/src/plugins/simulator/emulated/simulatoremulated.cpp index f569a74ce..202d65c11 100644 --- a/src/plugins/simulator/emulated/simulatoremulated.cpp +++ b/src/plugins/simulator/emulated/simulatoremulated.cpp @@ -430,12 +430,12 @@ namespace BlackSimPlugin void CSimulatorEmulated::fetchFromInterpolator() { const qint64 now = QDateTime::currentMSecsSinceEpoch(); - const CInterpolationAndRenderingSetup setup = this->getInterpolationAndRenderingSetup(); // threadsafe copy for (const CSimulatedAircraft &aircraft : m_renderedAircraft) { const CCallsign cs = aircraft.getCallsign(); if (!m_interpolators.contains(cs)) { continue; } - const bool log = setup.isLogCallsign(cs); + const CInterpolationAndRenderingSetupPerCallsign setup = this->getInterpolationSetupPerCallsignOrDefault(cs); // threadsafe copy + const bool log = setup.logInterpolation(); CInterpolatorMulti *im = m_interpolators[cs]; CInterpolationStatus statusInterpolation; CPartsStatus statusParts; diff --git a/src/plugins/simulator/fsxcommon/simconnectobject.cpp b/src/plugins/simulator/fsxcommon/simconnectobject.cpp index b08c86e66..9dd2f0307 100644 --- a/src/plugins/simulator/fsxcommon/simconnectobject.cpp +++ b/src/plugins/simulator/fsxcommon/simconnectobject.cpp @@ -162,7 +162,7 @@ namespace BlackSimPlugin CAircraftSituation CSimConnectObject::getInterpolatedSituation( qint64 currentTimeSinceEpoc, - const CInterpolationAndRenderingSetup &setup, + const CInterpolationAndRenderingSetupPerCallsign &setup, const CInterpolationHints &hints, CInterpolationStatus &status) const { Q_ASSERT(m_interpolator); @@ -170,7 +170,8 @@ namespace BlackSimPlugin } CAircraftParts CSimConnectObject::getInterpolatedParts( - qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetup &setup, + qint64 currentTimeSinceEpoc, + const CInterpolationAndRenderingSetupPerCallsign &setup, CPartsStatus &partsStatus, bool log) const { Q_ASSERT(m_interpolator); diff --git a/src/plugins/simulator/fsxcommon/simconnectobject.h b/src/plugins/simulator/fsxcommon/simconnectobject.h index 22fbee5f2..2ecb57a80 100644 --- a/src/plugins/simulator/fsxcommon/simconnectobject.h +++ b/src/plugins/simulator/fsxcommon/simconnectobject.h @@ -163,13 +163,13 @@ namespace BlackSimPlugin //! \copydoc BlackMisc::Simulation::CInterpolator::getInterpolatedSituation BlackMisc::Aviation::CAircraftSituation getInterpolatedSituation( qint64 currentTimeSinceEpoc, - const BlackMisc::Simulation::CInterpolationAndRenderingSetup &setup, + const BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign &setup, const BlackMisc::Simulation::CInterpolationHints &hints, BlackMisc::Simulation::CInterpolationStatus &status) const; //! \copydoc BlackMisc::Simulation::CInterpolator::getInterpolatedParts BlackMisc::Aviation::CAircraftParts getInterpolatedParts( qint64 currentTimeSinceEpoc, - const BlackMisc::Simulation::CInterpolationAndRenderingSetup &setup, + const BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign &setup, BlackMisc::Simulation::CPartsStatus &partsStatus, bool log) const; //! Interpolator diff --git a/src/plugins/simulator/xplane/xplanempaircraft.cpp b/src/plugins/simulator/xplane/xplanempaircraft.cpp index a5b1497d5..3e5b5d6e0 100644 --- a/src/plugins/simulator/xplane/xplanempaircraft.cpp +++ b/src/plugins/simulator/xplane/xplanempaircraft.cpp @@ -91,7 +91,7 @@ namespace BlackSimPlugin CAircraftSituation CXPlaneMPAircraft::getInterpolatedSituation( qint64 currentTimeSinceEpoc, - const CInterpolationAndRenderingSetup &setup, + const CInterpolationAndRenderingSetupPerCallsign &setup, const CInterpolationHints &hints, CInterpolationStatus &status) const { Q_ASSERT(m_interpolator); @@ -99,7 +99,8 @@ namespace BlackSimPlugin } CAircraftParts CXPlaneMPAircraft::getInterpolatedParts( - qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetup &setup, + qint64 currentTimeSinceEpoc, + const CInterpolationAndRenderingSetupPerCallsign &setup, CPartsStatus &partsStatus, bool log) const { Q_ASSERT(m_interpolator); diff --git a/src/plugins/simulator/xplane/xplanempaircraft.h b/src/plugins/simulator/xplane/xplanempaircraft.h index 93831f623..57b122bf5 100644 --- a/src/plugins/simulator/xplane/xplanempaircraft.h +++ b/src/plugins/simulator/xplane/xplanempaircraft.h @@ -89,13 +89,13 @@ namespace BlackSimPlugin //! \copydoc BlackMisc::Simulation::CInterpolator::getInterpolatedSituation BlackMisc::Aviation::CAircraftSituation getInterpolatedSituation( qint64 currentTimeSinceEpoc, - const BlackMisc::Simulation::CInterpolationAndRenderingSetup &setup, + const BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign &setup, const BlackMisc::Simulation::CInterpolationHints &hints, BlackMisc::Simulation::CInterpolationStatus &status) const; //! \copydoc BlackMisc::Simulation::CInterpolator::getInterpolatedParts BlackMisc::Aviation::CAircraftParts getInterpolatedParts( qint64 currentTimeSinceEpoc, - const BlackMisc::Simulation::CInterpolationAndRenderingSetup &setup, + const BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign &setup, BlackMisc::Simulation::CPartsStatus &partsStatus, bool log) const; //! Interpolator diff --git a/src/xswiftbus/traffic.cpp b/src/xswiftbus/traffic.cpp index 43e2e96ef..dfec22afc 100644 --- a/src/xswiftbus/traffic.cpp +++ b/src/xswiftbus/traffic.cpp @@ -16,6 +16,7 @@ #include "utils.h" #include "blackmisc/simulation/interpolator.h" #include "blackmisc/simulation/interpolationhints.h" +#include "blackmisc/aviation/aircraftsituation.h" #include "blackmisc/aviation/callsign.h" #include "blackmisc/verify.h" #include "XPMPMultiplayer.h" @@ -56,7 +57,7 @@ namespace XSwiftBus using namespace BlackMisc::Aviation; using namespace BlackMisc::Simulation; - CInterpolationAndRenderingSetup setup; + CInterpolationAndRenderingSetupPerCallsign setup; CInterpolationHints hints; CPartsStatus status; constexpr double fudgeFactor = 3.0; //! \fixme Value should be different for each plane, derived from the CSL model geometry @@ -429,9 +430,9 @@ namespace XSwiftBus } else { - BlackMisc::Simulation::CInterpolationAndRenderingSetup setup; + BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign setup; BlackMisc::Simulation::CInterpolationStatus status; - const auto situation = plane->interpolator.getInterpolatedSituation(-1, setup, plane->hints(), status); + BlackMisc::Aviation::CAircraftSituation situation = plane->interpolator.getInterpolatedSituation(-1, setup, plane->hints(), status); if (! status.hasValidSituation()) { return xpmpData_Unavailable; } //! \fixme KB 2018-01 commented out with T229. Change detection needs to go somewhere else diff --git a/tests/blackmisc/testinterpolatorlinear.cpp b/tests/blackmisc/testinterpolatorlinear.cpp index ca07d029b..d68c869f1 100644 --- a/tests/blackmisc/testinterpolatorlinear.cpp +++ b/tests/blackmisc/testinterpolatorlinear.cpp @@ -85,7 +85,7 @@ namespace BlackMiscTest // interpolation functional check CInterpolationStatus status; const CInterpolationHints hints; - const CInterpolationAndRenderingSetup setup; + const CInterpolationAndRenderingSetupPerCallsign setup; double latOld = 360.0; double lngOld = 360.0; for (qint64 currentTime = ts - 2 * deltaT + offset; currentTime < ts + offset; currentTime += (deltaT / 20)) diff --git a/tests/blackmisc/testinterpolatorparts.cpp b/tests/blackmisc/testinterpolatorparts.cpp index 7f3bc0f21..4ce4d77dc 100644 --- a/tests/blackmisc/testinterpolatorparts.cpp +++ b/tests/blackmisc/testinterpolatorparts.cpp @@ -49,7 +49,7 @@ namespace BlackMiscTest // interpolation functional check CPartsStatus status; - const CInterpolationAndRenderingSetup setup; + const CInterpolationAndRenderingSetupPerCallsign setup; qint64 oldestTs = parts.oldestTimestampMsecsSinceEpoch(); // Testing for a time >> last time