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

Ref T717, "testRemoteAircraft" simulator context functions

Browse Source
This commit is contained in:
Klaus Basan
2019-09-10 23:53:29 +02:00
parent 4e0f862ccc
commit 583594731b
6 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -313,6 +313,9 @@ namespace BlackCore
//! Set matching setup
virtual void setMatchingSetup(const BlackMisc::Simulation::CAircraftMatcherSetup &setup) = 0;
//! Test a remote aircraft
virtual bool testRemoteAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, bool add) = 0;
//! Get matching setup
virtual BlackMisc::Simulation::CAircraftMatcherSetup getMatchingSetup() const = 0;

9
src/blackcore/context/contextsimulatorempty.h
View File

@@ -410,6 +410,15 @@ namespace BlackCore
logEmptyContextWarning(Q_FUNC_INFO);
}
//! \copydoc IContextSimulator::testRemoteAircraft
virtual bool testRemoteAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, bool add) override
{
Q_UNUSED(aircraft);
Q_UNUSED(add);
logEmptyContextWarning(Q_FUNC_INFO);
return false;
}
//! \copydoc IContextSimulator::setMatchingSetup
virtual BlackMisc::Simulation::CAircraftMatcherSetup getMatchingSetup() const override
{

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

@@ -1002,6 +1002,23 @@ namespace BlackCore
return msgs;
}
bool CContextSimulator::testRemoteAircraft(const CSimulatedAircraft &aircraft, bool add)
{
if (!m_simulatorPlugin.second || !m_simulatorPlugin.second->isConnected()) { return false; }
bool added = add;
if (add)
{
m_simulatorPlugin.second->setTestMode(true);
added = m_simulatorPlugin.second->logicallyAddRemoteAircraft(aircraft);
}
else
{
m_simulatorPlugin.second->logicallyRemoveRemoteAircraft(aircraft.getCallsign());
m_simulatorPlugin.second->setTestMode(false); // AFTER we have removed it
}
return added;
}
bool CContextSimulator::parseCommandLine(const QString &commandLine, const CIdentifier &originator)
{
Q_UNUSED(originator);

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

@@ -127,6 +127,7 @@ namespace BlackCore
virtual void setMatchingSetup(const BlackMisc::Simulation::CAircraftMatcherSetup &setup) override;
virtual BlackMisc::Simulation::CAircraftMatcherSetup getMatchingSetup() const override;
virtual BlackMisc::CStatusMessageList copyFsxTerrainProbe(const BlackMisc::Simulation::CSimulatorInfo &simulator) override;
virtual bool testRemoteAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, bool add) override;
// also in IAircraftModelSetProvider
virtual BlackMisc::Simulation::CAircraftModelList getModelSet() const override;

5
src/blackcore/context/contextsimulatorproxy.cpp
View File

@@ -370,5 +370,10 @@ namespace BlackCore
return m_dBusInterface->callDBusRet<CStatusMessageList>(QLatin1String("copyFsxTerrainProbe"), simulator);
}
bool CContextSimulatorProxy::testRemoteAircraft(const CSimulatedAircraft &aircraft, bool add)
{
return m_dBusInterface->callDBusRet<bool>(QLatin1String("testRemoteAircraft"), aircraft, add);
}
} // namespace
} // namespace

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

@@ -110,6 +110,7 @@ namespace BlackCore
virtual void setMatchingSetup(const BlackMisc::Simulation::CAircraftMatcherSetup &setup) override;
virtual BlackMisc::Simulation::CAircraftMatcherSetup getMatchingSetup() const override;
virtual BlackMisc::CStatusMessageList copyFsxTerrainProbe(const BlackMisc::Simulation::CSimulatorInfo &simulator) override;
virtual bool testRemoteAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, bool add) override;
//! @}
private: