From 46d417c5a237c8f2f0ab09092687a1c7d8c51594 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 5 Apr 2020 03:38:36 +0200 Subject: [PATCH] Ref T778, style and comments, debug hints --- src/blackcore/airspacemonitor.cpp | 6 ++++-- src/blackcore/simulator.cpp | 1 + src/blackmisc/aviation/aircraftsituation.h | 2 +- src/blackmisc/simulation/interpolator.cpp | 2 +- src/blackmisc/simulation/interpolatorspline.cpp | 1 + src/plugins/simulator/fsxcommon/simconnectobject.h | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp index 34456f2a9..f43bbae28 100644 --- a/src/blackcore/airspacemonitor.cpp +++ b/src/blackcore/airspacemonitor.cpp @@ -1454,10 +1454,10 @@ namespace BlackCore // average elevation // 1) from cache // 2) from planes on ground not moving - bool fromNonMoving = false; + bool fromNonMoving = false; bool triedExtrapolation = false; bool couldNotExtrapolate = false; - int fromWhere = -1; // debugging + int fromWhere = -1; // debugging CElevationPlane averagePlane = this->averageElevationOfOnGroundAircraft(situation, CElevationPlane::minorAirportRadius(), 2, 3); if (averagePlane.isNull()) @@ -1485,6 +1485,7 @@ namespace BlackCore fromWhere = 20; } } + Q_UNUSED(fromWhere) // still no elevation if (!correctedSituation.hasGroundElevation()) @@ -1668,4 +1669,5 @@ namespace BlackCore CAirspaceMonitor::FsInnPacket::FsInnPacket(const QString &aircraftIcaoDesignator, const QString &airlineIcaoDesignator, const QString &combinedCode, const QString &modelString) : aircraftIcaoDesignator(aircraftIcaoDesignator.trimmed().toUpper()), airlineIcaoDesignator(airlineIcaoDesignator.trimmed().toUpper()), combinedCode(combinedCode.trimmed().toUpper()), modelString(modelString.trimmed()) { } + } // namespace diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp index 27c883aa6..e6106ea6f 100644 --- a/src/blackcore/simulator.cpp +++ b/src/blackcore/simulator.cpp @@ -366,6 +366,7 @@ namespace BlackCore if (plane.isNull()) { return; } // this happens if requested for a coordinate where scenery is not available // Update in remote aircraft for given callsign + // this will trigger also a position update, new interpolant etc. bool updatedForOnGroundPosition = false; const int updated = CRemoteAircraftAware::updateAircraftGroundElevation(callsign, plane, CAircraftSituation::FromProvider, &updatedForOnGroundPosition); diff --git a/src/blackmisc/aviation/aircraftsituation.h b/src/blackmisc/aviation/aircraftsituation.h index a48073e6e..178537300 100644 --- a/src/blackmisc/aviation/aircraftsituation.h +++ b/src/blackmisc/aviation/aircraftsituation.h @@ -186,7 +186,7 @@ namespace BlackMisc //! \sa Geo::ICoordinateGeodetic::equalNormalVectorDouble bool equalPbhAndVector(const CAircraftSituation &other) const; - //! Equal PBH and vector + //! Equal PBH and vecto, plus altitude //! \sa Geo::ICoordinateGeodetic::equalNormalVectorDouble bool equalPbhVectorAltitude(const CAircraftSituation &other) const; diff --git a/src/blackmisc/simulation/interpolator.cpp b/src/blackmisc/simulation/interpolator.cpp index 5a327a8c2..6b3b4b6c7 100644 --- a/src/blackmisc/simulation/interpolator.cpp +++ b/src/blackmisc/simulation/interpolator.cpp @@ -523,7 +523,7 @@ namespace BlackMisc { Q_ASSERT_X(!m_callsign.isEmpty(), Q_FUNC_INFO, "Missing callsign"); - const qint64 lastModifed = this->situationsLastModified(m_callsign); + const qint64 lastModifed = this->situationsLastModified(m_callsign); const bool slowUpdateStep = (((m_interpolatedSituationsCounter + aircraftNumber) % 25) == 0); // flag when parts are updated, which need not to be updated every time const bool changedSituations = lastModifed > m_situationsLastModified; diff --git a/src/blackmisc/simulation/interpolatorspline.cpp b/src/blackmisc/simulation/interpolatorspline.cpp index 15119a200..4ab7517a5 100644 --- a/src/blackmisc/simulation/interpolatorspline.cpp +++ b/src/blackmisc/simulation/interpolatorspline.cpp @@ -187,6 +187,7 @@ namespace BlackMisc CInterpolatorSpline::CInterpolant CInterpolatorSpline::getInterpolant(SituationLog &log) { // recalculate derivatives only if they changed + // m_situationsLastModified updated in initIniterpolationStepData const bool recalculate = (m_currentTimeMsSinceEpoch >= m_nextSampleAdjustedTime) || // new step (m_situationsLastModified > m_situationsLastModifiedUsed); // modified diff --git a/src/plugins/simulator/fsxcommon/simconnectobject.h b/src/plugins/simulator/fsxcommon/simconnectobject.h index d2087cbad..665358f07 100644 --- a/src/plugins/simulator/fsxcommon/simconnectobject.h +++ b/src/plugins/simulator/fsxcommon/simconnectobject.h @@ -251,7 +251,7 @@ namespace BlackSimPlugin void increaseAddingExceptions() { m_addingExceptions++; } //! Decrease adding exception - void decreaseAddingExceptions() { if (m_addingExceptions > 0) { m_addingExceptions--; } ; } + void decreaseAddingExceptions() { if (m_addingExceptions > 0) { m_addingExceptions--; } } //! Adding and directly removed int getAddingDirectlyRemoved() const { return m_addingDirectlyRemoved; }