refs #369, added access for renderedAircraftPositions

This commit is contained in:
Klaus Basan
2015-02-07 14:33:57 +01:00
parent 915492670c
commit 6aea013b23
2 changed files with 41 additions and 5 deletions

View File

@@ -9,6 +9,8 @@
#include "simdirectaccessrenderedaircraft.h" #include "simdirectaccessrenderedaircraft.h"
using namespace BlackMisc::Aviation;
namespace BlackMisc namespace BlackMisc
{ {
namespace Simulation namespace Simulation
@@ -25,6 +27,12 @@ namespace BlackMisc
return this->m_renderedAircraftProvider->renderedAircraftSituations(); 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 const CSimulatedAircraftList &CRenderedAircraftProviderSupport::renderedAircraft() const
{ {
Q_ASSERT_X(this->m_renderedAircraftProvider, "renderedAircraft", "No object available"); Q_ASSERT_X(this->m_renderedAircraftProvider, "renderedAircraft", "No object available");
@@ -37,18 +45,30 @@ namespace BlackMisc
return this->m_renderedAircraftProvider->renderedAircraft(); 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"); Q_ASSERT_X(this->m_renderedAircraftProvider, "renderedAircraftSituations", "No object available");
return this->m_renderedAircraftProvider->renderedAircraftSituations(); return this->m_renderedAircraftProvider->renderedAircraftSituations();
} }
Aviation::CAircraftSituationList &CRenderedAircraftProviderSupport::renderedAircraftSituations() CAircraftSituationList &CRenderedAircraftProviderSupport::renderedAircraftSituations()
{ {
Q_ASSERT_X(this->m_renderedAircraftProvider, "renderedAircraftSituations", "No object available"); Q_ASSERT_X(this->m_renderedAircraftProvider, "renderedAircraftSituations", "No object available");
return this->m_renderedAircraftProvider->renderedAircraftSituations(); 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) bool CRenderedAircraftProviderSupport::providerUpdateAircraftModel(const Aviation::CCallsign &callsign, const CAircraftModel &model, const QString &originator)
{ {
Q_ASSERT_X(this->m_renderedAircraftProvider, "providerUpdateAircraftModel", "No object available"); Q_ASSERT_X(this->m_renderedAircraftProvider, "providerUpdateAircraftModel", "No object available");

View File

@@ -14,6 +14,7 @@
#include "blackmisc/simulation/simulatedaircraftlist.h" #include "blackmisc/simulation/simulatedaircraftlist.h"
#include "blackmisc/avaircraftsituationlist.h" #include "blackmisc/avaircraftsituationlist.h"
#include "blackmisc/aviation/aircraftpartslist.h"
namespace BlackMisc namespace BlackMisc
{ {
@@ -26,9 +27,12 @@ namespace BlackMisc
//! All rendered aircraft //! All rendered aircraft
virtual const CSimulatedAircraftList &renderedAircraft() const = 0; virtual const CSimulatedAircraftList &renderedAircraft() const = 0;
//! All rendered aircraft //! All situation (per callsign, time history)
virtual const BlackMisc::Aviation::CAircraftSituationList &renderedAircraftSituations() const = 0; virtual const BlackMisc::Aviation::CAircraftSituationList &renderedAircraftSituations() const = 0;
//! All parts (per callsign, time history)
virtual const BlackMisc::Aviation::CAircraftPartsList &renderedAircraftParts() const = 0;
//! Destructor //! Destructor
virtual ~IRenderedAircraftProviderReadOnly() {} virtual ~IRenderedAircraftProviderReadOnly() {}
}; };
@@ -43,6 +47,9 @@ namespace BlackMisc
//! Rendered aircraft situations (history) //! Rendered aircraft situations (history)
virtual BlackMisc::Aviation::CAircraftSituationList &renderedAircraftSituations() = 0; virtual BlackMisc::Aviation::CAircraftSituationList &renderedAircraftSituations() = 0;
//! All parts (per callsign, time history)
virtual BlackMisc::Aviation::CAircraftPartsList &renderedAircraftParts() = 0;
//! Enable/disable rendering //! Enable/disable rendering
virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator) = 0; 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; virtual const CSimulatedAircraftList &renderedAircraft() const;
//!\copydoc IRenderedAircraftProviderReadOnly::renderedAircraftSituations //!\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: protected:
//! Constructor //! Constructor
@@ -80,7 +90,13 @@ namespace BlackMisc
virtual const BlackMisc::Aviation::CAircraftSituationList &renderedAircraftSituations() const; virtual const BlackMisc::Aviation::CAircraftSituationList &renderedAircraftSituations() const;
//!\copydoc IRenderedAircraftProvider::renderedAircraftSituations //!\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 //! \copydoc IRenderedAircraftProvider::updateAircraftEnabled
virtual bool providerUpdateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator); virtual bool providerUpdateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator);