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 T289, merge CSimulatorCommonn/ISimulator

Browse Source
This commit is contained in:
Klaus Basan
2018-07-11 23:39:27 +02:00
parent 78861166ad
commit d0adcc98cb
11 changed files with 1183 additions and 1359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/simulator/emulated/simulatoremulated.cpp
View File

@@ -89,31 +89,31 @@ namespace BlackSimPlugin
bool CSimulatorEmulated::logicallyAddRemoteAircraft(const CSimulatedAircraft &remoteAircraft)
{
if (canLog()) { m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, remoteAircraft.toQString()); }
return CSimulatorCommon::logicallyAddRemoteAircraft(remoteAircraft);
return ISimulator::logicallyAddRemoteAircraft(remoteAircraft);
}
bool CSimulatorEmulated::logicallyRemoveRemoteAircraft(const CCallsign &callsign)
{
if (canLog()) { m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, callsign.toQString()); }
return CSimulatorCommon::logicallyRemoveRemoteAircraft(callsign);
return ISimulator::logicallyRemoveRemoteAircraft(callsign);
}
int CSimulatorEmulated::physicallyRemoveMultipleRemoteAircraft(const CCallsignSet &callsigns)
{
if (canLog()) m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, callsigns.toQString());
return CSimulatorCommon::physicallyRemoveMultipleRemoteAircraft(callsigns);
return ISimulator::physicallyRemoveMultipleRemoteAircraft(callsigns);
}
bool CSimulatorEmulated::changeRemoteAircraftModel(const CSimulatedAircraft &aircraft)
{
if (canLog()) { m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, aircraft.toQString()); }
return CSimulatorCommon::changeRemoteAircraftEnabled(aircraft);
return ISimulator::changeRemoteAircraftEnabled(aircraft);
}
bool CSimulatorEmulated::changeRemoteAircraftEnabled(const CSimulatedAircraft &aircraft)
{
if (canLog()) { m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, aircraft.toQString()); }
return CSimulatorCommon::changeRemoteAircraftEnabled(aircraft);
return ISimulator::changeRemoteAircraftEnabled(aircraft);
}
bool CSimulatorEmulated::updateOwnSimulatorCockpit(const CSimulatedAircraft &aircraft, const CIdentifier &originator)
@@ -176,7 +176,7 @@ namespace BlackSimPlugin
void CSimulatorEmulated::highlightAircraft(const CSimulatedAircraft &aircraftToHighlight, bool enableHighlight, const CTime &displayTime)
{
if (canLog()) { m_monitorWidget->appendReceivingCall(Q_FUNC_INFO, aircraftToHighlight.toQString(), boolToTrueFalse(enableHighlight), displayTime.toQString()); }
CSimulatorCommon::highlightAircraft(aircraftToHighlight, enableHighlight, displayTime);
ISimulator::highlightAircraft(aircraftToHighlight, enableHighlight, displayTime);
}
bool CSimulatorEmulated::parseCommandLine(const QString &commandLine, const CIdentifier &originator)
@@ -308,7 +308,7 @@ namespace BlackSimPlugin
int CSimulatorEmulated::physicallyRemoveAllRemoteAircraft()
{
if (canLog()) { m_monitorWidget->appendReceivingCall(Q_FUNC_INFO); }
return CSimulatorCommon::physicallyRemoveAllRemoteAircraft();
return ISimulator::physicallyRemoveAllRemoteAircraft();
}
bool CSimulatorEmulated::parseDetails(const CSimpleCommandParser &parser)

4
src/plugins/simulator/emulated/simulatoremulated.h
View File

@@ -69,7 +69,7 @@ namespace BlackSimPlugin
virtual bool isPhysicallyRenderedAircraft(const BlackMisc::Aviation::CCallsign &callsign) const override;
virtual BlackMisc::Aviation::CCallsignSet physicallyRenderedAircraft() const override;
// functions just logged
// ----- functions just logged -------
virtual void highlightAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraftToHighlight, bool enableHighlight, const BlackMisc::PhysicalQuantities::CTime &displayTime) override;
virtual bool logicallyAddRemoteAircraft(const BlackMisc::Simulation::CSimulatedAircraft &remoteAircraft) override;
virtual bool logicallyRemoveRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
@@ -129,7 +129,7 @@ namespace BlackSimPlugin
// just logged
virtual int physicallyRemoveAllRemoteAircraft() override;
//! \copydoc BlackCore::CSimulatorCommon::parseDetails
//! \copydoc BlackCore::ISimulator::parseDetails
virtual bool parseDetails(const BlackMisc::CSimpleCommandParser &parser) override;
private: