From 63d7e363895cf52a4450c4aa3343e7cb9c509362 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 14 Feb 2018 04:01:47 +0100 Subject: [PATCH] Ref T251, also set GND info for own aircraft --- src/blackmisc/aviation/aircraftsituation.cpp | 2 ++ src/blackmisc/aviation/aircraftsituation.h | 5 +++-- src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp | 7 +++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/blackmisc/aviation/aircraftsituation.cpp b/src/blackmisc/aviation/aircraftsituation.cpp index b7db7fba1..4a8346a58 100644 --- a/src/blackmisc/aviation/aircraftsituation.cpp +++ b/src/blackmisc/aviation/aircraftsituation.cpp @@ -84,6 +84,7 @@ namespace BlackMisc static const QString inter("interpolation"); static const QString guess("guessing"); static const QString unknown("unknown"); + static const QString ownAircraft("own aircraft"); switch (reliability) { @@ -91,6 +92,7 @@ namespace BlackMisc case CAircraftSituation::OnGroundByElevationAndCG: return elvCg; case CAircraftSituation::OnGroundByGuessing: return guess; case CAircraftSituation::OnGroundByInterpolation: return inter; + case CAircraftSituation::OnGroundOwnAircraft: return ownAircraft; case CAircraftSituation::OnGroundReliabilityNoSet: default: return unknown; diff --git a/src/blackmisc/aviation/aircraftsituation.h b/src/blackmisc/aviation/aircraftsituation.h index 0364dcb4b..d931c54c9 100644 --- a/src/blackmisc/aviation/aircraftsituation.h +++ b/src/blackmisc/aviation/aircraftsituation.h @@ -75,11 +75,12 @@ namespace BlackMisc //! Reliability of on ground information enum OnGroundReliability { - OnGroundByInterpolation, //!< strongest + OnGroundByInterpolation, //!< strongest for remote aircraft OnGroundByElevationAndCG, OnGroundByElevation, OnGroundByGuessing, //!< weakest - OnGroundReliabilityNoSet + OnGroundReliabilityNoSet, + OnGroundOwnAircraft, //!< sending on ground }; //! Default constructor. diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp index a4bb9bfbc..621c9e588 100644 --- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp +++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp @@ -385,6 +385,9 @@ namespace BlackSimPlugin aircraftSituation.setGroundElevation(CAltitude(simulatorOwnAircraft.elevation, CAltitude::MeanSeaLevel, CLengthUnit::ft())); aircraftSituation.setAltitude(CAltitude(simulatorOwnAircraft.altitude, CAltitude::MeanSeaLevel, CLengthUnit::ft())); aircraftSituation.setPressureAltitude(CAltitude(simulatorOwnAircraft.pressureAltitude, CAltitude::MeanSeaLevel, CAltitude::PressureAltitude, CLengthUnit::m())); + // set on ground also in situation for consistency and future usage + // it is duplicated in parts + aircraftSituation.setOnGround(simulatorOwnAircraft.simOnGround ? CAircraftSituation::OnGround : CAircraftSituation::NotOnGround, CAircraftSituation::OnGroundOwnAircraft); const CAircraftLights lights(simulatorOwnAircraft.lightStrobe, simulatorOwnAircraft.lightLanding, @@ -412,8 +415,8 @@ namespace BlackSimPlugin simulatorOwnAircraft.simOnGround); // set values - updateOwnSituation(aircraftSituation); - updateOwnParts(parts); + this->updateOwnSituation(aircraftSituation); + this->updateOwnParts(parts); // When I change cockpit values in the sim (from GUI to simulator, not originating from simulator) // it takes a little while before these values are set in the simulator.