From 03af49348bab9b049bd6aa003ff0734a3dfceb46 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 3 Mar 2018 17:18:29 +0100 Subject: [PATCH] Ref T259, Ref T243 formatting --- src/blackcore/airspacemonitor.cpp | 2 +- src/blackcore/pluginmanagersimulator.cpp | 2 +- src/blackcore/simulatorcommon.cpp | 4 +-- src/blackcore/vatsim/networkvatlib.cpp | 2 +- src/blackmisc/aviation/aircraftsituation.cpp | 4 +-- src/blackmisc/simulation/interpolator.cpp | 15 +++++------ .../simulator/xplane/simulatorxplane.cpp | 25 ++++++++++--------- .../simulator/xplane/simulatorxplane.h | 4 +-- .../simulator/xplane/xswiftbustrafficproxy.h | 2 +- 9 files changed, 31 insertions(+), 29 deletions(-) diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp index b0b67e754..2b654d125 100644 --- a/src/blackcore/airspacemonitor.cpp +++ b/src/blackcore/airspacemonitor.cpp @@ -1278,7 +1278,7 @@ namespace BlackCore { const QJsonDocument doc(jsonObject); const QString partsAsString = doc.toJson(QJsonDocument::Compact); - const CStatusMessage message(getLogCategories(), BlackMisc::CStatusMessage::SeverityInfo, callsign.isEmpty() ? callsign.toQString() + ": " + partsAsString.trimmed() : partsAsString.trimmed()); + const CStatusMessage message(getLogCategories(), CStatusMessage::SeverityInfo, callsign.isEmpty() ? callsign.toQString() + ": " + partsAsString.trimmed() : partsAsString.trimmed()); if (m_aircraftPartsHistory.contains(callsign)) { CStatusMessageList &msgs = m_aircraftPartsHistory[callsign]; diff --git a/src/blackcore/pluginmanagersimulator.cpp b/src/blackcore/pluginmanagersimulator.cpp index e047fcc18..51b92bf3a 100644 --- a/src/blackcore/pluginmanagersimulator.cpp +++ b/src/blackcore/pluginmanagersimulator.cpp @@ -87,7 +87,7 @@ namespace BlackCore } } - BlackMisc::CSequence CPluginManagerSimulator::acceptedIids() const + CSequence CPluginManagerSimulator::acceptedIids() const { return { diff --git a/src/blackcore/simulatorcommon.cpp b/src/blackcore/simulatorcommon.cpp index 6d8cca453..67f414848 100644 --- a/src/blackcore/simulatorcommon.cpp +++ b/src/blackcore/simulatorcommon.cpp @@ -48,9 +48,9 @@ using namespace BlackCore::Db; namespace BlackCore { CSimulatorCommon::CSimulatorCommon(const CSimulatorPluginInfo &info, - IOwnAircraftProvider *ownAircraftProvider, + IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider, - IWeatherGridProvider *weatherGridProvider, + IWeatherGridProvider *weatherGridProvider, QObject *parent) : ISimulator(parent), COwnAircraftAware(ownAircraftProvider), diff --git a/src/blackcore/vatsim/networkvatlib.cpp b/src/blackcore/vatsim/networkvatlib.cpp index a628ddabd..bd43d56ad 100644 --- a/src/blackcore/vatsim/networkvatlib.cpp +++ b/src/blackcore/vatsim/networkvatlib.cpp @@ -898,7 +898,7 @@ namespace BlackCore //! we set a dynamically updating offset time here situation.setCurrentUtcTime(); - int offsetMs = self->markReceivedPositionAndGetOffsetTime(situation.getCallsign(), situation.getMSecsSinceEpoch()); + const int offsetMs = self->markReceivedPositionAndGetOffsetTime(situation.getCallsign(), situation.getMSecsSinceEpoch()); situation.setTimeOffsetMs(offsetMs); CTransponder::TransponderMode mode = CTransponder::StateStandby; diff --git a/src/blackmisc/aviation/aircraftsituation.cpp b/src/blackmisc/aviation/aircraftsituation.cpp index 4a8346a58..00e996474 100644 --- a/src/blackmisc/aviation/aircraftsituation.cpp +++ b/src/blackmisc/aviation/aircraftsituation.cpp @@ -27,10 +27,10 @@ namespace BlackMisc namespace Aviation { CAircraftSituation::CAircraftSituation() - : m_groundElevation( { 0, nullptr }, CAltitude::MeanSeaLevel) {} + : m_groundElevation({ 0, nullptr }, CAltitude::MeanSeaLevel) {} CAircraftSituation::CAircraftSituation(const CCallsign &correspondingCallsign) - : m_correspondingCallsign(correspondingCallsign), m_groundElevation( { 0, nullptr }, CAltitude::MeanSeaLevel) + : m_correspondingCallsign(correspondingCallsign), m_groundElevation({ 0, nullptr }, CAltitude::MeanSeaLevel) {} CAircraftSituation::CAircraftSituation(const CCoordinateGeodetic &position, const CHeading &heading, const CAngle &pitch, const CAngle &bank, const CSpeed &gs, const CAltitude &groundElevation) diff --git a/src/blackmisc/simulation/interpolator.cpp b/src/blackmisc/simulation/interpolator.cpp index 9b7b44ce8..fa7c369a4 100644 --- a/src/blackmisc/simulation/interpolator.cpp +++ b/src/blackmisc/simulation/interpolator.cpp @@ -222,10 +222,11 @@ namespace BlackMisc } template - CAircraftParts CInterpolator::getInterpolatedParts(qint64 currentTimeMsSinceEpoch, - const CInterpolationAndRenderingSetup &setup, CPartsStatus &partsStatus, bool log) const + CAircraftParts CInterpolator::getInterpolatedParts( + qint64 currentTimeMsSinceEpoch, + const CInterpolationAndRenderingSetup &setup, CPartsStatus &partsStatus, bool log) const { - // this code is used by linear and spline interpolator + // (!) this code is used by linear and spline interpolator Q_UNUSED(setup); partsStatus.reset(); if (currentTimeMsSinceEpoch < 0) { currentTimeMsSinceEpoch = QDateTime::currentMSecsSinceEpoch(); } @@ -246,8 +247,8 @@ namespace BlackMisc // stop if we don't have any parts if (validParts.isEmpty()) { return {}; } - partsStatus.setSupportsParts(true); + partsStatus.setSupportsParts(true); CAircraftParts currentParts; do { @@ -343,9 +344,9 @@ namespace BlackMisc hasOffset ? parts.getTimeOffsetMs() : m_aircraftSituations.isEmpty() ? IRemoteAircraftProvider::DefaultOffsetTimeMs : m_aircraftSituations.front().getTimeOffsetMs(); - CAircraftParts copy(parts); - copy.setTimeOffsetMs(offset); - CInterpolator::addAircraftParts(copy); + CAircraftParts partsCopy(parts); + partsCopy.setTimeOffsetMs(offset); // we set the offset of the situation + CInterpolator::addAircraftParts(partsCopy); return; } diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index 3de4a3c24..a64b73cc8 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -69,9 +69,10 @@ using namespace BlackMisc::Weather; namespace { - inline QString xswiftbusServiceName() + inline const QString &xswiftbusServiceName() { - return QStringLiteral("org.swift-project.xswiftbus"); + static const QString name("org.swift-project.xswiftbus"); + return name; } } @@ -303,7 +304,7 @@ namespace BlackSimPlugin this->reverseLookupAndUpdateOwnAircraftModel(model); } - void CSimulatorXPlane::displayStatusMessage(const BlackMisc::CStatusMessage &message) const + void CSimulatorXPlane::displayStatusMessage(const CStatusMessage &message) const { // No assert here as status message may come because of network problems if (!isConnected()) { return; } @@ -586,7 +587,7 @@ namespace BlackSimPlugin if (! isRemoteAircraftSupportingParts(situation.getCallsign())) { // if aircraft not supporting parts then guess the basics (onGround, gear, lights) - //! \todo not working for vtol + //! \todo not working for VTOL BlackMisc::Aviation::CAircraftParts parts; parts.setMSecsSinceEpoch(situation.getMSecsSinceEpoch()); parts.setTimeOffsetMs(situation.getTimeOffsetMs()); @@ -1009,23 +1010,23 @@ namespace BlackSimPlugin m_trafficProxy->requestRemoteAircraftData(); } - void CSimulatorXPlane::updateRemoteAircraftFromSimulator(const QString &callsign_, double latitude, double longitude, double groundElevation, double modelVerticalOffset) + void CSimulatorXPlane::updateRemoteAircraftFromSimulator(const QString &callsign, double latitudeDeg, double longitudeDeg, double elevationMeters, double modelVerticalOffsetMeters) { - CCallsign callsign(callsign_); - if (!m_xplaneAircraftObjects.contains(callsign)) { return; } + const CCallsign cs(callsign); + if (!m_xplaneAircraftObjects.contains(cs)) { return; } - CElevationPlane elevation(CLatitude(latitude, CAngleUnit::deg()), CLongitude(longitude, CAngleUnit::deg()), CAltitude(groundElevation, CLengthUnit::m())); + CElevationPlane elevation(CLatitude(latitudeDeg, CAngleUnit::deg()), CLongitude(longitudeDeg, CAngleUnit::deg()), CAltitude(elevationMeters, CLengthUnit::m())); elevation.setSinglePointRadius(); - CInterpolationHints &hints = m_hints[callsign]; - hints.setElevationPlane(elevation); // update elevation // The entire vertical offset (CG offset) is still very experimental in X-Plane. Libxplanemp simply calculates the lowest Y // value from all the OpenGL model vertices. I assume its in meters. // The unit of modelVerticalOffset is still very unknown. This needs to be confirmed. - hints.setCGAboveGround({ modelVerticalOffset, CLengthUnit::m() }); + CInterpolationHints &hints = m_hints[cs]; + hints.setElevationPlane(elevation); // update elevation + hints.setCGAboveGround({ modelVerticalOffsetMeters, CLengthUnit::m() }); // set it in the remote aircraft provider - this->updateAircraftGroundElevation(callsign, elevation); + this->updateAircraftGroundElevation(cs, elevation); } BlackCore::ISimulator *CSimulatorXPlaneFactory::create(const CSimulatorPluginInfo &info, diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h index 562a3a96c..0a3c59cd4 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.h +++ b/src/plugins/simulator/xplane/simulatorxplane.h @@ -159,7 +159,7 @@ namespace BlackSimPlugin bool sendRemoteAircraftPartsToSimulator(const CXPlaneMPAircraft &xplaneAircraft, const BlackMisc::Aviation::CAircraftParts &parts); void requestRemoteAircraftDataFromXPlane(); - void updateRemoteAircraftFromSimulator(const QString &callsign, double latitude, double longitude, double elevation, double modelVerticalOffset); + void updateRemoteAircraftFromSimulator(const QString &callsign, double latitudeDeg, double longitudeDeg, double elevationMeters, double modelVerticalOffsetMeters); static constexpr bool c_driverInterpolation = true; static constexpr int GuessRemoteAircraftPartsCycle = 20; //!< guess every n-th cycle @@ -237,7 +237,7 @@ namespace BlackSimPlugin virtual void stopImpl() override; private: - //! \brief Check if XSwiftBus service is already registered + //! Check if XSwiftBus service is already registered bool isXSwiftBusRunning() const; void serviceRegistered(const QString &serviceName); diff --git a/src/plugins/simulator/xplane/xswiftbustrafficproxy.h b/src/plugins/simulator/xplane/xswiftbustrafficproxy.h index 9f50ed2ed..3c66a4199 100644 --- a/src/plugins/simulator/xplane/xswiftbustrafficproxy.h +++ b/src/plugins/simulator/xplane/xswiftbustrafficproxy.h @@ -64,7 +64,7 @@ namespace BlackSimPlugin //! \copydoc XSwiftBus::CTraffic::remoteAircraftData //! \remark from simulator to driver for elevation and CG - void remoteAircraftData(const QString &callsign, double latitude, double longitude, double elevation, double modelVerticalOffset); + void remoteAircraftData(const QString &callsign, double latitudeDeg, double longitudeDeg, double elevationMeters, double modelVerticalOffsetMeters); public slots: //! \copydoc XSwiftBus::CTraffic::initialize