From 9363bf3b1f2898bcfb534442c90f442340a5c860 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Wed, 27 Feb 2019 18:39:27 +0100 Subject: [PATCH] Remove aircraft parts for FG --- .../flightgear/fgswiftbustrafficproxy.cpp | 11 ------- .../flightgear/fgswiftbustrafficproxy.h | 3 -- .../flightgear/simulatorflightgear.cpp | 31 ------------------- 3 files changed, 45 deletions(-) diff --git a/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.cpp b/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.cpp index 3d26a8523..0d524cf45 100644 --- a/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.cpp +++ b/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.cpp @@ -117,17 +117,6 @@ namespace BlackSimPlugin planesPositions.headingsDeg, planesPositions.onGrounds); } - void CXSwiftBusTrafficProxy::setPlanesSurfaces(const PlanesSurfaces &planesSurfaces) - { - m_dbusInterface->callDBus(QLatin1String("setPlanesSurfaces"), - planesSurfaces.callsigns, planesSurfaces.gears, planesSurfaces.flaps, - planesSurfaces.spoilers, planesSurfaces.speedBrakes, planesSurfaces.slats, - planesSurfaces.wingSweeps, planesSurfaces.thrusts, planesSurfaces.elevators, - planesSurfaces.rudders, planesSurfaces.ailerons, - planesSurfaces.landLights, planesSurfaces.beaconLights, planesSurfaces.strobeLights, - planesSurfaces.navLights, planesSurfaces.lightPatterns); - } - void CXSwiftBusTrafficProxy::setPlanesTransponders(const PlanesTransponders &planesTransponders) { m_dbusInterface->callDBus(QLatin1String("setPlanesTransponders"), diff --git a/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.h b/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.h index 7fb733386..b1ea1107f 100644 --- a/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.h +++ b/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.h @@ -192,9 +192,6 @@ namespace BlackSimPlugin //! \copydoc XSwiftBus::CTraffic::setPlanesPositions void setPlanesPositions(const BlackSimPlugin::XPlane::PlanesPositions &planesPositions); - //! \copydoc XSwiftBus::CTraffic::setPlanesSurfaces - void setPlanesSurfaces(const BlackSimPlugin::XPlane::PlanesSurfaces &planesSurfaces); - //! \copydoc XSwiftBus::CTraffic::setPlanesTransponders void setPlanesTransponders(const BlackSimPlugin::XPlane::PlanesTransponders &planesTransponders); diff --git a/src/plugins/simulator/flightgear/simulatorflightgear.cpp b/src/plugins/simulator/flightgear/simulatorflightgear.cpp index 9346eb5cc..7b6003bca 100644 --- a/src/plugins/simulator/flightgear/simulatorflightgear.cpp +++ b/src/plugins/simulator/flightgear/simulatorflightgear.cpp @@ -663,7 +663,6 @@ namespace BlackSimPlugin // interpolation for all remote aircraft PlanesPositions planesPositions; - PlanesSurfaces planesSurfaces; PlanesTransponders planesTransponders; int aircraftNumber = 0; @@ -707,31 +706,6 @@ namespace BlackSimPlugin CLogMessage(this).warning(this->getInvalidSituationLogMessage(callsign, result.getInterpolationStatus())); } - const CAircraftParts parts(result); - if (result.getPartsStatus().isSupportingParts() || parts.getPartsDetails() == CAircraftParts::GuessedParts) - { - if (updateAllAircraft || !this->isEqualLastSent(parts, callsign)) - { - this->rememberLastSent(parts, callsign); - planesSurfaces.callsigns.push_back(xplaneAircraft.getCallsign().asString()); - planesSurfaces.gears.push_back(parts.isGearDown() ? 1 : 0); - planesSurfaces.flaps.push_back(parts.getFlapsPercent() / 100.0); - planesSurfaces.spoilers.push_back(parts.isSpoilersOut() ? 1 : 0); - planesSurfaces.speedBrakes.push_back(parts.isSpoilersOut() ? 1 : 0); - planesSurfaces.slats.push_back(parts.getFlapsPercent() / 100.0); - planesSurfaces.wingSweeps.push_back(0.0); - planesSurfaces.thrusts.push_back(parts.isAnyEngineOn() ? 0 : 0.75); - planesSurfaces.elevators.push_back(0.0); - planesSurfaces.rudders.push_back(0.0); - planesSurfaces.ailerons.push_back(0.0); - planesSurfaces.landLights.push_back(parts.getLights().isLandingOn()); - planesSurfaces.beaconLights.push_back(parts.getLights().isBeaconOn()); - planesSurfaces.strobeLights.push_back(parts.getLights().isStrobeOn()); - planesSurfaces.navLights.push_back(parts.getLights().isNavOn()); - planesSurfaces.lightPatterns.push_back(0); - } - } - } // all callsigns if (!planesTransponders.isEmpty()) @@ -748,11 +722,6 @@ namespace BlackSimPlugin m_trafficProxy->setPlanesPositions(planesPositions); } - if (! planesSurfaces.isEmpty()) - { - m_trafficProxy->setPlanesSurfaces(planesSurfaces); - } - // stats this->finishUpdateRemoteAircraftAndSetStatistics(currentTimestamp); }