From 4d2a32f03544cd005029da95c76869aaafa9680b Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 28 Mar 2018 03:55:40 +0200 Subject: [PATCH] Ref T259, Ref T243 removed ground factor interpolation from parts (now in situation where it belongs) --- src/blackmisc/aviation/aircraftparts.cpp | 9 --------- src/blackmisc/aviation/aircraftparts.h | 12 ------------ 2 files changed, 21 deletions(-) diff --git a/src/blackmisc/aviation/aircraftparts.cpp b/src/blackmisc/aviation/aircraftparts.cpp index 7b48f9013..85f4f021a 100644 --- a/src/blackmisc/aviation/aircraftparts.cpp +++ b/src/blackmisc/aviation/aircraftparts.cpp @@ -171,14 +171,5 @@ namespace BlackMisc { *this = guessedParts(situation); } - - double CAircraftParts::isOnGroundInterpolated() const - { - if (m_isOnGroundInterpolated < 0) - { - return m_isOnGround ? 1.0 : 0.0; - } - return m_isOnGroundInterpolated; - } } // namespace } // namespace diff --git a/src/blackmisc/aviation/aircraftparts.h b/src/blackmisc/aviation/aircraftparts.h index acd41598a..add2876d0 100644 --- a/src/blackmisc/aviation/aircraftparts.h +++ b/src/blackmisc/aviation/aircraftparts.h @@ -133,16 +133,6 @@ namespace BlackMisc //! Guess the parts void guessParts(const CAircraftSituation &situation); - //! Is aircraft on ground? (Smoothly interpolated between 0 and 1.) - //! \remark 1..on ground 0..not on ground - //! \deprecated - double isOnGroundInterpolated() const; - - //! Set aircraft on ground. (Smoothly interpolated between 0 and 1.) - //! \remark 1..on ground 0..not on ground - //! \deprecated - void setOnGroundInterpolated(double onGround) { m_isOnGroundInterpolated = onGround; } - //! \copydoc BlackMisc::Mixin::String::toQString QString convertToQString(bool i18n = false) const; @@ -159,7 +149,6 @@ namespace BlackMisc bool m_gearDown = false; bool m_spoilersOut = false; bool m_isOnGround = false; - double m_isOnGroundInterpolated = -1; BLACK_METACLASS( CAircraftParts, @@ -169,7 +158,6 @@ namespace BlackMisc BLACK_METAMEMBER_NAMED(spoilersOut, "spoilers_out"), BLACK_METAMEMBER_NAMED(engines, "engines"), BLACK_METAMEMBER_NAMED(isOnGround, "on_ground"), - BLACK_METAMEMBER(isOnGroundInterpolated, 0, DisabledForJson | DisabledForComparison), BLACK_METAMEMBER(timestampMSecsSinceEpoch, 0, DisabledForJson | DisabledForComparison), BLACK_METAMEMBER(timeOffsetMs, 0, DisabledForJson | DisabledForComparison) );