flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-04 08:36:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T322, get situation from "own aircraft" context

Browse Source
This commit is contained in:
Klaus Basan
2018-09-03 13:39:38 +02:00
committed by Roland Winklmeier
parent 97f5661690
commit cacbe6e996
5 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blackcore/context/contextownaircraft.h
View File

@@ -84,7 +84,7 @@ namespace BlackCore
static IContextOwnAircraft *create(CCoreFacade *parent, CCoreFacadeConfig::ContextMode mode, BlackMisc::CDBusServer *server, QDBusConnection &connection);
//! Destructor
virtual ~IContextOwnAircraft() {}
virtual ~IContextOwnAircraft() override {}
signals:
//! Aircraft cockpit update
@@ -106,6 +106,9 @@ namespace BlackCore
//! Get own aircraft
virtual BlackMisc::Simulation::CSimulatedAircraft getOwnAircraft() const = 0;
//! Get own aircraft
virtual BlackMisc::Aviation::CAircraftSituation getOwnAircraftSituation() const = 0;
//! Update position
//! \note this is in \sa IContextOwnAircraft as we want to set test positions from the GUI / elsewhere
virtual bool updateOwnPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude, const BlackMisc::Aviation::CAltitude &pressureAltitude) = 0;

7
src/blackcore/context/contextownaircraftempty.h
View File

@@ -37,6 +37,13 @@ namespace BlackCore
return BlackMisc::Simulation::CSimulatedAircraft();
}
//! \copydoc IContextOwnAircraft::getOwnAircraftSituation()
virtual BlackMisc::Aviation::CAircraftSituation getOwnAircraftSituation() const override
{
logEmptyContextWarning(Q_FUNC_INFO);
return BlackMisc::Aviation::CAircraftSituation();
}
//! \copydoc IContextOwnAircraft::updateOwnPosition
virtual bool updateOwnPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude, const BlackMisc::Aviation::CAltitude &pressureAltitude) override
{

13
src/blackcore/context/contextownaircraftimpl.h
View File

@@ -71,18 +71,13 @@ namespace BlackCore
public:
//! Destructor
virtual ~CContextOwnAircraft();
virtual ~CContextOwnAircraft() override;
// IOwnAircraftProvider overrides
//! \copydoc BlackMisc::Simulation::IOwnAircraftProvider::getOwnAircraftParts
//! \copydoc BlackMisc::Simulation::IOwnAircraftProvider::getOwnAircraftPosition
//! \ingroup ownaircraftprovider
virtual BlackMisc::Geo::CCoordinateGeodetic getOwnAircraftPosition() const override;
//! Own aircraft's situation
//! \copydoc BlackMisc::Simulation::IOwnAircraftProvider::getOwnAircraftParts
//! \ingroup ownaircraftprovider
virtual BlackMisc::Aviation::CAircraftSituation getOwnAircraftSituation() const override;
//! \copydoc BlackMisc::Simulation::IOwnAircraftProvider::getOwnAircraftParts
//! \ingroup ownaircraftprovider
virtual BlackMisc::Aviation::CAircraftParts getOwnAircraftParts() const override;
@@ -116,6 +111,10 @@ namespace BlackCore
//! \ingroup ownaircraftprovider
virtual BlackMisc::Simulation::CSimulatedAircraft getOwnAircraft() const override;
//! \copydoc IContextOwnAircraft::getOwnAircraftSituation()
//! \ingroup ownaircraftprovider
virtual BlackMisc::Aviation::CAircraftSituation getOwnAircraftSituation() const override;
//! \copydoc IContextOwnAircraft::updateOwnCallsign
//! \ingroup ownaircraftprovider
virtual bool updateOwnCallsign(const BlackMisc::Aviation::CCallsign &callsign) override;

7
src/blackcore/context/contextownaircraftproxy.cpp
View File

@@ -28,7 +28,7 @@ namespace BlackCore
CContextOwnAircraftProxy::CContextOwnAircraftProxy(const QString &serviceName, QDBusConnection &connection, CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime) : IContextOwnAircraft(mode, runtime), m_dBusInterface(nullptr)
{
this->m_dBusInterface = new BlackMisc::CGenericDBusInterface(
serviceName , IContextOwnAircraft::ObjectPath(), IContextOwnAircraft::InterfaceName(),
serviceName, IContextOwnAircraft::ObjectPath(), IContextOwnAircraft::InterfaceName(),
connection, this);
this->relaySignals(serviceName, connection);
}
@@ -55,6 +55,11 @@ namespace BlackCore
return this->m_dBusInterface->callDBusRet<BlackMisc::Simulation::CSimulatedAircraft>(QLatin1String("getOwnAircraft"));
}
CAircraftSituation CContextOwnAircraftProxy::getOwnAircraftSituation() const
{
return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAircraftSituation>(QLatin1String("getOwnAircraftSituation"));
}
bool CContextOwnAircraftProxy::updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const CIdentifier &originator)
{
return this->m_dBusInterface->callDBusRet<bool>(QLatin1String("updateCockpit"), com1, com2, transponder, originator);

3
src/blackcore/context/contextownaircraftproxy.h
View File

@@ -54,7 +54,7 @@ namespace BlackCore
public:
//! Destructor
virtual ~CContextOwnAircraftProxy() {}
virtual ~CContextOwnAircraftProxy() override {}
//! Unit test relay signals
//! \private
@@ -64,6 +64,7 @@ namespace BlackCore
//! \publicsection
//! @{
virtual BlackMisc::Simulation::CSimulatedAircraft getOwnAircraft() const override;
virtual BlackMisc::Aviation::CAircraftSituation getOwnAircraftSituation() const override;
virtual bool updateOwnPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude, const BlackMisc::Aviation::CAltitude &pressureAltitude) override;
virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::CIdentifier &originator) override;
virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ComUnit comUnit, const BlackMisc::CIdentifier &originator) override;