mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-30 11:55:35 +08:00
refs #395, changed own aircraft provider to thread safe member functions
(similar to remote aircraft provider)
* removed references
* made own aircraft context thread safe (reg. own aircrat data)
* removed the read only versions of the provider
* adjusted consuming methods
* renamed some functions ("ownAircraft...") to avoid ambiguity (with remote aircraft)
This commit is contained in:
Klaus Basan
committed by
Mathew Sutcliffe
Mathew Sutcliffe
parent
7200f2e29c
commit
3ecf37dda4
@@ -18,47 +18,109 @@ namespace BlackMisc
|
||||
namespace Simulation
|
||||
{
|
||||
|
||||
const CSimulatedAircraft &COwnAircraftAwareReadOnly::ownAircraft() const
|
||||
const CSimulatedAircraft COwnAircraftAware::getOwnAircraft() const
|
||||
{
|
||||
Q_ASSERT_X(this->m_ownAircraftProvider, "ownAircraft", "No object available");
|
||||
return this->m_ownAircraftProvider->ownAircraft();
|
||||
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_ownAircraftProvider->getOwnAircraft();
|
||||
}
|
||||
|
||||
const CSimulatedAircraft &COwnAircraftAware::ownAircraft() const
|
||||
Geo::CCoordinateGeodetic COwnAircraftAware::getOwnAircraftPosition() const
|
||||
{
|
||||
Q_ASSERT_X(this->m_ownAircraftProvider, "ownAircraft", "No object available");
|
||||
return this->m_ownAircraftProvider->ownAircraft();
|
||||
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_ownAircraftProvider->getOwnAircraftPosition();
|
||||
}
|
||||
|
||||
CSimulatedAircraft &COwnAircraftAware::ownAircraft()
|
||||
CAircraftParts COwnAircraftAware::getOwnAircraftParts() const
|
||||
{
|
||||
Q_ASSERT_X(this->m_ownAircraftProvider, "ownAircraft", "No object available");
|
||||
return this->m_ownAircraftProvider->ownAircraft();
|
||||
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_ownAircraftProvider->getOwnAircraftParts();
|
||||
}
|
||||
|
||||
bool COwnAircraftAware::providerUpdateCockpit(const CComSystem &com1, const CComSystem &com2, const CTransponder &transponder, const QString &originator)
|
||||
CAircraftModel COwnAircraftAware::getOwnAircraftModel() const
|
||||
{
|
||||
Q_ASSERT_X(this->m_ownAircraftProvider, "providerUpdateCockpit", "No object available");
|
||||
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_ownAircraftProvider->getOwnAircraftModel();
|
||||
}
|
||||
|
||||
CLength COwnAircraftAware::getDistanceToOwnAircraft(const Geo::ICoordinateGeodetic &position) const
|
||||
{
|
||||
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_ownAircraftProvider->getDistanceToOwnAircraft(position);
|
||||
}
|
||||
|
||||
bool COwnAircraftAware::updateCockpit(const CComSystem &com1, const CComSystem &com2, const CTransponder &transponder, const QString &originator)
|
||||
{
|
||||
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_ownAircraftProvider->updateCockpit(com1, com2, transponder, originator);
|
||||
}
|
||||
|
||||
bool COwnAircraftAware::providerUpdateActiveComFrequency(const CFrequency &frequency, int comUnit, const QString &originator)
|
||||
bool COwnAircraftAware::updateActiveComFrequency(const CFrequency &frequency, int comUnit, const QString &originator)
|
||||
{
|
||||
Q_ASSERT_X(this->m_ownAircraftProvider, "providerUpdateActiveComFrequency", "No object available");
|
||||
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_ownAircraftProvider->updateActiveComFrequency(frequency, comUnit, originator);
|
||||
}
|
||||
|
||||
bool COwnAircraftAware::providerUpdateSelcal(const CSelcal &selcal, const QString &originator)
|
||||
bool COwnAircraftAware::updateSelcal(const CSelcal &selcal, const QString &originator)
|
||||
{
|
||||
Q_ASSERT_X(this->m_ownAircraftProvider, "providerUpdateSelcal", "No object available");
|
||||
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_ownAircraftProvider->updateSelcal(selcal, originator);
|
||||
}
|
||||
|
||||
bool COwnAircraftAware::updateOwnModel(const CAircraftModel &model)
|
||||
{
|
||||
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_ownAircraftProvider->updateOwnModel(model);
|
||||
}
|
||||
|
||||
bool COwnAircraftAware::updateOwnSituation(const CAircraftSituation &situation)
|
||||
{
|
||||
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_ownAircraftProvider->updateOwnSituation(situation);
|
||||
}
|
||||
|
||||
bool COwnAircraftAware::updateOwnParts(const CAircraftParts &parts)
|
||||
{
|
||||
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_ownAircraftProvider->updateOwnParts(parts);
|
||||
}
|
||||
|
||||
bool COwnAircraftAware::updateOwnCallsign(const CCallsign &callsign)
|
||||
{
|
||||
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_ownAircraftProvider->updateOwnCallsign(callsign);
|
||||
}
|
||||
|
||||
bool COwnAircraftAware::updateOwnIcaoData(const CAircraftIcao &icaoData)
|
||||
{
|
||||
Q_ASSERT_X(this->m_ownAircraftProvider, Q_FUNC_INFO, "No object available");
|
||||
return this->m_ownAircraftProvider->updateOwnIcaoData(icaoData);
|
||||
}
|
||||
|
||||
Geo::CCoordinateGeodetic COwnAircraftProviderDummy::getOwnAircraftPosition() const
|
||||
{
|
||||
return m_ownAircraft.getPosition();
|
||||
}
|
||||
|
||||
CAircraftParts COwnAircraftProviderDummy::getOwnAircraftParts() const
|
||||
{
|
||||
return m_ownAircraft.getParts();
|
||||
}
|
||||
|
||||
CAircraftModel COwnAircraftProviderDummy::getOwnAircraftModel() const
|
||||
{
|
||||
return m_ownAircraft.getModel();
|
||||
}
|
||||
|
||||
CLength COwnAircraftProviderDummy::getDistanceToOwnAircraft(const Geo::ICoordinateGeodetic &position) const
|
||||
{
|
||||
return m_ownAircraft.calculateGreatCircleDistance(position);
|
||||
}
|
||||
|
||||
bool COwnAircraftProviderDummy::updateCockpit(const Aviation::CComSystem &com1, const Aviation::CComSystem &com2, const Aviation::CTransponder &transponder, const QString &originator)
|
||||
{
|
||||
ownAircraft().setCom1System(com1);
|
||||
ownAircraft().setCom2System(com2);
|
||||
ownAircraft().setTransponder(transponder);
|
||||
m_ownAircraft.setCom1System(com1);
|
||||
m_ownAircraft.setCom2System(com2);
|
||||
m_ownAircraft.setTransponder(transponder);
|
||||
Q_UNUSED(originator);
|
||||
return true;
|
||||
}
|
||||
@@ -67,20 +129,50 @@ namespace BlackMisc
|
||||
{
|
||||
if (!CComSystem::isValidComFrequency(frequency)) { return false; }
|
||||
CComSystem::ComUnit comUnitEnum = static_cast<CComSystem::ComUnit>(comUnit);
|
||||
CComSystem com = ownAircraft().getComSystem(comUnitEnum);
|
||||
CComSystem com = m_ownAircraft.getComSystem(comUnitEnum);
|
||||
com.setFrequencyActive(frequency);
|
||||
ownAircraft().setComSystem(com, comUnitEnum);
|
||||
m_ownAircraft.setComSystem(com, comUnitEnum);
|
||||
Q_UNUSED(originator);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool COwnAircraftProviderDummy::updateSelcal(const CSelcal &selcal, const QString &originator)
|
||||
{
|
||||
ownAircraft().setSelcal(selcal);
|
||||
m_ownAircraft.setSelcal(selcal);
|
||||
Q_UNUSED(originator);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool COwnAircraftProviderDummy::updateOwnModel(const CAircraftModel &model)
|
||||
{
|
||||
m_ownAircraft.setModel(model);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool COwnAircraftProviderDummy::updateOwnSituation(const CAircraftSituation &situation)
|
||||
{
|
||||
m_ownAircraft.setSituation(situation);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool COwnAircraftProviderDummy::updateOwnParts(const CAircraftParts &parts)
|
||||
{
|
||||
m_ownAircraft.setParts(parts);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool COwnAircraftProviderDummy::updateOwnCallsign(const CCallsign &callsign)
|
||||
{
|
||||
m_ownAircraft.setCallsign(callsign);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool COwnAircraftProviderDummy::updateOwnIcaoData(const CAircraftIcao &icaoData)
|
||||
{
|
||||
m_ownAircraft.setIcaoInfo(icaoData);
|
||||
return true;
|
||||
}
|
||||
|
||||
COwnAircraftProviderDummy *COwnAircraftProviderDummy::instance()
|
||||
{
|
||||
static COwnAircraftProviderDummy *dummy = new COwnAircraftProviderDummy();
|
||||
|
||||
@@ -19,111 +19,111 @@ namespace BlackMisc
|
||||
{
|
||||
namespace Simulation
|
||||
{
|
||||
//! Direct in memory access to own aircraft
|
||||
class BLACKMISC_EXPORT IOwnAircraftProviderReadOnly
|
||||
|
||||
//! Direct threadsafe in memory access to own aircraft
|
||||
class IOwnAircraftProvider
|
||||
{
|
||||
public:
|
||||
//! Own aircraft as reference
|
||||
//! \note in memory, not thread safe!
|
||||
virtual const CSimulatedAircraft &ownAircraft() const = 0;
|
||||
|
||||
//! Own aircraft as copy
|
||||
//! \note not hread safe!
|
||||
virtual BlackMisc::Simulation::CSimulatedAircraft getOwnAircraft() const = 0;
|
||||
|
||||
//! Destructor
|
||||
virtual ~IOwnAircraftProviderReadOnly() {}
|
||||
};
|
||||
|
||||
//! Direct in memory access to own aircraft
|
||||
class BLACKMISC_EXPORT IOwnAircraftProvider : public IOwnAircraftProviderReadOnly
|
||||
{
|
||||
public:
|
||||
|
||||
using IOwnAircraftProviderReadOnly::ownAircraft;
|
||||
|
||||
//! Own aircraft
|
||||
virtual CSimulatedAircraft &ownAircraft() = 0;
|
||||
//! \threadsafe
|
||||
virtual CSimulatedAircraft getOwnAircraft() const = 0;
|
||||
|
||||
// cockpit related updates, which can come from multiple sources
|
||||
// and are subject of roundtrips
|
||||
//! Own aircraft's position
|
||||
//! \threadsafe
|
||||
virtual BlackMisc::Geo::CCoordinateGeodetic getOwnAircraftPosition() const = 0;
|
||||
|
||||
//! Own aircraft's parts
|
||||
//! \threadsafe
|
||||
virtual BlackMisc::Aviation::CAircraftParts getOwnAircraftParts() const = 0;
|
||||
|
||||
//! Own aircraft model
|
||||
//! \threadsafe
|
||||
virtual BlackMisc::Simulation::CAircraftModel getOwnAircraftModel() const = 0;
|
||||
|
||||
//! Distance to own aircraft
|
||||
//! \threadsafe
|
||||
virtual BlackMisc::PhysicalQuantities::CLength getDistanceToOwnAircraft(const BlackMisc::Geo::ICoordinateGeodetic &position) const = 0;
|
||||
|
||||
//! Update aircraft's callsign
|
||||
//! \threadsafe
|
||||
virtual bool updateOwnCallsign(const BlackMisc::Aviation::CCallsign &callsign) = 0;
|
||||
|
||||
//! Update ICAO data
|
||||
//! \threadsafe
|
||||
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcao &icaoData) = 0;
|
||||
|
||||
//! Update model
|
||||
//! \threadsafe
|
||||
virtual bool updateOwnModel(const BlackMisc::Simulation::CAircraftModel &model) = 0;
|
||||
|
||||
//! Update own situation
|
||||
virtual bool updateOwnSituation(const BlackMisc::Aviation::CAircraftSituation &situation) = 0;
|
||||
|
||||
//! Update own parts
|
||||
virtual bool updateOwnParts(const BlackMisc::Aviation::CAircraftParts &parts) = 0;
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
// cockpit / aircraft related updates, which can come from multiple sources
|
||||
// and are subject of roundtrips -> originator
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
//! Update cockpit, but send signals when applicable
|
||||
//! \threadsafe
|
||||
virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const QString &originator) = 0;
|
||||
|
||||
//! Update cockpit, but send signals when applicable
|
||||
//! \threadsafe
|
||||
virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const QString &originator) = 0;
|
||||
|
||||
//! Update cockpit, but send signals when applicable
|
||||
//! \threadsafe
|
||||
virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const QString &originator) = 0;
|
||||
};
|
||||
|
||||
//! For testing
|
||||
class BLACKMISC_EXPORT COwnAircraftProviderDummy : public QObject, public IOwnAircraftProvider
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
//! Constructor
|
||||
COwnAircraftProviderDummy() = default;
|
||||
|
||||
//! Singleton
|
||||
static COwnAircraftProviderDummy *instance();
|
||||
|
||||
//! \copydoc IOwnAircraftProviderReadOnly::ownAircraft
|
||||
virtual const CSimulatedAircraft &ownAircraft() const override { return this->m_ownAircraft; }
|
||||
|
||||
//! \copydoc IOwnAircraftProvider::ownAircraft
|
||||
virtual CSimulatedAircraft &ownAircraft() override { return this->m_ownAircraft; }
|
||||
|
||||
//! \copydoc IOwnAircraftProvider::getOwnAircraft
|
||||
virtual CSimulatedAircraft getOwnAircraft() const override { return this->m_ownAircraft; }
|
||||
|
||||
public slots:
|
||||
//! \copydoc IOwnAircraftProvider::updateCockpit
|
||||
virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const QString &originator) override;
|
||||
|
||||
//! \copydoc IOwnAircraftProvider::updateComFrequency
|
||||
virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const QString &originator) override;
|
||||
|
||||
//! \copydoc IOwnAircraftProvider::updateSelcal
|
||||
virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const QString &originator) override;
|
||||
|
||||
private:
|
||||
BlackMisc::Simulation::CSimulatedAircraft m_ownAircraft;
|
||||
};
|
||||
|
||||
//! Delegating class which can be directly used to access an \sa IOwnAircraftProviderReadOnly instance
|
||||
class BLACKMISC_EXPORT COwnAircraftAwareReadOnly
|
||||
{
|
||||
public:
|
||||
//! \copydoc IOwnAircraftProviderReadOnly::ownAircraft
|
||||
virtual const CSimulatedAircraft &ownAircraft() const;
|
||||
|
||||
protected:
|
||||
//! Constructor
|
||||
COwnAircraftAwareReadOnly(const IOwnAircraftProviderReadOnly *ownAircraftProvider) : m_ownAircraftProvider(ownAircraftProvider) {}
|
||||
const IOwnAircraftProviderReadOnly *m_ownAircraftProvider = nullptr; //!< access to object
|
||||
};
|
||||
|
||||
//! Delegating class which can be directly used to access an \sa IOwnAircraftProvider instance
|
||||
class BLACKMISC_EXPORT COwnAircraftAware
|
||||
class COwnAircraftAware
|
||||
{
|
||||
public:
|
||||
//! \copydoc IOwnAircraftProviderReadOnly::ownAircraft
|
||||
virtual const CSimulatedAircraft &ownAircraft() const;
|
||||
//! \copydoc IOwnAircraftProvider::getOwnAircraft
|
||||
virtual const CSimulatedAircraft getOwnAircraft() const;
|
||||
|
||||
//! \copydoc IOwnAircraftProvider::ownAircraft
|
||||
virtual CSimulatedAircraft &ownAircraft();
|
||||
//! \copydoc IOwnAircraftProvider::getOwnAircraftPosition
|
||||
virtual BlackMisc::Geo::CCoordinateGeodetic getOwnAircraftPosition() const;
|
||||
|
||||
//! \copydoc IOwnAircraftProvider::getOwnAircraftParts
|
||||
virtual BlackMisc::Aviation::CAircraftParts getOwnAircraftParts() const;
|
||||
|
||||
//! \copydoc IOwnAircraftProvider::getOwnAircraftModel
|
||||
virtual BlackMisc::Simulation::CAircraftModel getOwnAircraftModel() const;
|
||||
|
||||
//! \copydoc IOwnAircraftProvider::getDistanceToOwnAircraft
|
||||
virtual BlackMisc::PhysicalQuantities::CLength getDistanceToOwnAircraft(const BlackMisc::Geo::ICoordinateGeodetic &position) const;
|
||||
|
||||
//! \copydoc IOwnAircraftProvider::updateCockpit
|
||||
virtual bool providerUpdateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const QString &originator);
|
||||
virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const QString &originator);
|
||||
|
||||
//! \copydoc IOwnAircraftProvider::updateComFrequency
|
||||
virtual bool providerUpdateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const QString &originator);
|
||||
virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, int comUnit, const QString &originator);
|
||||
|
||||
//! \copydoc IOwnAircraftProvider::updateSelcal
|
||||
virtual bool providerUpdateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const QString &originator);
|
||||
virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const QString &originator);
|
||||
|
||||
//! \copydoc IOwnAircraftProvider::updateOwnCallsign
|
||||
virtual bool updateOwnCallsign(const BlackMisc::Aviation::CCallsign &callsign);
|
||||
|
||||
//! \copydoc IOwnAircraftProvider::updateOwnIcaoData
|
||||
virtual bool updateOwnIcaoData(const BlackMisc::Aviation::CAircraftIcao &icaoData);
|
||||
|
||||
//! \copydoc IOwnAircraftProvider::updateOwnModel
|
||||
virtual bool updateOwnModel(const BlackMisc::Simulation::CAircraftModel &model);
|
||||
|
||||
//! \copydoc IOwnAircraftProvider::updateOwnSituation
|
||||
virtual bool updateOwnSituation(const BlackMisc::Aviation::CAircraftSituation &situation);
|
||||
|
||||
//! \copydoc IOwnAircraftProvider::updateOwnParts
|
||||
virtual bool updateOwnParts(const BlackMisc::Aviation::CAircraftParts &parts);
|
||||
|
||||
protected:
|
||||
//! Constructor
|
||||
|
||||
@@ -20,7 +20,7 @@ namespace BlackMisc
|
||||
namespace Simulation
|
||||
{
|
||||
|
||||
//! Dummy implementation for testing purpose
|
||||
//! Dummy implementation for testing purpose, not thread safe
|
||||
class BLACKMISC_EXPORT CRemoteAircraftProviderDummy :
|
||||
public QObject,
|
||||
public IRemoteAircraftProvider
|
||||
|
||||
@@ -112,9 +112,9 @@ namespace BlackMisc
|
||||
|
||||
void CSimulatedAircraft::setCallsign(const CCallsign &callsign)
|
||||
{
|
||||
this->m_model.setCallsign(callsign);
|
||||
this->m_client.setUserCallsign(callsign);
|
||||
CAircraft::setCallsign(callsign);
|
||||
CAircraft::setCallsign(callsign); // also sets correct hint
|
||||
this->m_model.setCallsign(getCallsign());
|
||||
this->m_client.setUserCallsign(getCallsign());
|
||||
}
|
||||
|
||||
void CSimulatedAircraft::setIcaoInfo(const CAircraftIcao &icao)
|
||||
|
||||
Reference in New Issue
Block a user