From 6aea013b237da4ca0edfce6af60f5b903cffc1e1 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 7 Feb 2015 14:33:57 +0100 Subject: [PATCH] refs #369, added access for renderedAircraftPositions --- .../simdirectaccessrenderedaircraft.cpp | 24 +++++++++++++++++-- .../simdirectaccessrenderedaircraft.h | 22 ++++++++++++++--- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/src/blackmisc/simulation/simdirectaccessrenderedaircraft.cpp b/src/blackmisc/simulation/simdirectaccessrenderedaircraft.cpp index c80e6daae..8102b0401 100644 --- a/src/blackmisc/simulation/simdirectaccessrenderedaircraft.cpp +++ b/src/blackmisc/simulation/simdirectaccessrenderedaircraft.cpp @@ -9,6 +9,8 @@ #include "simdirectaccessrenderedaircraft.h" +using namespace BlackMisc::Aviation; + namespace BlackMisc { namespace Simulation @@ -25,6 +27,12 @@ namespace BlackMisc return this->m_renderedAircraftProvider->renderedAircraftSituations(); } + const Aviation::CAircraftPartsList &CRenderedAircraftProviderSupportReadOnly::renderedAircraftParts() const + { + Q_ASSERT_X(this->m_renderedAircraftProvider, "renderedAircraftParts", "No object available"); + return this->m_renderedAircraftProvider->renderedAircraftParts(); + } + const CSimulatedAircraftList &CRenderedAircraftProviderSupport::renderedAircraft() const { Q_ASSERT_X(this->m_renderedAircraftProvider, "renderedAircraft", "No object available"); @@ -37,18 +45,30 @@ namespace BlackMisc return this->m_renderedAircraftProvider->renderedAircraft(); } - const Aviation::CAircraftSituationList &CRenderedAircraftProviderSupport::renderedAircraftSituations() const + const CAircraftSituationList &CRenderedAircraftProviderSupport::renderedAircraftSituations() const { Q_ASSERT_X(this->m_renderedAircraftProvider, "renderedAircraftSituations", "No object available"); return this->m_renderedAircraftProvider->renderedAircraftSituations(); } - Aviation::CAircraftSituationList &CRenderedAircraftProviderSupport::renderedAircraftSituations() + CAircraftSituationList &CRenderedAircraftProviderSupport::renderedAircraftSituations() { Q_ASSERT_X(this->m_renderedAircraftProvider, "renderedAircraftSituations", "No object available"); return this->m_renderedAircraftProvider->renderedAircraftSituations(); } + const CAircraftPartsList &CRenderedAircraftProviderSupport::renderedAircraftParts() const + { + Q_ASSERT_X(this->m_renderedAircraftProvider, "renderedAircraftParts", "No object available"); + return this->m_renderedAircraftProvider->renderedAircraftParts(); + } + + CAircraftPartsList &CRenderedAircraftProviderSupport::renderedAircraftParts() + { + Q_ASSERT_X(this->m_renderedAircraftProvider, "renderedAircraftParts", "No object available"); + return this->m_renderedAircraftProvider->renderedAircraftParts(); + } + bool CRenderedAircraftProviderSupport::providerUpdateAircraftModel(const Aviation::CCallsign &callsign, const CAircraftModel &model, const QString &originator) { Q_ASSERT_X(this->m_renderedAircraftProvider, "providerUpdateAircraftModel", "No object available"); diff --git a/src/blackmisc/simulation/simdirectaccessrenderedaircraft.h b/src/blackmisc/simulation/simdirectaccessrenderedaircraft.h index 36b3bc8d1..2c7f3aa0a 100644 --- a/src/blackmisc/simulation/simdirectaccessrenderedaircraft.h +++ b/src/blackmisc/simulation/simdirectaccessrenderedaircraft.h @@ -14,6 +14,7 @@ #include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackmisc/avaircraftsituationlist.h" +#include "blackmisc/aviation/aircraftpartslist.h" namespace BlackMisc { @@ -26,9 +27,12 @@ namespace BlackMisc //! All rendered aircraft virtual const CSimulatedAircraftList &renderedAircraft() const = 0; - //! All rendered aircraft + //! All situation (per callsign, time history) virtual const BlackMisc::Aviation::CAircraftSituationList &renderedAircraftSituations() const = 0; + //! All parts (per callsign, time history) + virtual const BlackMisc::Aviation::CAircraftPartsList &renderedAircraftParts() const = 0; + //! Destructor virtual ~IRenderedAircraftProviderReadOnly() {} }; @@ -43,6 +47,9 @@ namespace BlackMisc //! Rendered aircraft situations (history) virtual BlackMisc::Aviation::CAircraftSituationList &renderedAircraftSituations() = 0; + //! All parts (per callsign, time history) + virtual BlackMisc::Aviation::CAircraftPartsList &renderedAircraftParts() = 0; + //! Enable/disable rendering virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator) = 0; @@ -58,7 +65,10 @@ namespace BlackMisc virtual const CSimulatedAircraftList &renderedAircraft() const; //!\copydoc IRenderedAircraftProviderReadOnly::renderedAircraftSituations - virtual const BlackMisc::Aviation::CAircraftSituationList &renderedAircraftSituations() const = 0; + virtual const BlackMisc::Aviation::CAircraftSituationList &renderedAircraftSituations() const; + + //!\copydoc IRenderedAircraftProviderReadOnly::renderedAircraftParts + virtual const BlackMisc::Aviation::CAircraftPartsList &renderedAircraftParts() const; protected: //! Constructor @@ -80,7 +90,13 @@ namespace BlackMisc virtual const BlackMisc::Aviation::CAircraftSituationList &renderedAircraftSituations() const; //!\copydoc IRenderedAircraftProvider::renderedAircraftSituations - virtual Aviation::CAircraftSituationList &renderedAircraftSituations(); + virtual BlackMisc::Aviation::CAircraftSituationList &renderedAircraftSituations(); + + //!\copydoc IRenderedAircraftProviderReadOnly::renderedAircraftParts + virtual const BlackMisc::Aviation::CAircraftPartsList &renderedAircraftParts() const; + + //!\copydoc IRenderedAircraftProvider::renderedAircraftParts + virtual BlackMisc::Aviation::CAircraftPartsList &renderedAircraftParts(); //! \copydoc IRenderedAircraftProvider::updateAircraftEnabled virtual bool providerUpdateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator);