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

Ref T111, use Q_DECLARE_FLAGS SimulatorStatus instead of int

Browse Source 
* changed emitSimulatorCombinedStatu
* changed connected slots/functions
This commit is contained in:
Klaus Basan
2017-07-26 15:10:09 +02:00
committed by Mathew Sutcliffe
parent e55480737e
commit 654c35f666
8 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blackcore/context/contextsimulator.h
View File

@@ -85,6 +85,7 @@ namespace BlackCore
signals:
//! Simulator combined status
//! \sa ISimulator::SimulatorStatus
//! \remark still int for DBus
void simulatorStatusChanged(int status);
//! Simulator plugin loaded / unloaded (default info)

17
src/blackcore/context/contextsimulatorimpl.cpp
View File

@@ -422,26 +422,25 @@ namespace BlackCore
m_simulatorPlugin.second->logicallyRemoveRemoteAircraft(callsign);
}
void CContextSimulator::ps_onSimulatorStatusChanged(int status)
void CContextSimulator::ps_onSimulatorStatusChanged(ISimulator::SimulatorStatus status)
{
ISimulator::SimulatorStatus statusEnum = ISimulator::statusToEnum(status);
if (m_initallyAddAircrafts && statusEnum.testFlag(ISimulator::Simulating))
if (m_initallyAddAircrafts && status.testFlag(ISimulator::Simulating))
{
// use network to initally add aircraft
IContextNetwork *networkContext = this->getIContextNetwork();
Q_ASSERT(networkContext);
Q_ASSERT(networkContext->isLocalObject());
Q_ASSERT_X(networkContext, Q_FUNC_INFO, "Need context");
Q_ASSERT_X(networkContext->isLocalObject(), Q_FUNC_INFO, "Need local object");
// initially add aircraft
const CSimulatedAircraftList aircrafts = networkContext->getAircraftInRange();
for (const CSimulatedAircraft &simulatedAircraft : aircrafts)
const CSimulatedAircraftList aircraft = networkContext->getAircraftInRange();
for (const CSimulatedAircraft &simulatedAircraft : aircraft)
{
Q_ASSERT(!simulatedAircraft.getCallsign().isEmpty());
BLACK_VERIFY_X(!simulatedAircraft.getCallsign().isEmpty(), Q_FUNC_INFO, "Need callsign");
ps_addedRemoteAircraft(simulatedAircraft);
}
m_initallyAddAircrafts = false;
}
if (!statusEnum.testFlag(ISimulator::Connected))
if (!status.testFlag(ISimulator::Connected))
{
// we got disconnected, plugin no longer needed
unloadSimulatorPlugin();

2
src/blackcore/context/contextsimulatorimpl.h
View File

@@ -151,7 +151,7 @@ namespace BlackCore
// ------------ slots connected with network or other contexts ---------
//! Handle new connection status of simulator
void ps_onSimulatorStatusChanged(int status);
void ps_onSimulatorStatusChanged(BlackCore::ISimulator::SimulatorStatus status);
//! Model set from model set loader changed
void ps_modelSetChanged(const BlackMisc::Simulation::CSimulatorInfo &simulator);