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

refs #666 XBus receives aircraft situations with timestamps.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-06-02 01:28:29 +01:00
parent c64851aeba
commit 37b4b81b9b
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -478,13 +478,14 @@ namespace BlackSimPlugin
{ {
Q_ASSERT(isConnected()); Q_ASSERT(isConnected());
using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::PhysicalQuantities;
m_traffic->setPlanePosition(situation.getCallsign().asString(), m_traffic->addPlanePosition(situation.getCallsign().asString(),
situation.latitude().value(CAngleUnit::deg()), situation.latitude().value(CAngleUnit::deg()),
situation.longitude().value(CAngleUnit::deg()), situation.longitude().value(CAngleUnit::deg()),
situation.getAltitude().value(CLengthUnit::ft()), situation.getAltitude().value(CLengthUnit::ft()),
situation.getPitch().value(CAngleUnit::deg()), situation.getPitch().value(CAngleUnit::deg()),
situation.getBank().value(CAngleUnit::deg()), situation.getBank().value(CAngleUnit::deg()),
situation.getHeading().value(CAngleUnit::deg())); situation.getHeading().value(CAngleUnit::deg()),
situation.getAdjustedMSecsSinceEpoch()); // fixme sim machine's clock must be synchronized
} }
void CSimulatorXPlane::ps_remoteProviderAddAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts) void CSimulatorXPlane::ps_remoteProviderAddAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts)

4
src/plugins/simulator/xplane/xbustrafficproxy.cpp
View File

@@ -86,9 +86,9 @@ namespace BlackSimPlugin
m_dbusInterface->callDBus(QLatin1String("removeAllPlanes")); m_dbusInterface->callDBus(QLatin1String("removeAllPlanes"));
} }
void CXBusTrafficProxy::setPlanePosition(const QString &callsign, double latitude, double longitude, double altitude, double pitch, double roll, double heading) void CXBusTrafficProxy::addPlanePosition(const QString &callsign, double latitude, double longitude, double altitude, double pitch, double roll, double heading, qint64 time)
{ {
m_dbusInterface->callDBus(QLatin1String("setPlanePosition"), callsign, latitude, longitude, altitude, pitch, roll, heading); m_dbusInterface->callDBus(QLatin1String("addPlanePosition"), callsign, latitude, longitude, altitude, pitch, roll, heading, time);
} }
void CXBusTrafficProxy::setPlaneSurfaces(const QString &callsign, double gear, double flap, double spoiler, double speedBrake, double slat, double wingSweep, double thrust, void CXBusTrafficProxy::setPlaneSurfaces(const QString &callsign, double gear, double flap, double spoiler, double speedBrake, double slat, double wingSweep, double thrust,

4
src/plugins/simulator/xplane/xbustrafficproxy.h
View File

@@ -102,8 +102,8 @@ namespace BlackSimPlugin
//! \copydoc XBus::CTraffic::removeAllPlanes //! \copydoc XBus::CTraffic::removeAllPlanes
void removeAllPlanes(); void removeAllPlanes();
//! \copydoc XBus::CTraffic::setPlanePosition //! \copydoc XBus::CTraffic::addPlanePosition
void setPlanePosition(const QString &callsign, double latitude, double longitude, double altitude, double pitch, double roll, double heading); void addPlanePosition(const QString &callsign, double latitude, double longitude, double altitude, double pitch, double roll, double heading, qint64 time);
//! \copydoc XBus::CTraffic::setPlaneSurfaces //! \copydoc XBus::CTraffic::setPlaneSurfaces
void setPlaneSurfaces(const QString &callsign, double gear, double flap, double spoiler, double speedBrake, double slat, double wingSweep, double thrust, void setPlaneSurfaces(const QString &callsign, double gear, double flap, double spoiler, double speedBrake, double slat, double wingSweep, double thrust,

2
src/xbus/traffic.cpp
View File

@@ -225,7 +225,7 @@ namespace XBus
m_planesById.clear(); m_planesById.clear();
} }
void CTraffic::setPlanePosition(const QString &callsign, double latitude, double longitude, double altitude, double pitch, double roll, double heading) void CTraffic::addPlanePosition(const QString &callsign, double latitude, double longitude, double altitude, double pitch, double roll, double heading, qint64 time)
{ {
const auto plane = m_planesByCallsign.value(callsign, nullptr); const auto plane = m_planesByCallsign.value(callsign, nullptr);
if (plane) if (plane)

2
src/xbus/traffic.h
View File

@@ -101,7 +101,7 @@ namespace XBus
void removeAllPlanes(); void removeAllPlanes();
//! Set the position of a traffic aircraft //! Set the position of a traffic aircraft
void setPlanePosition(const QString &callsign, double latitude, double longitude, double altitude, double pitch, double roll, double heading); void addPlanePosition(const QString &callsign, double latitude, double longitude, double altitude, double pitch, double roll, double heading, qint64 time);
//! Set the flight control surfaces and lights of a traffic aircraft //! Set the flight control surfaces and lights of a traffic aircraft
void setPlaneSurfaces(const QString &callsign, double gear, double flap, double spoiler, double speedBrake, double slat, double wingSweep, double thrust, void setPlaneSurfaces(const QString &callsign, double gear, double flap, double spoiler, double speedBrake, double slat, double wingSweep, double thrust,