From 654cc1621eed910d1af09b91583e91ddaf186a73 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Tue, 15 May 2018 09:57:09 +0200 Subject: [PATCH] Align the position and surface variable names to plural --- .../simulator/xplane/xswiftbustrafficproxy.h | 2 +- .../org.swift_project.xswiftbus.traffic.xml | 58 ++++---- src/xswiftbus/traffic.cpp | 125 +++++++++--------- src/xswiftbus/traffic.h | 13 +- 4 files changed, 103 insertions(+), 95 deletions(-) diff --git a/src/plugins/simulator/xplane/xswiftbustrafficproxy.h b/src/plugins/simulator/xplane/xswiftbustrafficproxy.h index c4490a781..87c9a59de 100644 --- a/src/plugins/simulator/xplane/xswiftbustrafficproxy.h +++ b/src/plugins/simulator/xplane/xswiftbustrafficproxy.h @@ -156,7 +156,7 @@ namespace BlackSimPlugin //! \copydoc XSwiftBus::CTraffic::setPlanesPositions void setPlanesPositions(const PlanesPositions &planesPositions); - //! \copydoc XSwiftBus::CTraffic::setPlaneSurfaces + //! \copydoc XSwiftBus::CTraffic::setPlanesSurfaces void setPlanesSurfaces(const PlanesSurfaces &planesSurfaces); //! \copydoc XSwiftBus::CTraffic::setPlaneTransponder diff --git a/src/xswiftbus/org.swift_project.xswiftbus.traffic.xml b/src/xswiftbus/org.swift_project.xswiftbus.traffic.xml index ed86a478a..dfed64798 100644 --- a/src/xswiftbus/org.swift_project.xswiftbus.traffic.xml +++ b/src/xswiftbus/org.swift_project.xswiftbus.traffic.xml @@ -36,33 +36,39 @@ R"( - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/xswiftbus/traffic.cpp b/src/xswiftbus/traffic.cpp index ddfc1321c..a9dfb6122 100644 --- a/src/xswiftbus/traffic.cpp +++ b/src/xswiftbus/traffic.cpp @@ -277,8 +277,8 @@ namespace XSwiftBus m_planeViewMenuItems.clear(); } - void CTraffic::setPlanePositions(const std::vector &callsigns, std::vector latitudes, std::vector longitudes, std::vector altitudes, - std::vector pitches, std::vector rolles, std::vector headings) + void CTraffic::setPlanesPositions(const std::vector &callsigns, std::vector latitudes, std::vector longitudes, std::vector altitudes, + std::vector pitches, std::vector rolles, std::vector headings) { for (size_t i = 0; i < callsigns.size(); i++) { @@ -296,12 +296,13 @@ namespace XSwiftBus } } - void CTraffic::setPlaneSurfaces(const std::vector &callsign, const std::vector &gear, const std::vector &flap, const std::vector &spoiler, - const std::vector &speedBrake, const std::vector &slat, const std::vector &wingSweep, const std::vector &thrust, - const std::vector &elevator, const std::vector &rudder, const std::vector &aileron, const std::vector &landLight, - const std::vector &beaconLight, const std::vector &strobeLight, const std::vector &navLight, const std::vector &lightPattern, const std::vector &onGround) + void CTraffic::setPlanesSurfaces(const std::vector &callsign, const std::vector &gear, const std::vector &flap, const std::vector &spoilers, + const std::vector &speedBrakes, const std::vector &slats, const std::vector &wingSweeps, const std::vector &thrusts, + const std::vector &elevators, const std::vector &rudders, const std::vector &ailerons, const std::vector &landLights, + const std::vector &beaconLights, const std::vector &strobeLights, const std::vector &navLights, const std::vector &lightPatterns, + const std::vector &onGrounds) { - (void)onGround; + (void)onGrounds; for (size_t i = 0; i < callsign.size(); i++) { @@ -314,19 +315,19 @@ namespace XSwiftBus plane->hasSurfaces = true; plane->targetGearPosition = static_cast(gear.at(i)); plane->surfaces.flapRatio = static_cast(flap.at(i)); - plane->surfaces.spoilerRatio = static_cast(spoiler.at(i)); - plane->surfaces.speedBrakeRatio = static_cast(speedBrake.at(i)); - plane->surfaces.slatRatio = static_cast(slat.at(i)); - plane->surfaces.wingSweep = static_cast(wingSweep.at(i)); - plane->surfaces.thrust = static_cast(thrust.at(i)); - plane->surfaces.yokePitch = static_cast(elevator.at(i)); - plane->surfaces.yokeHeading = static_cast(rudder.at(i)); - plane->surfaces.yokeRoll = static_cast(aileron.at(i)); - plane->surfaces.lights.landLights = landLight.at(i); - plane->surfaces.lights.bcnLights = beaconLight.at(i); - plane->surfaces.lights.strbLights = strobeLight.at(i); - plane->surfaces.lights.navLights = navLight.at(i); - plane->surfaces.lights.flashPattern = lightPattern.at(i); + plane->surfaces.spoilerRatio = static_cast(spoilers.at(i)); + plane->surfaces.speedBrakeRatio = static_cast(speedBrakes.at(i)); + plane->surfaces.slatRatio = static_cast(slats.at(i)); + plane->surfaces.wingSweep = static_cast(wingSweeps.at(i)); + plane->surfaces.thrust = static_cast(thrusts.at(i)); + plane->surfaces.yokePitch = static_cast(elevators.at(i)); + plane->surfaces.yokeHeading = static_cast(rudders.at(i)); + plane->surfaces.yokeRoll = static_cast(ailerons.at(i)); + plane->surfaces.lights.landLights = landLights.at(i); + plane->surfaces.lights.bcnLights = beaconLights.at(i); + plane->surfaces.lights.strbLights = strobeLights.at(i); + plane->surfaces.lights.navLights = navLights.at(i); + plane->surfaces.lights.flashPattern = lightPatterns.at(i); } } @@ -535,7 +536,7 @@ namespace XSwiftBus removeAllPlanes(); }); } - else if (message.getMethodName() == "setPlanePositions") + else if (message.getMethodName() == "setPlanesPositions") { maybeSendEmptyDBusReply(wantsReply, sender, serial); std::vector callsigns; @@ -543,7 +544,7 @@ namespace XSwiftBus std::vector longitudes; std::vector altitudes; std::vector pitches; - std::vector rolles; + std::vector rolls; std::vector headings; message.beginArgumentRead(); message.getArgument(callsigns); @@ -551,56 +552,56 @@ namespace XSwiftBus message.getArgument(longitudes); message.getArgument(altitudes); message.getArgument(pitches); - message.getArgument(rolles); + message.getArgument(rolls); message.getArgument(headings); queueDBusCall([ = ]() { - setPlanePositions(callsigns, latitudes, longitudes, altitudes, pitches, rolles, headings); + setPlanesPositions(callsigns, latitudes, longitudes, altitudes, pitches, rolls, headings); }); } - else if (message.getMethodName() == "setPlaneSurfaces") + else if (message.getMethodName() == "setPlanesSurfaces") { maybeSendEmptyDBusReply(wantsReply, sender, serial); - std::vector callsign; - std::vector gear; - std::vector flap; - std::vector spoiler; - std::vector speedBrake; - std::vector slat; - std::vector wingSweep; - std::vector thrust; - std::vector elevator; - std::vector rudder; - std::vector aileron; - std::vector landLight; - std::vector beaconLight; - std::vector strobeLight; - std::vector navLight; - std::vector lightPattern; - std::vector onGround; + std::vector callsigns; + std::vector gears; + std::vector flaps; + std::vector spoilers; + std::vector speedBrakes; + std::vector slats; + std::vector wingSweeps; + std::vector thrusts; + std::vector elevators; + std::vector rudders; + std::vector ailerons; + std::vector landLights; + std::vector beaconLights; + std::vector strobeLights; + std::vector navLights; + std::vector lightPatterns; + std::vector onGrounds; message.beginArgumentRead(); - message.getArgument(callsign); - message.getArgument(gear); - message.getArgument(flap); - message.getArgument(spoiler); - message.getArgument(speedBrake); - message.getArgument(slat); - message.getArgument(wingSweep); - message.getArgument(thrust); - message.getArgument(elevator); - message.getArgument(rudder); - message.getArgument(aileron); - message.getArgument(landLight); - message.getArgument(beaconLight); - message.getArgument(strobeLight); - message.getArgument(navLight); - message.getArgument(lightPattern); - message.getArgument(onGround); + message.getArgument(callsigns); + message.getArgument(gears); + message.getArgument(flaps); + message.getArgument(spoilers); + message.getArgument(speedBrakes); + message.getArgument(slats); + message.getArgument(wingSweeps); + message.getArgument(thrusts); + message.getArgument(elevators); + message.getArgument(rudders); + message.getArgument(ailerons); + message.getArgument(landLights); + message.getArgument(beaconLights); + message.getArgument(strobeLights); + message.getArgument(navLights); + message.getArgument(lightPatterns); + message.getArgument(onGrounds); queueDBusCall([ = ]() { - setPlaneSurfaces(callsign, gear, flap, spoiler, speedBrake, slat, wingSweep, thrust, elevator, - rudder, aileron, landLight, beaconLight, strobeLight, navLight, lightPattern, - onGround); + setPlanesSurfaces(callsigns, gears, flaps, spoilers, speedBrakes, slats, wingSweeps, thrusts, elevators, + rudders, ailerons, landLights, beaconLights, strobeLights, navLights, lightPatterns, + onGrounds); }); } else if (message.getMethodName() == "setPlaneTransponder") diff --git a/src/xswiftbus/traffic.h b/src/xswiftbus/traffic.h index b9e638230..1e61cf80c 100644 --- a/src/xswiftbus/traffic.h +++ b/src/xswiftbus/traffic.h @@ -95,14 +95,15 @@ namespace XSwiftBus void removeAllPlanes(); //! Set the position of multiple traffic aircrafts - void setPlanePositions(const std::vector &callsigns, std::vector latitudes, std::vector longitudes, std::vector altitude, - std::vector pitchs, std::vector rolls, std::vector headings); + void setPlanesPositions(const std::vector &callsigns, std::vector latitudes, std::vector longitudes, std::vector altitudes, + std::vector pitches, std::vector rolls, std::vector headings); //! Set the flight control surfaces and lights of multiple traffic aircrafts - void setPlaneSurfaces(const std::vector &callsign, const std::vector &gear, const std::vector &flap, const std::vector &spoiler, - const std::vector &speedBrake, const std::vector &slat, const std::vector &wingSweep, const std::vector &thrust, - const std::vector &elevator, const std::vector &rudder, const std::vector &aileron, const std::vector &landLight, - const std::vector &beaconLight, const std::vector &strobeLight, const std::vector &navLight, const std::vector &lightPattern, const std::vector &onGround); + void setPlanesSurfaces(const std::vector &callsigns, const std::vector &gears, const std::vector &flaps, const std::vector &spoilers, + const std::vector &speedBrakes, const std::vector &slats, const std::vector &wingSweeps, const std::vector &thrusts, + const std::vector &elevators, const std::vector &rudders, const std::vector &ailerons, const std::vector &landLights, + const std::vector &beaconLights, const std::vector &strobeLights, const std::vector &navLights, const std::vector &lightPatterns, + const std::vector &onGrounds); //! Set the transponder of a traffic aircraft void setPlaneTransponder(const std::string &callsign, int code, bool modeC, bool ident);