mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-30 20:15:35 +08:00
refs #395, turned remote aircraft provider interface into thread safe interfaces
* references gone, situations, parts, aircraft now as threadsafe copy * read only interface gone (no longer references, so no longer needed)
This commit is contained in:
Klaus Basan
committed by
Mathew Sutcliffe
Mathew Sutcliffe
parent
24094eaf61
commit
6debd33b4f
@@ -16,52 +16,22 @@ namespace BlackMisc
|
||||
namespace Simulation
|
||||
{
|
||||
|
||||
const CSimulatedAircraftList &CRemoteAircraftAwareReadOnly::remoteAircraft() const
|
||||
CSimulatedAircraftList CRemoteAircraftAware::getAircraftInRange() const
|
||||
{
|
||||
Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_remoteAircraftProvider->remoteAircraft();
|
||||
return this->m_remoteAircraftProvider->getAircraftInRange();
|
||||
}
|
||||
|
||||
Aviation::CAircraftSituationList CRemoteAircraftAwareReadOnly::remoteAircraftSituations(const BlackMisc::Aviation::CCallsign &callsign) const
|
||||
int CRemoteAircraftAware::getAircraftInRangeCount() const
|
||||
{
|
||||
Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_remoteAircraftProvider->remoteAircraftSituations(callsign);
|
||||
return this->m_remoteAircraftProvider->getAircraftInRangeCount();
|
||||
}
|
||||
|
||||
int CRemoteAircraftAwareReadOnly::remoteAircraftSituationsCount(const CCallsign &callsign) const
|
||||
CSimulatedAircraft CRemoteAircraftAware::getAircraftForCallsign(const CCallsign &callsign) const
|
||||
{
|
||||
Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_remoteAircraftProvider->remoteAircraftSituationsCount(callsign);
|
||||
}
|
||||
|
||||
CAircraftPartsList CRemoteAircraftAwareReadOnly::remoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeBefore) const
|
||||
{
|
||||
Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_remoteAircraftProvider->remoteAircraftParts(callsign, cutoffTimeBefore);
|
||||
}
|
||||
|
||||
CCallsignSet CRemoteAircraftAwareReadOnly::remoteAircraftSupportingParts() const
|
||||
{
|
||||
Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_remoteAircraftProvider->remoteAircraftSupportingParts();
|
||||
}
|
||||
|
||||
bool CRemoteAircraftAwareReadOnly::isRemoteAircraftSupportingParts(const CCallsign &callsign) const
|
||||
{
|
||||
Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_remoteAircraftProvider->isRemoteAircraftSupportingParts(callsign);
|
||||
}
|
||||
|
||||
const CSimulatedAircraftList &CRemoteAircraftAware::remoteAircraft() const
|
||||
{
|
||||
Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_remoteAircraftProvider->remoteAircraft();
|
||||
}
|
||||
|
||||
CSimulatedAircraftList &CRemoteAircraftAware::remoteAircraft()
|
||||
{
|
||||
Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_remoteAircraftProvider->remoteAircraft();
|
||||
return this->m_remoteAircraftProvider->getAircraftForCallsign(callsign);
|
||||
}
|
||||
|
||||
CAircraftSituationList CRemoteAircraftAware::remoteAircraftSituations(const BlackMisc::Aviation::CCallsign &callsign) const
|
||||
@@ -70,10 +40,10 @@ namespace BlackMisc
|
||||
return this->m_remoteAircraftProvider->remoteAircraftSituations(callsign);
|
||||
}
|
||||
|
||||
CAircraftPartsList CRemoteAircraftAware::remoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign) const
|
||||
CAircraftPartsList CRemoteAircraftAware::remoteAircraftParts(const CCallsign &callsign, qint64 cutoffTimeBefore) const
|
||||
{
|
||||
Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_remoteAircraftProvider->remoteAircraftParts(callsign);
|
||||
return this->m_remoteAircraftProvider->remoteAircraftParts(callsign, cutoffTimeBefore);
|
||||
}
|
||||
|
||||
CCallsignSet CRemoteAircraftAware::remoteAircraftSupportingParts() const
|
||||
@@ -88,19 +58,31 @@ namespace BlackMisc
|
||||
return this->m_remoteAircraftProvider->remoteAircraftSituationsCount(callsign);
|
||||
}
|
||||
|
||||
bool CRemoteAircraftAware::providerUpdateAircraftModel(const Aviation::CCallsign &callsign, const CAircraftModel &model, const QString &originator)
|
||||
bool CRemoteAircraftAware::updateAircraftModel(const Aviation::CCallsign &callsign, const CAircraftModel &model, const QString &originator)
|
||||
{
|
||||
Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_remoteAircraftProvider->updateAircraftModel(callsign, model, originator);
|
||||
}
|
||||
|
||||
bool CRemoteAircraftAware::updateAircraftRendered(const CCallsign &callsign, bool rendered, const QString &originator)
|
||||
{
|
||||
Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_remoteAircraftProvider->updateAircraftRendered(callsign, rendered, originator);
|
||||
}
|
||||
|
||||
void CRemoteAircraftAware::updateMarkAllAsNotRendered(const QString &originator)
|
||||
{
|
||||
Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_remoteAircraftProvider->updateMarkAllAsNotRendered(originator);
|
||||
}
|
||||
|
||||
bool CRemoteAircraftAware::isRemoteAircraftSupportingParts(const CCallsign &callsign) const
|
||||
{
|
||||
Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_remoteAircraftProvider->isRemoteAircraftSupportingParts(callsign);
|
||||
}
|
||||
|
||||
bool CRemoteAircraftAware::providerUpdateAircraftEnabled(const Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator)
|
||||
bool CRemoteAircraftAware::updateAircraftEnabled(const Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator)
|
||||
{
|
||||
Q_ASSERT_X(this->m_remoteAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_remoteAircraftProvider->updateAircraftEnabled(callsign, enabledForRedering, originator);
|
||||
|
||||
@@ -13,29 +13,47 @@
|
||||
#define BLACKMISC_SIMULATION_REMOTEAIRCRAFTPROVIDER_H
|
||||
|
||||
#include "blackmisc/blackmiscexport.h"
|
||||
#include "blackmisc/simulation/airspaceaircraftsnapshot.h"
|
||||
#include "blackmisc/simulation/simulatedaircraftlist.h"
|
||||
#include "blackmisc/aviation/aircraftsituationlist.h"
|
||||
#include "blackmisc/aviation/aircraftpartslist.h"
|
||||
|
||||
#include <functional>
|
||||
|
||||
namespace BlackMisc
|
||||
{
|
||||
namespace Simulation
|
||||
{
|
||||
//! Direct in memory access to remote aircraft
|
||||
//! Direct thread safe in memory access to remote aircraft
|
||||
//! \note Can not be derived from QObject (as for the signals), as this would create multiple
|
||||
//! inheritance. Hence Q_DECLARE_INTERFACE is used.
|
||||
class BLACKMISC_EXPORT IRemoteAircraftProviderReadOnly
|
||||
class BLACKMISC_EXPORT IRemoteAircraftProvider
|
||||
{
|
||||
public:
|
||||
static const int MaxSituationsPerCallsign = 6; //!< How many situations per callsign
|
||||
static const int MaxPartsPerCallsign = 3; //!< How many parts per callsign
|
||||
|
||||
//! Situations per callsign
|
||||
typedef QHash<BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CAircraftSituationList> CSituationsPerCallsign;
|
||||
|
||||
//! Parts per callsign
|
||||
typedef QHash<BlackMisc::Aviation::CCallsign, BlackMisc::Aviation::CAircraftPartsList> CPartsPerCallsign;
|
||||
|
||||
//! All rendered aircraft
|
||||
virtual const CSimulatedAircraftList &remoteAircraft() const = 0;
|
||||
//! All remote aircraft
|
||||
//! \threadsafe
|
||||
virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const = 0;
|
||||
|
||||
//! Count remote aircraft
|
||||
//! \threadsafe
|
||||
virtual int getAircraftInRangeCount() const = 0;
|
||||
|
||||
//! Current snapshot
|
||||
//! \threadsafe
|
||||
virtual BlackMisc::Simulation::CAirspaceAircraftSnapshot getLatestAirspaceAircraftSnapshot() const = 0;
|
||||
|
||||
//! Aircraft for callsign
|
||||
//! \threadsafe
|
||||
virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const = 0;
|
||||
|
||||
//! Rendered aircraft situations (per callsign, time history)
|
||||
//! \threadsafe
|
||||
@@ -47,7 +65,7 @@ namespace BlackMisc
|
||||
|
||||
//! All parts (per callsign, time history)
|
||||
//! \threadsafe
|
||||
virtual BlackMisc::Aviation::CAircraftPartsList remoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeBefore = -1) const = 0;
|
||||
virtual BlackMisc::Aviation::CAircraftPartsList remoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeBefore) const = 0;
|
||||
|
||||
//! Is remote aircraft supporting parts?
|
||||
//! \threadsafe
|
||||
@@ -57,112 +75,81 @@ namespace BlackMisc
|
||||
//! \threadsafe
|
||||
virtual BlackMisc::Aviation::CCallsignSet remoteAircraftSupportingParts() const = 0;
|
||||
|
||||
//! Destructor
|
||||
virtual ~IRemoteAircraftProviderReadOnly() {}
|
||||
|
||||
//! Connect signals to slot receiver. As the interface is no QObject, slots can not be connected directly.
|
||||
virtual bool connectRemoteAircraftProviderSignals(
|
||||
std::function<void(const BlackMisc::Aviation::CAircraftSituation &)> situationSlot,
|
||||
std::function<void(const BlackMisc::Aviation::CAircraftParts &)> partsSlot,
|
||||
std::function<void(const BlackMisc::Aviation::CCallsign &)> removedAircraftSlot
|
||||
) = 0;
|
||||
|
||||
static const int MaxSituationsPerCallsign = 6; //!< How many situations per callsign
|
||||
static const int MaxPartsPerCallsign = 3; //!< How many parts per callsign
|
||||
|
||||
// those signals have to be implemented by classes using the interface.
|
||||
signals:
|
||||
//! New parts got added
|
||||
void addedRemoteAircraftParts(const BlackMisc::Aviation::CAircraftParts &parts);
|
||||
|
||||
//! Aircraft was removed
|
||||
void removedRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign);
|
||||
|
||||
};
|
||||
|
||||
//! Direct in memory access to own aircraft
|
||||
class BLACKMISC_EXPORT IRemoteAircraftProvider : public IRemoteAircraftProviderReadOnly
|
||||
{
|
||||
public:
|
||||
|
||||
//! The read only /sa IRemoteAircraftProviderReadOnly::remoteAircraft
|
||||
using IRemoteAircraftProviderReadOnly::remoteAircraft;
|
||||
|
||||
//! All rendered aircraft
|
||||
//! \note in memory reference, not thread safe
|
||||
virtual CSimulatedAircraftList &remoteAircraft() = 0;
|
||||
|
||||
//! Enable/disable rendering
|
||||
//! \threadsafe
|
||||
virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRendering, const QString &originator) = 0;
|
||||
|
||||
//! Rendered?
|
||||
//! \threadsafe
|
||||
virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const QString &originator) = 0;
|
||||
|
||||
//! Mark all as not rendered
|
||||
//! \threadsafe
|
||||
virtual void updateMarkAllAsNotRendered(const QString &originator) = 0;
|
||||
|
||||
//! Change model string
|
||||
//! \threadsafe
|
||||
virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator) = 0;
|
||||
|
||||
//! Change fast position updates
|
||||
//! \threadsafe
|
||||
virtual bool updateFastPositionEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enableFastPositonUpdates, const QString &originator) = 0;
|
||||
};
|
||||
|
||||
//! Class which can be directly used to access an \sa IRemoteAircraftProviderReadOnly object
|
||||
class BLACKMISC_EXPORT CRemoteAircraftAwareReadOnly
|
||||
{
|
||||
public:
|
||||
//! \copydoc IRemoteAircraftProviderReadOnly::renderedAircraft
|
||||
virtual const CSimulatedAircraftList &remoteAircraft() const;
|
||||
|
||||
//! \copydoc IRemoteAircraftProviderReadOnly::remoteAircraftSituations
|
||||
virtual BlackMisc::Aviation::CAircraftSituationList remoteAircraftSituations(const BlackMisc::Aviation::CCallsign &callsign) const;
|
||||
|
||||
//! \copydoc IRemoteAircraftProviderReadOnly::remoteAircraftSituationsCount
|
||||
virtual int remoteAircraftSituationsCount(const BlackMisc::Aviation::CCallsign &callsign) const;
|
||||
|
||||
//! \copydoc IRemoteAircraftProviderReadOnly::remoteAircraftParts
|
||||
virtual BlackMisc::Aviation::CAircraftPartsList remoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeBefore = -1) const;
|
||||
|
||||
//! \copydoc IRemoteAircraftProviderReadOnly::remoteAircraftSupportingParts
|
||||
virtual BlackMisc::Aviation::CCallsignSet remoteAircraftSupportingParts() const;
|
||||
|
||||
//! \copydoc IRemoteAircraftProviderReadOnly::isRemoteAircraftSupportingParts
|
||||
virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const;
|
||||
|
||||
//! Destructor
|
||||
virtual ~CRemoteAircraftAwareReadOnly() {}
|
||||
virtual ~IRemoteAircraftProvider() {}
|
||||
|
||||
//! Connect signals to slot receiver. As the interface is no QObject, slots can not be connected directly.
|
||||
virtual bool connectRemoteAircraftProviderSignals(
|
||||
std::function<void(const BlackMisc::Aviation::CAircraftSituation &)> addedSituationSlot,
|
||||
std::function<void(const BlackMisc::Aviation::CAircraftParts &)> addedPartsSlot,
|
||||
std::function<void(const BlackMisc::Aviation::CCallsign &)> removedAircraftSlot,
|
||||
std::function<void(const BlackMisc::Simulation::CAirspaceAircraftSnapshot &)> aircraftSnapshot
|
||||
) = 0;
|
||||
|
||||
protected:
|
||||
//! Constructor
|
||||
CRemoteAircraftAwareReadOnly(const IRemoteAircraftProviderReadOnly *remoteAircraftProvider) : m_remoteAircraftProvider(remoteAircraftProvider) {}
|
||||
const IRemoteAircraftProviderReadOnly *m_remoteAircraftProvider = nullptr; //!< access to object
|
||||
};
|
||||
|
||||
//! Class which can be directly used to access an \sa IRemoteAircraftProvider object
|
||||
class BLACKMISC_EXPORT CRemoteAircraftAware
|
||||
class CRemoteAircraftAware
|
||||
{
|
||||
public:
|
||||
//! \copydoc IRemoteAircraftProviderReadOnly::remoteAircraft
|
||||
virtual const CSimulatedAircraftList &remoteAircraft() const;
|
||||
//! \copydoc IRemoteAircraftProvider::getAircraftInRange
|
||||
virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const;
|
||||
|
||||
//! \copydoc IRemoteAircraftProvider::remoteAircraft
|
||||
virtual CSimulatedAircraftList &remoteAircraft();
|
||||
//! \copydoc IRemoteAircraftProvider::getAircraftInRangeCount
|
||||
int getAircraftInRangeCount() const;
|
||||
|
||||
//! \copydoc IRemoteAircraftProviderReadOnly::remoteAircraftSituations
|
||||
//! \copydoc IRemoteAircraftProvider::getAircraftInRangeForCallsign
|
||||
virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const Aviation::CCallsign &callsign) const;
|
||||
|
||||
//! \copydoc IRemoteAircraftProvider::getLatestAirspaceAircraftSnapshot
|
||||
virtual BlackMisc::Simulation::CAirspaceAircraftSnapshot getLatestAirspaceAircraftSnapshot() const;
|
||||
|
||||
//! \copydoc IRemoteAircraftProvider::remoteAircraftSituations
|
||||
virtual BlackMisc::Aviation::CAircraftSituationList remoteAircraftSituations(const BlackMisc::Aviation::CCallsign &callsign) const;
|
||||
|
||||
//! \copydoc IRemoteAircraftProviderReadOnly::remoteAircraftParts
|
||||
virtual BlackMisc::Aviation::CAircraftPartsList remoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign) const;
|
||||
//! \copydoc IRemoteAircraftProvider::remoteAircraftParts
|
||||
virtual BlackMisc::Aviation::CAircraftPartsList remoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeBefore) const;
|
||||
|
||||
//! \copydoc IRemoteAircraftProviderReadOnly::remoteAircraftSupportingParts
|
||||
//! \copydoc IRemoteAircraftProvider::remoteAircraftSupportingParts
|
||||
virtual BlackMisc::Aviation::CCallsignSet remoteAircraftSupportingParts() const;
|
||||
|
||||
//! \copydoc IRemoteAircraftProviderReadOnly::remoteAircraftSituationsCount
|
||||
//! \copydoc IRemoteAircraftProvider::remoteAircraftSituationsCount
|
||||
virtual int remoteAircraftSituationsCount(const BlackMisc::Aviation::CCallsign &callsign) const;
|
||||
|
||||
//! \copydoc IRemoteAircraftProvider::isRemoteAircraftSupportingParts
|
||||
virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const;
|
||||
|
||||
//! \copydoc IRemoteAircraftProvider::updateAircraftEnabled
|
||||
virtual bool providerUpdateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator);
|
||||
virtual bool updateAircraftEnabled(const BlackMisc::Aviation::CCallsign &callsign, bool enabledForRedering, const QString &originator);
|
||||
|
||||
//! \copydoc IRemoteAircraftProvider::updateAircraftModel
|
||||
virtual bool providerUpdateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator);
|
||||
virtual bool updateAircraftModel(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Simulation::CAircraftModel &model, const QString &originator);
|
||||
|
||||
//! \copydoc IRemoteAircraftProviderReadOnly::isRemoteAircraftSupportingParts
|
||||
virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const;
|
||||
//! \copydoc IRemoteAircraftProvider::updateAircraftRendered
|
||||
virtual bool updateAircraftRendered(const BlackMisc::Aviation::CCallsign &callsign, bool rendered, const QString &originator);
|
||||
|
||||
//! \copydoc IRemoteAircraftProvider::updateMarkAllAsNotRendered
|
||||
virtual void updateMarkAllAsNotRendered(const QString &originator);
|
||||
|
||||
//! Destructor
|
||||
virtual ~CRemoteAircraftAware() {}
|
||||
@@ -176,7 +163,6 @@ namespace BlackMisc
|
||||
} // namespace
|
||||
} // namespace
|
||||
|
||||
Q_DECLARE_INTERFACE(BlackMisc::Simulation::IRemoteAircraftProviderReadOnly, "IRemoteAircraftProviderReadOnly")
|
||||
Q_DECLARE_INTERFACE(BlackMisc::Simulation::IRemoteAircraftProvider, "IRemoteAircraftProvider")
|
||||
|
||||
#endif // guard
|
||||
|
||||
@@ -19,14 +19,19 @@ namespace BlackMisc
|
||||
CRemoteAircraftProviderDummy::CRemoteAircraftProviderDummy(QObject *parent) : QObject(parent)
|
||||
{ }
|
||||
|
||||
const CSimulatedAircraftList &CRemoteAircraftProviderDummy::remoteAircraft() const
|
||||
CSimulatedAircraftList CRemoteAircraftProviderDummy::getAircraftInRange() const
|
||||
{
|
||||
return m_aircraft;
|
||||
}
|
||||
|
||||
CSimulatedAircraftList &CRemoteAircraftProviderDummy::remoteAircraft()
|
||||
int CRemoteAircraftProviderDummy::getAircraftInRangeCount() const
|
||||
{
|
||||
return m_aircraft;
|
||||
return m_aircraft.size();
|
||||
}
|
||||
|
||||
CSimulatedAircraft CRemoteAircraftProviderDummy::getAircraftForCallsign(const CCallsign &callsign) const
|
||||
{
|
||||
return m_aircraft.findFirstByCallsign(callsign);
|
||||
}
|
||||
|
||||
CAircraftPartsList CRemoteAircraftProviderDummy::remoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeBefore) const
|
||||
@@ -87,6 +92,20 @@ namespace BlackMisc
|
||||
return n > 0;
|
||||
}
|
||||
|
||||
bool CRemoteAircraftProviderDummy::updateAircraftRendered(const CCallsign &callsign, bool rendered, const QString &originator)
|
||||
{
|
||||
Q_UNUSED(originator);
|
||||
CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexRendered, CVariant::fromValue(rendered));
|
||||
int n = this->m_aircraft.applyIfCallsign(callsign, vm);
|
||||
return n > 0;
|
||||
}
|
||||
|
||||
void CRemoteAircraftProviderDummy::updateMarkAllAsNotRendered(const QString &originator)
|
||||
{
|
||||
Q_UNUSED(originator);
|
||||
this->m_aircraft.markAllAsNotRendered();
|
||||
}
|
||||
|
||||
void CRemoteAircraftProviderDummy::insertNewSituation(const CAircraftSituation &situation)
|
||||
{
|
||||
this->m_situations.push_front(situation);
|
||||
|
||||
@@ -32,28 +32,31 @@ namespace BlackMisc
|
||||
//! Constructor
|
||||
CRemoteAircraftProviderDummy(QObject *parent = nullptr);
|
||||
|
||||
//! IRemoteAircraftProviderReadOnly::remoteAircraft
|
||||
virtual const CSimulatedAircraftList &remoteAircraft() const override;
|
||||
//! IRemoteAircraftProvider::getAircraftInRange
|
||||
virtual CSimulatedAircraftList getAircraftInRange() const override;
|
||||
|
||||
//! IRemoteAircraftProvider::remoteAircraft
|
||||
virtual CSimulatedAircraftList &remoteAircraft() override;
|
||||
//! IRemoteAircraftProvider::getAircraftInRangeCount
|
||||
virtual int getAircraftInRangeCount() const override;
|
||||
|
||||
//! \copydoc IRemoteAircraftProviderReadOnly::remoteAircraftParts
|
||||
//! IRemoteAircraftProvider::getAircraftForCallsign
|
||||
virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
|
||||
|
||||
//! \copydoc IRemoteAircraftProvider::remoteAircraftParts
|
||||
virtual BlackMisc::Aviation::CAircraftPartsList remoteAircraftParts(const Aviation::CCallsign &callsign, qint64 cutoffTimeBefore = -1) const override;
|
||||
|
||||
//! \copydoc IRemoteAircraftProviderReadOnly::remoteAircraftSituations
|
||||
//! \copydoc IRemoteAircraftProvider::remoteAircraftSituations
|
||||
virtual BlackMisc::Aviation::CAircraftSituationList remoteAircraftSituations(const Aviation::CCallsign &callsign) const override;
|
||||
|
||||
//! \copydoc IRemoteAircraftProviderReadOnly::remoteAircraftSituationsCount
|
||||
//! \copydoc IRemoteAircraftProvider::remoteAircraftSituationsCount
|
||||
virtual int remoteAircraftSituationsCount(const Aviation::CCallsign &callsign) const override;
|
||||
|
||||
//! \copydoc IRemoteAircraftProviderReadOnly::remoteAircraftSupportingParts
|
||||
//! \copydoc IRemoteAircraftProvider::remoteAircraftSupportingParts
|
||||
virtual BlackMisc::Aviation::CCallsignSet remoteAircraftSupportingParts() const override;
|
||||
|
||||
//! \copydoc IRemoteAircraftProviderReadOnly::isRemoteAircraftSupportingParts
|
||||
//! \copydoc IRemoteAircraftProvider::isRemoteAircraftSupportingParts
|
||||
virtual bool isRemoteAircraftSupportingParts(const Aviation::CCallsign &callsign) const override;
|
||||
|
||||
//! \copydoc IRemoteAircraftProviderReadOnly::connectRemoteAircraftProviderSignals
|
||||
//! \copydoc IRemoteAircraftProvider::connectRemoteAircraftProviderSignals
|
||||
virtual bool connectRemoteAircraftProviderSignals(
|
||||
std::function<void(const BlackMisc::Aviation::CAircraftSituation &)> situationSlot,
|
||||
std::function<void(const BlackMisc::Aviation::CAircraftParts &)> partsSlot,
|
||||
@@ -69,6 +72,12 @@ namespace BlackMisc
|
||||
//! \copydoc IRemoteAircraftProvider::updateFastPositionEnabled
|
||||
virtual bool updateFastPositionEnabled(const Aviation::CCallsign &callsign, bool enableFastPositionUpdates, const QString &originator) override;
|
||||
|
||||
//! \copydoc IRemoteAircraftProvider::updateAircraftRendered
|
||||
virtual bool updateAircraftRendered(const Aviation::CCallsign &callsign, bool rendered, const QString &originator) override;
|
||||
|
||||
//! \copydoc IRemoteAircraftProvider::updateMarkAllAsNotRendered
|
||||
virtual void updateMarkAllAsNotRendered(const QString &originator) override;
|
||||
|
||||
//! For testing, add new situation and fire signals
|
||||
void insertNewSituation(const BlackMisc::Aviation::CAircraftSituation &situation);
|
||||
|
||||
@@ -79,13 +88,13 @@ namespace BlackMisc
|
||||
void clear();
|
||||
|
||||
signals:
|
||||
//! \copydoc IRemoteAircraftProviderReadOnly::addedRemoteAircraftSituation
|
||||
//! Added situation
|
||||
void addedRemoteAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation);
|
||||
|
||||
//! \copydoc IRemoteAircraftProviderReadOnly::addedRemoteAircraftParts
|
||||
//! Added parts
|
||||
void addedRemoteAircraftParts(const BlackMisc::Aviation::CAircraftParts &parts);
|
||||
|
||||
//! \copydoc IRemoteAircraftProviderReadOnly::removedRemoteAircraft
|
||||
//! Added aircraft
|
||||
void removedRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign);
|
||||
|
||||
private:
|
||||
|
||||
@@ -74,6 +74,7 @@ namespace BlackMisc
|
||||
{
|
||||
case IndexModel:
|
||||
this->m_model.setPropertyByIndex(variant, index.copyFrontRemoved());
|
||||
this->setModel(this->m_model); // sync some values
|
||||
break;
|
||||
case IndexClient:
|
||||
this->m_client.setPropertyByIndex(variant, index.copyFrontRemoved());
|
||||
|
||||
Reference in New Issue
Block a user