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

refs #366 cleanup

Browse Source 
* Removed obsolete signal from IContextSimulator
* Removed connectToSimulator() method from IContextSimulator as it is no
longer relevant
* CSimulatorComponent updates automatically when simulator disconnects
* FS9 & FSX drivers update (including FSCommon)
This commit is contained in:
Michał Garapich
2015-03-23 19:56:59 +01:00
committed by Roland Winklmeier
parent 63e48ae332
commit 4d4acb20bc
22 changed files with 68 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/simulator/fs9/simulator_fs9.cpp
View File

@@ -47,7 +47,7 @@ namespace BlackSimPlugin
{
CSimulatorFs9::CSimulatorFs9(IOwnAircraftProvider *ownAircraftProvider,
IRemoteAircraftProvider *remoteAircraftProvider, QObject *parent) :
CSimulatorFsCommon(CSimulatorPluginInfo::FS9(), ownAircraftProvider, remoteAircraftProvider, parent)
CSimulatorFsCommon(ownAircraftProvider, remoteAircraftProvider, parent)
{
connect(lobbyClient.data(), &CLobbyClient::disconnected, this, std::bind(&CSimulatorFs9::simulatorStatusChanged, this, 0));
connect(fs9Host.data(), &CFs9Host::customPacketReceived, this, &CSimulatorFs9::ps_processFs9Message);
@@ -293,7 +293,7 @@ namespace BlackSimPlugin
if (m_lobbyConnected && fs9Host->isConnected())
{
emit simulatorStarted(m_simulatorInfo);
emit simulatorStarted();
m_lobbyConnected = false;
}
});
@@ -339,11 +339,6 @@ namespace BlackSimPlugin
return new CSimulatorFs9(ownAircraftProvider, remoteAircraftProvider, parent);
}
BlackSim::CSimulatorPluginInfo CSimulatorFs9Factory::getSimulatorInfo() const
{
return CSimulatorPluginInfo::FS9();
}
BlackCore::ISimulatorListener *CSimulatorFs9Factory::createListener(QObject *parent)
{
return new CSimulatorFs9Listener(parent);

4
src/plugins/simulator/fs9/simulator_fs9.h
View File

@@ -130,7 +130,6 @@ namespace BlackSimPlugin
QTimer* m_timer = nullptr;
bool m_lobbyConnected = false;
const BlackSim::CSimulatorPluginInfo m_simulatorInfo = BlackSim::CSimulatorPluginInfo::FS9();
};
@@ -152,9 +151,6 @@ namespace BlackSimPlugin
BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider,
QObject *parent) override;
//! Simulator info
virtual BlackSim::CSimulatorPluginInfo getSimulatorInfo() const override;
//! \copydoc BlackCore::ISimulatorFactory::createListener
virtual BlackCore::ISimulatorListener *createListener(QObject *parent = nullptr) override;

5
src/plugins/simulator/fs9/simulator_fs9.json
View File

@@ -1,4 +1,5 @@
{
"short_name" : "FS9",
"full_name" : "Microsoft Flight Simulator 2004"
"name" : "swift_generic_fs9",
"simulator" : "fs9",
"description" : "Microsoft Flight Simulator 2004"
}

4
src/plugins/simulator/fscommon/simulator_fscommon.cpp
View File

@@ -26,8 +26,8 @@ namespace BlackSimPlugin
{
namespace FsCommon
{
CSimulatorFsCommon::CSimulatorFsCommon(const BlackSim::CSimulatorPluginInfo &simInfo, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *renderedAircraftProvider, QObject *parent) :
CSimulatorCommon(simInfo, ownAircraftProvider, renderedAircraftProvider, parent),
CSimulatorFsCommon::CSimulatorFsCommon(BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *renderedAircraftProvider, QObject *parent) :
CSimulatorCommon(ownAircraftProvider, renderedAircraftProvider, parent),
m_fsuipc(new FsCommon::CFsuipc())
{
// hack to init mapper

1
src/plugins/simulator/fscommon/simulator_fscommon.h
View File

@@ -81,7 +81,6 @@ namespace BlackSimPlugin
protected:
//! Constructor
CSimulatorFsCommon(
const BlackSim::CSimulatorPluginInfo &simInfo,
BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider,
BlackMisc::Simulation::IRemoteAircraftProvider *renderedAircraftProvider,
QObject *parent = nullptr);

4
src/plugins/simulator/fsx/simulator_fsx.cpp
View File

@@ -39,7 +39,7 @@ namespace BlackSimPlugin
namespace Fsx
{
CSimulatorFsx::CSimulatorFsx(IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider, QObject *parent) :
CSimulatorFsCommon(CSimulatorPluginInfo::FSX(), ownAircraftProvider, remoteAircraftProvider, parent)
CSimulatorFsCommon(ownAircraftProvider, remoteAircraftProvider, parent)
{
Q_ASSERT(ownAircraftProvider);
Q_ASSERT(remoteAircraftProvider);
@@ -820,7 +820,7 @@ namespace BlackSimPlugin
SimConnect_Close(hSimConnect);
if (result == S_OK)
emit simulatorStarted(m_simulatorInfo);
emit simulatorStarted();
});
}

2
src/plugins/simulator/fsx/simulator_fsx.h
View File

@@ -195,6 +195,7 @@ namespace BlackSimPlugin
uint m_nextObjID = 1; //!< object ID TODO: also used as request id, where to we place other request ids as for facilities
QHash<BlackMisc::Aviation::CCallsign, CSimConnectObject> m_simConnectObjects;
QFutureWatcher<bool> m_watcherConnect;
BlackSim::CSimulatorPluginInfo m_simulatorInfo;
// statistics
qint64 m_statsUpdateAircraftTimeTotal = 0;
@@ -218,7 +219,6 @@ namespace BlackSimPlugin
private:
QTimer* m_timer;
const BlackSim::CSimulatorPluginInfo m_simulatorInfo = BlackSim::CSimulatorPluginInfo::FSX();
};
}

5
src/plugins/simulator/fsx/simulator_fsx.json
View File

@@ -1,4 +1,5 @@
{
"short_name" : "FSX",
"full_name" : "Microsoft Flight Simulator X (2006)"
"name" : "swift_generic_fsx",
"simulator" : "fsx",
"description" : "Microsoft Flight Simulator X (2006)"
}

5
src/plugins/simulator/fsx/simulator_fsxfactory.cpp
View File

@@ -24,11 +24,6 @@ namespace BlackSimPlugin
return new CSimulatorFsx(ownAircraftProvider, renderedAircraftProvider, parent);
}
BlackSim::CSimulatorPluginInfo CSimulatorFsxFactory::getSimulatorInfo() const
{
return BlackSim::CSimulatorPluginInfo::FSX();
}
BlackCore::ISimulatorListener *CSimulatorFsxFactory::createListener(QObject *parent)
{
return new CSimulatorFsxListener(parent);

3
src/plugins/simulator/fsx/simulator_fsxfactory.h
View File

@@ -38,9 +38,6 @@ namespace BlackSimPlugin
BlackMisc::Simulation::IRemoteAircraftProvider *renderedAircraftProvider,
QObject *parent) override;
//! \copydoc BlackCore::ISimulatorFactory::getSimulatorInfo
virtual BlackSim::CSimulatorPluginInfo getSimulatorInfo() const override;
//! \copydoc BlackCore::ISimulatorFactory::getListener
virtual BlackCore::ISimulatorListener *createListener(QObject *parent = nullptr) override;
};

2
src/plugins/simulator/xplane/simulator_xplane.json
View File

@@ -1,5 +1,5 @@
{
"name" : "swift_generic_xplane",
"simulator" : "X-Plane",
"simulator" : "xplane",
"description" : "X-Plane support via the xbus plugin"
}