From 6af1998f58b5f1961191310f086ef762c04c80a9 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 12 Jul 2018 01:57:56 +0200 Subject: [PATCH] Style and comments --- src/blackmisc/aviation/aircraftsituationchange.h | 1 + src/blackmisc/aviation/aircraftsituationlist.cpp | 1 + src/blackmisc/simulation/interpolator.cpp | 1 + src/blackmisc/simulation/remoteaircraftprovider.cpp | 3 ++- src/blackmisc/simulation/remoteaircraftprovider.h | 2 +- 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/blackmisc/aviation/aircraftsituationchange.h b/src/blackmisc/aviation/aircraftsituationchange.h index 24c7500fd..26a2461c4 100644 --- a/src/blackmisc/aviation/aircraftsituationchange.h +++ b/src/blackmisc/aviation/aircraftsituationchange.h @@ -70,6 +70,7 @@ namespace BlackMisc CAircraftSituationChange(); //! Ctor with n situations + //! \remark the timestamps of the latest situation will be used CAircraftSituationChange(const CAircraftSituationList &situations, const PhysicalQuantities::CLength &cg, bool isVtol, bool alreadySortedLatestFirst = false, bool calcStdDeviations = false); //! Get callsign diff --git a/src/blackmisc/aviation/aircraftsituationlist.cpp b/src/blackmisc/aviation/aircraftsituationlist.cpp index 8d0cd26ee..d7d9bfad0 100644 --- a/src/blackmisc/aviation/aircraftsituationlist.cpp +++ b/src/blackmisc/aviation/aircraftsituationlist.cpp @@ -56,6 +56,7 @@ namespace BlackMisc if (elevationPlane.isNull()) { return 0; } if (this->isEmpty()) { return 0; } + // the change has the timestamps of the latest situation Q_ASSERT_X(m_tsAdjustedSortHint == CAircraftSituationList::AdjustedTimestampLatestFirst || this->isSortedAdjustedLatestFirstWithoutNullPositions(), Q_FUNC_INFO, "Need sorted situations without NULL positions"); const CAircraftSituationChange simpleChange(*this, model.getCG(), model.isVtol(), true, false); int c = 0; // changed elevations diff --git a/src/blackmisc/simulation/interpolator.cpp b/src/blackmisc/simulation/interpolator.cpp index c1de31bf3..ae820da63 100644 --- a/src/blackmisc/simulation/interpolator.cpp +++ b/src/blackmisc/simulation/interpolator.cpp @@ -82,6 +82,7 @@ namespace BlackMisc const CAircraftSituationChangeList changes = this->remoteAircraftSituationChanges(m_callsign); m_pastSituationsChange = (changes.size() > 1) ? changes[1] : CAircraftSituationChange::null(); + // fixing offset if (setup.isFixingSceneryOffset() && m_pastSituationsChange.hasSceneryDeviation() && m_model.hasCG()) { const CLength os = m_pastSituationsChange.getGuessedSceneryDeviationCG(); diff --git a/src/blackmisc/simulation/remoteaircraftprovider.cpp b/src/blackmisc/simulation/remoteaircraftprovider.cpp index 14000af59..8607b5e20 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.cpp +++ b/src/blackmisc/simulation/remoteaircraftprovider.cpp @@ -416,8 +416,9 @@ namespace BlackMisc void CRemoteAircraftProvider::storeChange(const CAircraftSituationChange &change) { - QWriteLocker lock(&m_lockChanges); + // a change with the same timestamp will be replaced const CCallsign cs(change.getCallsign()); + QWriteLocker lock(&m_lockChanges); CAircraftSituationChangeList &changeList = m_changesByCallsign[cs]; changeList.push_frontKeepLatestAdjustedFirst(change, true, IRemoteAircraftProvider::MaxSituationsPerCallsign); } diff --git a/src/blackmisc/simulation/remoteaircraftprovider.h b/src/blackmisc/simulation/remoteaircraftprovider.h index 9abf6557e..64d60b87c 100644 --- a/src/blackmisc/simulation/remoteaircraftprovider.h +++ b/src/blackmisc/simulation/remoteaircraftprovider.h @@ -420,7 +420,7 @@ namespace BlackMisc Aviation::CAircraftSituationPerCallsign m_latestSituationByCallsign; //!< latest situations, for performance reasons per callsign, thread safe access required Aviation::CAircraftSituationPerCallsign m_latestOnGroundProviderElevation; //!< situation on ground with elevation from provider Aviation::CAircraftPartsListPerCallsign m_partsByCallsign; //!< parts, for performance reasons per callsign, thread safe access required - Aviation::CAircraftSituationChangeListPerCallsign m_changesByCallsign; //!< changes, for performance reasons per callsign, thread safe access required + Aviation::CAircraftSituationChangeListPerCallsign m_changesByCallsign; //!< changes, for performance reasons per callsign, thread safe access required (same timestamps as corresponding situations) Aviation::CCallsignSet m_aircraftWithParts; //!< aircraft supporting parts, thread safe access required int m_situationsAdded = 0; //!< total number of situations added, thread safe access required int m_partsAdded = 0; //!< total number of parts added, thread safe access required