From 34502b6b76aa5af9122b248c279ef03535762f13 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 25 Feb 2018 17:13:08 +0100 Subject: [PATCH] Ref T259, renamed CXPlaneMPAircrafts to CXPlaneMPAircraftObjects * there is no plural for aircraft * so the same style as for simObjects was used --- .../simulator/xplane/simulatorxplane.cpp | 34 +++++++++---------- .../simulator/xplane/simulatorxplane.h | 4 +-- .../simulator/xplane/xplanempaircraft.cpp | 4 +-- .../simulator/xplane/xplanempaircraft.h | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index 3fd039f57..73d00ef16 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -381,13 +381,13 @@ namespace BlackSimPlugin if (mode == CInterpolatorMulti::ModeUnknown) { return false; } if (callsign.isEmpty()) { - const int c = m_xplaneAircraft.setInterpolatorModes(mode); + const int c = m_xplaneAircraftObjects.setInterpolatorModes(mode); return c > 0; } else { - if (!m_xplaneAircraft.contains(callsign)) { return false; } - return m_xplaneAircraft[callsign].setInterpolatorMode(mode); + if (!m_xplaneAircraftObjects.contains(callsign)) { return false; } + return m_xplaneAircraftObjects[callsign].setInterpolatorMode(mode); } } else @@ -418,7 +418,7 @@ namespace BlackSimPlugin { if (c_driverInterpolation) { - return m_xplaneAircraft.contains(callsign); + return m_xplaneAircraftObjects.contains(callsign); } else { @@ -520,7 +520,7 @@ namespace BlackSimPlugin Q_ASSERT_X(!newRemoteAircraft.getCallsign().isEmpty(), Q_FUNC_INFO, "empty callsign"); Q_ASSERT_X(newRemoteAircraft.hasModelString(), Q_FUNC_INFO, "missing model string"); - m_xplaneAircraft.insert(newRemoteAircraft.getCallsign(), CXPlaneMPAircraft(newRemoteAircraft, &m_interpolationLogger)); + m_xplaneAircraftObjects.insert(newRemoteAircraft.getCallsign(), CXPlaneMPAircraft(newRemoteAircraft, &m_interpolationLogger)); CAircraftModel aircraftModel = newRemoteAircraft.getModel(); QString livery = aircraftModel.getLivery().getCombinedCode(); //! \todo livery resolution for XP m_traffic->addPlane(newRemoteAircraft.getCallsign().asString(), aircraftModel.getModelString(), @@ -564,9 +564,9 @@ namespace BlackSimPlugin Q_ASSERT(isConnected()); if (c_driverInterpolation) { - if (m_xplaneAircraft.contains(situation.getCallsign())) + if (m_xplaneAircraftObjects.contains(situation.getCallsign())) { - m_xplaneAircraft[situation.getCallsign()].addAircraftSituation(situation); + m_xplaneAircraftObjects[situation.getCallsign()].addAircraftSituation(situation); } } else @@ -620,9 +620,9 @@ namespace BlackSimPlugin if (c_driverInterpolation) { - if (m_xplaneAircraft.contains(callsign)) + if (m_xplaneAircraftObjects.contains(callsign)) { - m_xplaneAircraft[callsign].addAircraftParts(parts); + m_xplaneAircraftObjects[callsign].addAircraftParts(parts); } } else @@ -650,21 +650,21 @@ namespace BlackSimPlugin m_hints.remove(callsign); // really remove from simulator - if (!m_xplaneAircraft.contains(callsign)) { return false; } // already fully removed or not yet added + if (!m_xplaneAircraftObjects.contains(callsign)) { return false; } // already fully removed or not yet added // mark in provider const bool updated = this->updateAircraftRendered(callsign, false); if (updated) { - Q_ASSERT_X(m_xplaneAircraft.contains(callsign), Q_FUNC_INFO, "Aircraft removed"); - const CXPlaneMPAircraft &xplaneAircraft = m_xplaneAircraft[callsign]; + Q_ASSERT_X(m_xplaneAircraftObjects.contains(callsign), Q_FUNC_INFO, "Aircraft removed"); + const CXPlaneMPAircraft &xplaneAircraft = m_xplaneAircraftObjects[callsign]; CSimulatedAircraft aircraft(xplaneAircraft.getAircraft()); aircraft.setRendered(false); emit this->aircraftRenderingChanged(aircraft); } m_traffic->removePlane(callsign.asString()); - m_xplaneAircraft.remove(callsign); + m_xplaneAircraftObjects.remove(callsign); // bye return true; @@ -688,7 +688,7 @@ namespace BlackSimPlugin { // remove one by one int r = 0; - const CCallsignSet callsigns = m_xplaneAircraft.getAllCallsigns(); + const CCallsignSet callsigns = m_xplaneAircraftObjects.getAllCallsigns(); for (const CCallsign &cs : callsigns) { if (this->physicallyRemoveRemoteAircraft(cs)) { r++; } @@ -838,7 +838,7 @@ namespace BlackSimPlugin const CCallsignSet callsignsToLog(m_interpolationRenderingSetup.getLogCallsigns()); // interpolation for all remote aircraft - const QList xplaneAircrafts(m_xplaneAircraft.values()); + const QList xplaneAircrafts(m_xplaneAircraftObjects.values()); for (const CXPlaneMPAircraft &xplaneAircraft : xplaneAircrafts) { const CCallsign callsign(xplaneAircraft.getCallsign()); @@ -863,7 +863,7 @@ namespace BlackSimPlugin // update situation if (!xplaneAircraft.isSameAsSent(interpolatedSituation)) { - m_xplaneAircraft[xplaneAircraft.getCallsign()].setPositionAsSent(interpolatedSituation); + m_xplaneAircraftObjects[xplaneAircraft.getCallsign()].setPositionAsSent(interpolatedSituation); m_traffic->setPlanePosition(interpolatedSituation.getCallsign().asString(), interpolatedSituation.latitude().value(CAngleUnit::deg()), interpolatedSituation.longitude().value(CAngleUnit::deg()), @@ -1011,7 +1011,7 @@ namespace BlackSimPlugin void CSimulatorXPlane::updateRemoteAircraftFromSimulator(const QString &callsign_, double latitude, double longitude, double groundElevation, double modelVerticalOffset) { CCallsign callsign(callsign_); - if (!m_xplaneAircraft.contains(callsign)) { return; } + if (!m_xplaneAircraftObjects.contains(callsign)) { return; } CElevationPlane elevation(CLatitude(latitude, CAngleUnit::deg()), CLongitude(longitude, CAngleUnit::deg()), CAltitude(groundElevation, CLengthUnit::m())); elevation.setSinglePointRadius(); diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h index e30d7d4d4..432dafe9f 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.h +++ b/src/plugins/simulator/xplane/simulatorxplane.h @@ -176,8 +176,8 @@ namespace BlackSimPlugin BlackMisc::CData m_modelSet { this }; // Driver Interpolation - CXPlaneMPAircrafts m_xplaneAircraft; //!< XPlane multiplayer aircraft - int m_interpolationRequest = 0; //!< current interpolation request + CXPlaneMPAircraftObjects m_xplaneAircraftObjects; //!< XPlane multiplayer aircraft + int m_interpolationRequest = 0; //!< current interpolation request //! \todo Add units to members? pitchDeg?, altitudeFt? struct // data is written by DBus async method callbacks diff --git a/src/plugins/simulator/xplane/xplanempaircraft.cpp b/src/plugins/simulator/xplane/xplanempaircraft.cpp index 31227999c..a5b1497d5 100644 --- a/src/plugins/simulator/xplane/xplanempaircraft.cpp +++ b/src/plugins/simulator/xplane/xplanempaircraft.cpp @@ -106,12 +106,12 @@ namespace BlackSimPlugin return m_interpolator->getInterpolatedParts(currentTimeSinceEpoc, setup, partsStatus, log); } - CCallsignSet CXPlaneMPAircrafts::getAllCallsigns() const + CCallsignSet CXPlaneMPAircraftObjects::getAllCallsigns() const { return CCallsignSet(this->keys()); } - int CXPlaneMPAircrafts::setInterpolatorModes(CInterpolatorMulti::Mode mode) + int CXPlaneMPAircraftObjects::setInterpolatorModes(CInterpolatorMulti::Mode mode) { int c = 0; for (const CCallsign &cs : this->keys()) diff --git a/src/plugins/simulator/xplane/xplanempaircraft.h b/src/plugins/simulator/xplane/xplanempaircraft.h index 1e8990457..93831f623 100644 --- a/src/plugins/simulator/xplane/xplanempaircraft.h +++ b/src/plugins/simulator/xplane/xplanempaircraft.h @@ -109,7 +109,7 @@ namespace BlackSimPlugin }; //! Simulator objects (aka AI aircraft) - class CXPlaneMPAircrafts : public QHash + class CXPlaneMPAircraftObjects : public QHash { public: //! Get all callsigns