From 309d593607497c8b4425e8a24816a285cc1915a3 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 26 Jan 2017 15:20:47 +0100 Subject: [PATCH] refs #871, use const values for times --- src/blackcore/airspacemonitor.cpp | 3 ++- src/blackcore/vatsim/networkvatlib.cpp | 4 ++-- src/blackcore/vatsim/networkvatlib.h | 10 ++++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp index 1981db09a..368937c33 100644 --- a/src/blackcore/airspacemonitor.cpp +++ b/src/blackcore/airspacemonitor.cpp @@ -12,6 +12,7 @@ #include "blackcore/aircraftmatcher.h" #include "blackcore/matchingutils.h" #include "blackcore/application.h" +#include "blackcore/vatsim/networkvatlib.h" #include "blackcore/vatsim/vatsimbookingreader.h" #include "blackcore/vatsim/vatsimdatafilereader.h" #include "blackcore/webdataservices.h" @@ -1228,7 +1229,7 @@ namespace BlackCore if (callsign.isEmpty()) { return; } // get time offset from situation - qint64 timeOffsetMs = 6000; //! \fixme 6000 is assumed default offset, copied from CNetworkVatlib::onPilotPositionUpdate + qint64 timeOffsetMs = CNetworkVatlib::c_positionTimeOffsetMsec; { QReadLocker lock(&m_lockSituations); const CAircraftSituationList &situationList = this->m_situationsByCallsign[callsign]; diff --git a/src/blackcore/vatsim/networkvatlib.cpp b/src/blackcore/vatsim/networkvatlib.cpp index 8a0f96b43..53b7de5a9 100644 --- a/src/blackcore/vatsim/networkvatlib.cpp +++ b/src/blackcore/vatsim/networkvatlib.cpp @@ -846,7 +846,7 @@ namespace BlackCore CAltitude({ 0, nullptr }, CAltitude::MeanSeaLevel) ); situation.setCurrentUtcTime(); - situation.setTimeOffsetMs(6000); + situation.setTimeOffsetMs(c_positionTimeOffsetMsec); QString transponderName("transponder "); transponderName.append(callsign.asString()); @@ -923,7 +923,7 @@ namespace BlackCore CAltitude({ 0, nullptr }, CAltitude::MeanSeaLevel) ); situation.setCurrentUtcTime(); - situation.setTimeOffsetMs(2000); + situation.setTimeOffsetMs(c_interimPositionTimeOffsetMsec); situation.setInterimFlag(true); emit cbvar_cast(cbvar)->aircraftInterimPositionUpdate(situation); diff --git a/src/blackcore/vatsim/networkvatlib.h b/src/blackcore/vatsim/networkvatlib.h index ef9e53214..25470cdbe 100644 --- a/src/blackcore/vatsim/networkvatlib.h +++ b/src/blackcore/vatsim/networkvatlib.h @@ -121,6 +121,9 @@ namespace BlackCore //! Cmd. line options this library can handle static const QList &getCmdLineOptions(); + static int const c_positionTimeOffsetMsec = 6000; //!< offset time for received position updates + static int const c_interimPositionTimeOffsetMsec = 2000; //!< offset time for received interim position updates + private: bool getCmdLineClientIdAndKey(int &id, QString &key) const; bool getCmdLineServerType(VatServerType &serverType) const; @@ -219,10 +222,9 @@ namespace BlackCore QTimer m_positionUpdateTimer; QTimer m_interimPositionUpdateTimer; - static int const c_processingIntervalMsec = 100; - static int const c_updatePostionIntervalMsec = 5000; - static int const c_updateInterimPostionIntervalMsec = 1000; - static int const c_logoffTimeoutSec = 5; + static int const c_processingIntervalMsec = 100; //!< interval for the processing timer + static int const c_updatePostionIntervalMsec = 5000; //!< interval for the position update timer (send our position to network) + static int const c_updateInterimPostionIntervalMsec = 1000; //!< interval for iterim position updates (send our position as interim position) }; } //namespace } //namespace