From 3da834e964ea6571217b0acd939a92ca353feeaf Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 24 Jan 2018 01:41:07 +0100 Subject: [PATCH] Ref T231, formatting --- src/blackmisc/simulation/interpolationhints.cpp | 2 +- .../simulation/interpolationrenderingsetup.cpp | 3 ++- .../simulator/fsxcommon/simulatorfsxcommon.cpp | 14 ++++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/blackmisc/simulation/interpolationhints.cpp b/src/blackmisc/simulation/interpolationhints.cpp index cabe8ba5e..914da9d8a 100644 --- a/src/blackmisc/simulation/interpolationhints.cpp +++ b/src/blackmisc/simulation/interpolationhints.cpp @@ -27,7 +27,7 @@ namespace BlackMisc m_isVtol(isVtolAircraft), m_hasParts(hasParts), m_logInterpolation(log) { } - CAltitude CInterpolationHints::getGroundElevation(const Aviation::CAircraftSituation &situation) const + CAltitude CInterpolationHints::getGroundElevation(const CAircraftSituation &situation) const { if (m_elevationProvider) { return m_elevationProvider(situation); } if (m_elevationPlane.isNull() || !m_elevationPlane.isWithinRange(situation)) { return CAltitude::null(); } diff --git a/src/blackmisc/simulation/interpolationrenderingsetup.cpp b/src/blackmisc/simulation/interpolationrenderingsetup.cpp index a1de81b0e..2938705e2 100644 --- a/src/blackmisc/simulation/interpolationrenderingsetup.cpp +++ b/src/blackmisc/simulation/interpolationrenderingsetup.cpp @@ -10,6 +10,7 @@ #include "interpolationrenderingsetup.h" #include "stringutils.h" +using namespace BlackMisc::Aviation; using namespace BlackMisc::PhysicalQuantities; namespace BlackMisc @@ -151,7 +152,7 @@ namespace BlackMisc m_callsignsToLog.clear(); } - BlackMisc::Aviation::CCallsignSet CInterpolationAndRenderingSetup::getLogCallsigns() const + CCallsignSet CInterpolationAndRenderingSetup::getLogCallsigns() const { return m_callsignsToLog; } diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp index e51224388..6ba4ac15c 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp @@ -206,9 +206,9 @@ namespace BlackSimPlugin return false; } - void CSimulatorFsxCommon::displayStatusMessage(const BlackMisc::CStatusMessage &message) const + void CSimulatorFsxCommon::displayStatusMessage(const CStatusMessage &message) const { - QByteArray m = message.getMessage().toLocal8Bit().constData(); + QByteArray m = message.getMessage().toLatin1().constData(); m.append('\0'); SIMCONNECT_TEXT_TYPE type = SIMCONNECT_TEXT_TYPE_PRINT_BLACK; @@ -224,7 +224,7 @@ namespace BlackSimPlugin Q_UNUSED(hr); } - void CSimulatorFsxCommon::displayTextMessage(const BlackMisc::Network::CTextMessage &message) const + void CSimulatorFsxCommon::displayTextMessage(const CTextMessage &message) const { this->displayStatusMessage(message.asStatusMessage(true, true)); } @@ -482,13 +482,14 @@ namespace BlackSimPlugin } } + // CElevationPlane: deg, deg, feet CElevationPlane elevation(remoteAircraftData.latitude, remoteAircraftData.longitude, remoteAircraftData.elevation); elevation.setSinglePointRadius(); // const QString debug(hints.debugInfo(elevation)); CInterpolationHints &hints = m_hints[simObject.getCallsign()]; hints.setElevationPlane(elevation); // update elevation - hints.setCGAboveGround({ remoteAircraftData.cgToGround, CLengthUnit::ft() }); // normally never changing, but if user changes ModelMatching + hints.setCGAboveGround({ remoteAircraftData.cgToGround, CLengthUnit::ft() }); // normally never changing, but if user changes ModelMatching update possible // set it in the remote aircraft provider this->updateAircraftGroundElevation(simObject.getCallsign(), elevation); @@ -1165,6 +1166,7 @@ namespace BlackSimPlugin } } } // all callsigns + const qint64 dt = QDateTime::currentMSecsSinceEpoch() - currentTimestamp; m_statsUpdateAircraftTimeTotalMs += dt; m_statsUpdateAircraftCountMs++; @@ -1382,12 +1384,12 @@ namespace BlackSimPlugin // MSFS has inverted pitch and bank angles position.Pitch = -situation.getPitch().value(CAngleUnit::deg()); - position.Bank = -situation.getBank().value(CAngleUnit::deg()); + position.Bank = -situation.getBank().value(CAngleUnit::deg()); position.OnGround = 0U; if (situation.isOnGroundInfoAvailable()) { - const bool onGround = situation.isOnGround() == CAircraftSituation::OnGround; + const bool onGround = (situation.isOnGround() == CAircraftSituation::OnGround); position.OnGround = onGround ? 1U : 0U; } return position;