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

refs #358, added (a first very simple) model matching to FSX driver

Browse Source 
* isRunning → isSimulating
* adjusted addRemoteAircraft signature (remark: CClient as parameter will be removed)
* renamed to "ownAircraft" when referring to own aircraft
* functions to access installed models/matched models
* model matching in CSimulatorFsx::addRemoteAircraft
This commit is contained in:
Klaus Basan
2014-12-28 20:33:11 +01:00
parent c285ac4098
commit 23e9159dfd
11 changed files with 324 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/simulator/xplane/simulator_xplane.cpp
View File

@@ -11,6 +11,8 @@
#include <QTimer>
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
using namespace BlackMisc::Network;
namespace BlackSimPlugin
{
@@ -88,7 +90,7 @@ namespace BlackSimPlugin
if (m_service->isValid() && m_traffic->isValid() && m_traffic->initialize())
{
// FIXME duplication
connect(m_service, &CXBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::ps_emitAircraftModelChanged);
connect(m_service, &CXBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::ps_emitOwnAircraftModelChanged);
connect(m_service, &CXBusServiceProxy::airportsInRangeUpdated, this, &CSimulatorXPlane::ps_setAirportsInRange);
m_service->updateAirportsInRange();
m_watcher->setConnection(m_conn);
@@ -131,7 +133,7 @@ namespace BlackSimPlugin
delete m_service;
m_service = new CXBusServiceProxy(m_conn, this);
// FIXME duplication
connect(m_service, &CXBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::ps_emitAircraftModelChanged);
connect(m_service, &CXBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::ps_emitOwnAircraftModelChanged);
connect(m_service, &CXBusServiceProxy::airportsInRangeUpdated, this, &CSimulatorXPlane::ps_setAirportsInRange);
m_service->updateAirportsInRange();
}
@@ -155,9 +157,9 @@ namespace BlackSimPlugin
emit connectionStatusChanged(ISimulator::Disconnected);
}
void CSimulatorXPlane::ps_emitAircraftModelChanged(const QString &path, const QString &filename, const QString &livery, const QString &icao)
void CSimulatorXPlane::ps_emitOwnAircraftModelChanged(const QString &path, const QString &filename, const QString &livery, const QString &icao)
{
emit aircraftModelChanged({ path, true });
emit ownAircraftModelChanged({ path, CAircraftModel::TypeOwnSimulatorModel });
Q_UNUSED(filename);
Q_UNUSED(livery);
Q_UNUSED(icao);
@@ -210,10 +212,10 @@ namespace BlackSimPlugin
Q_UNUSED(message);
}
BlackMisc::Network::CAircraftModel CSimulatorXPlane::getAircraftModel() const
BlackMisc::Network::CAircraftModel CSimulatorXPlane::getOwnAircraftModel() const
{
if (! isConnected()) { return {}; }
return { m_xplaneData.aircraftModelPath, true };
return { m_xplaneData.aircraftModelPath, CAircraftModel::TypeOwnSimulatorModel };
}
BlackMisc::Network::CAircraftModelList CSimulatorXPlane::getInstalledModels() const
@@ -286,11 +288,15 @@ namespace BlackSimPlugin
return false;
}
void CSimulatorXPlane::addRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftSituation &situ)
void CSimulatorXPlane::addRemoteAircraft(const Aviation::CAircraft &remoteAircraft, const Network::CClient &remoteClient)
{
Q_UNUSED(remoteClient);
if (! isConnected()) { return; }
m_traffic->addPlane(callsign.asString(), "A320", "YYY", "YYY");
addAircraftSituation(callsign, situ);
// KB: from what I can see here all data are available
// Is there any model matching required ????
CAircraftIcao icao = remoteAircraft.getIcaoInfo();
m_traffic->addPlane(remoteAircraft.getCallsign().asString(), icao.getAircraftDesignator(), icao.getAirlineDesignator(), icao.getLivery());
addAircraftSituation(remoteAircraft.getCallsign(), remoteAircraft.getSituation());
}
void CSimulatorXPlane::addAircraftSituation(const BlackMisc::Aviation::CCallsign &callsign,

20
src/plugins/simulator/xplane/simulator_xplane.h
View File

@@ -44,8 +44,8 @@ namespace BlackSimPlugin
//! \copydoc ISimulator::isSimPaused
virtual bool isPaused() const override { return false; }
//! \copydoc ISimulator::isRunning
virtual bool isRunning() const override { return isConnected(); }
//! \copydoc ISimulator::isSimulating
virtual bool isSimulating() const override { return isConnected(); }
public slots:
//! \copydoc BlackCore::ISimulator::connectTo
@@ -60,13 +60,12 @@ namespace BlackSimPlugin
//! \copydoc BlackCore::ISimulator::getOwnAircraft
virtual BlackMisc::Aviation::CAircraft getOwnAircraft() const override;
//! \copydoc BlackCore::ISimulator::addRemoteAircraft
virtual void addRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign,
const BlackMisc::Aviation::CAircraftSituation &initialSituation) override;
//! \copydoc ISimulator::addRemoteAircraft()
virtual void addRemoteAircraft(const BlackMisc::Aviation::CAircraft &remoteAircraft, const BlackMisc::Network::CClient &remoteClient) override;
//! \copydoc BlackCore::ISimulator::addAircraftSituation
virtual void addAircraftSituation(const BlackMisc::Aviation::CCallsign &callsign,
const BlackMisc::Aviation::CAircraftSituation &situation) override;
const BlackMisc::Aviation::CAircraftSituation &situation) override;
//! \copydoc BlackCore::ISimulator::removeRemoteAircraft
virtual void removeRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
@@ -84,11 +83,14 @@ namespace BlackSimPlugin
virtual void displayTextMessage(const BlackMisc::Network::CTextMessage &message) const override;
//! \copydoc BlackCore::ISimulator::getAircraftModel
virtual BlackMisc::Network::CAircraftModel getAircraftModel() const override;
virtual BlackMisc::Network::CAircraftModel getOwnAircraftModel() const override;
//! \copydoc BlackCore::ISimulator::getInstalledModels
virtual BlackMisc::Network::CAircraftModelList getInstalledModels() const override;
//! \copydoc BlackCore::ISimulator::getCurrentlyMatchedModels
virtual BlackMisc::Network::CAircraftModelList getCurrentlyMatchedModels() const override { return BlackMisc::Network::CAircraftModelList(); }
//! Airports in range
virtual BlackMisc::Aviation::CAirportList getAirportsInRange() const override;
@@ -102,7 +104,7 @@ namespace BlackSimPlugin
void ps_serviceRegistered(const QString &serviceName);
void ps_serviceUnregistered();
void ps_setAirportsInRange(const QStringList &icaoCodes, const QStringList &names, const BlackMisc::CSequence<double> &lats, const BlackMisc::CSequence<double> &lons, const BlackMisc::CSequence<double> &alts);
void ps_emitAircraftModelChanged(const QString &path, const QString &filename, const QString &livery, const QString &icao);
void ps_emitOwnAircraftModelChanged(const QString &path, const QString &filename, const QString &livery, const QString &icao);
void ps_fastTimerTimeout();
void ps_slowTimerTimeout();
@@ -141,7 +143,7 @@ namespace BlackSimPlugin
m_xplaneData = { "", "", 0, 0, 0, 0, 0, 0, 0, 122800, 122800, 122800, 122800, 2000, 0, false };
}
};
//! Factory for creating CSimulatorXPlane instance
class CSimulatorXPlaneFactory : public QObject, public BlackCore::ISimulatorFactory
{