From ea4a8f24626e8ddb1234d5c048fde8598f543b43 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 17 Apr 2020 00:26:52 +0200 Subject: [PATCH] [XP] Minor fixes/style XPlane driver --- src/plugins/simulator/xplane/simulatorxplane.cpp | 14 +++++++++----- src/plugins/simulator/xplane/simulatorxplane.h | 4 ++-- .../simulator/xplane/xswiftbusserviceproxy.cpp | 4 ++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index 99996b14f..277cfafad 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -399,11 +399,15 @@ namespace BlackSimPlugin engines.push_back(engine); } - const CAircraftParts parts { { - m_xplaneData.strobeLightsOn, m_xplaneData.landingLightsOn, m_xplaneData.taxiLightsOn, - m_xplaneData.beaconLightsOn, m_xplaneData.navLightsOn, false - }, - m_xplaneData.gearReployRatio > 0, static_cast(m_xplaneData.flapsReployRatio * 100), + const CAircraftLights lights( + m_xplaneData.strobeLightsOn, m_xplaneData.landingLightsOn, m_xplaneData.taxiLightsOn, + m_xplaneData.beaconLightsOn, m_xplaneData.navLightsOn, false + ); + + const CAircraftParts parts + { + lights, + m_xplaneData.gearDeployRatio > 0, qRound(m_xplaneData.flapsDeployRatio * 100.0), m_xplaneData.speedBrakeRatio > 0.5, engines, m_xplaneData.onGroundAll }; diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h index e9507013c..f75a10f53 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.h +++ b/src/plugins/simulator/xplane/simulatorxplane.h @@ -100,8 +100,8 @@ namespace BlackSimPlugin bool navLightsOn; //!< NAV lights on? bool strobeLightsOn; //!< Strobe lights on? bool taxiLightsOn; //!< Taxi lights on? - double flapsReployRatio; //!< Flaps deployment ratio [%] - double gearReployRatio; //!< Gear deployment ratio [%] + double flapsDeployRatio; //!< Flaps deployment ratio [%] + double gearDeployRatio; //!< Gear deployment ratio [%] QList enginesN1Percentage; //!< N1 per engine [%] double speedBrakeRatio; //!< Speed break ratio [%] double seaLevelPressureInHg; //!< Sea level pressure [inhg] diff --git a/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp b/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp index 3c116c23b..4fbfe3424 100644 --- a/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp +++ b/src/plugins/simulator/xplane/xswiftbusserviceproxy.cpp @@ -169,8 +169,8 @@ namespace BlackSimPlugin QDBusPendingReply > reply = *watcher; if (!reply.isError()) { - o_xplaneData->flapsReployRatio = reply.argumentAt<0>(); - o_xplaneData->gearReployRatio = reply.argumentAt<1>(); + o_xplaneData->flapsDeployRatio = reply.argumentAt<0>(); + o_xplaneData->gearDeployRatio = reply.argumentAt<1>(); o_xplaneData->speedBrakeRatio = reply.argumentAt<2>(); o_xplaneData->enginesN1Percentage = reply.argumentAt<3>(); }