From 00d859d5b365d95e4634365d507b14321e8c7aee Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 11 Oct 2018 03:19:21 +0200 Subject: [PATCH] Ref T297, style and remarks for T297 --- src/blackcore/airspacemonitor.cpp | 2 +- src/blackmisc/network/fsdsetup.h | 7 ++++--- src/blackmisc/simulation/interpolatorlinear.cpp | 5 +++-- src/blackmisc/simulation/remoteaircraftprovider.h | 2 +- src/blackmisc/timestampbased.h | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp index 37c9500ab..012ecb6ac 100644 --- a/src/blackcore/airspacemonitor.cpp +++ b/src/blackcore/airspacemonitor.cpp @@ -1061,7 +1061,7 @@ namespace BlackCore } else { - // values before updating (i.e. "storing") so the new situation is noty yet considered + // values before updating (i.e. "storing") so the new situation is not yet considered const CAircraftSituationList oldSituations = this->remoteAircraftSituations(callsign); const CAircraftSituationChangeList oldChanges = this->remoteAircraftSituationChanges(callsign); if (oldSituations.size() > 1) diff --git a/src/blackmisc/network/fsdsetup.h b/src/blackmisc/network/fsdsetup.h index 3ee894ffc..1ebebe19d 100644 --- a/src/blackmisc/network/fsdsetup.h +++ b/src/blackmisc/network/fsdsetup.h @@ -56,9 +56,10 @@ namespace BlackMisc Q_DECLARE_FLAGS(SendReceiveDetails, SendReceiveDetailsFlag) //! Offset times basically telling when to expect the next value from network plus some reserve + //! \remark copies of CNetworkVatlib::c_updatePostionIntervalMsec / c_updateInterimPostionIntervalMsec //! @{ - static qint64 constexpr c_positionTimeOffsetMsec = 6000; //!< offset time for received position updates - static qint64 constexpr c_interimPositionTimeOffsetMsec = 2000; //!< offset time for received interim position updates + static qint64 constexpr c_positionTimeOffsetMsec = 6000; //!< offset time for received position updates Ref T297 + static qint64 constexpr c_interimPositionTimeOffsetMsec = 2000; //!< offset time for received interim position updates Ref T297 //! @} //! Default constructor. @@ -105,7 +106,7 @@ namespace BlackMisc //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex void setPropertyByIndex(const CPropertyIndex &index, const CVariant &variant); - //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex + //! \copydoc BlackMisc::Mixin::Index::comparePropertyByIndex int comparePropertyByIndex(const CPropertyIndex &index, const CFsdSetup &compareValue) const; //! \copydoc BlackMisc::Mixin::String::toQString() diff --git a/src/blackmisc/simulation/interpolatorlinear.cpp b/src/blackmisc/simulation/interpolatorlinear.cpp index dfe1beaa1..0af25b5c1 100644 --- a/src/blackmisc/simulation/interpolatorlinear.cpp +++ b/src/blackmisc/simulation/interpolatorlinear.cpp @@ -184,9 +184,10 @@ namespace BlackMisc const double distanceToSplitTimeMs = newSituation.getAdjustedMSecsSinceEpoch() - m_currentTimeMsSinceEpoch; const double simulationTimeFraction = qMax(1.0 - (distanceToSplitTimeMs / sampleDeltaTimeMs), 0.0); const double deltaTimeFractionMs = sampleDeltaTimeMs * simulationTimeFraction; - const qint64 interpolatedTime = oldSituation.getMSecsSinceEpoch() + deltaTimeFractionMs; + const qint64 interpolatedTime = oldSituation.getMSecsSinceEpoch() + qRound(deltaTimeFractionMs); - currentSituation.setTimeOffsetMs(oldSituation.getTimeOffsetMs() + (newSituation.getTimeOffsetMs() - oldSituation.getTimeOffsetMs()) * simulationTimeFraction); + // Ref T297 adjust offset time, but this already the interpolated situation + currentSituation.setTimeOffsetMs(oldSituation.getTimeOffsetMs() + qRound((newSituation.getTimeOffsetMs() - oldSituation.getTimeOffsetMs()) * simulationTimeFraction)); currentSituation.setMSecsSinceEpoch(interpolatedTime); m_currentInterpolationStatus.setInterpolatedAndCheckSituation(true, currentSituation); diff --git a/src/blackmisc/simulation/remoteaircraftprovider.h b/src/blackmisc/simulation/remoteaircraftprovider.h index 00bf1908d..7db34a304 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.h +++ b/src/blackmisc/simulation/remoteaircraftprovider.h @@ -49,7 +49,7 @@ namespace BlackMisc static constexpr int MaxSituationsPerCallsign = 6; //!< How many situations we keep per callsign static constexpr int MaxPartsPerCallsign = 20; //!< How many parts we keep per callsign (we keep more parts than situations as parts can just come in) static constexpr int MaxPartsAgePerCallsignSecs = 60; //!< How many seconds to keep parts for interpolation - static constexpr int DefaultOffsetTimeMs = 6000; //!< \fixme copied from CNetworkVatlib::c_positionTimeOffsetMsec + // static constexpr int DefaultOffsetTimeMs = 6000; //!< \fixme copied from CNetworkVatlib::c_positionTimeOffsetMsec //! Destructor virtual ~IRemoteAircraftProvider(); diff --git a/src/blackmisc/timestampbased.h b/src/blackmisc/timestampbased.h index 485c23850..b57b053ed 100644 --- a/src/blackmisc/timestampbased.h +++ b/src/blackmisc/timestampbased.h @@ -231,7 +231,7 @@ namespace BlackMisc //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex void setPropertyByIndex(const BlackMisc::CPropertyIndex &index, const CVariant &variant); - //! Compare for index + //! \copydoc BlackMisc::Mixin::Index::comparePropertyByIndex int comparePropertyByIndex(const CPropertyIndex &index, const ITimestampWithOffsetBased &compareValue) const; qint64 m_timeOffsetMs = 0; //!< offset time in ms