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

FlightGear, applied agreed style

Browse Source
This commit is contained in:
Klaus Basan
2019-05-22 23:57:34 +02:00
committed by Mat Sutcliffe
parent 4eb10a4de8
commit f1ff410e64
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/simulator/flightgear/simulatorflightgear.cpp
View File

@@ -545,19 +545,20 @@ namespace BlackSimPlugin
CSimulatedAircraft aircraft = m_pendingToBeAddedAircraft.findFirstByCallsign(callsign); CSimulatedAircraft aircraft = m_pendingToBeAddedAircraft.findFirstByCallsign(callsign);
aircraft.setRendered(false); aircraft.setRendered(false);
emit this->aircraftRenderingChanged(aircraft); emit this->aircraftRenderingChanged(aircraft);
}} }
}
if (m_addingInProgressAircraft.contains(callsign)) if (m_addingInProgressAircraft.contains(callsign))
{
// we are just about to add that aircraft
QPointer<CSimulatorFlightgear> myself(this);
QTimer::singleShot(TimeoutAdding, this, [ = ]
{ {
// we are just about to add that aircraft if (!myself) { return; }
QPointer<CSimulatorFlightgear> myself(this); m_addingInProgressAircraft.remove(callsign); // remove as "in progress"
QTimer::singleShot(TimeoutAdding, this, [ = ] this->physicallyRemoveRemoteAircraft(callsign); // and remove from sim. if it was added in the mean time
{ });
if (!myself) { return; } return false;
m_addingInProgressAircraft.remove(callsign); // remove as "in progress"
this->physicallyRemoveRemoteAircraft(callsign); // and remove from sim. if it was added in the mean time
});
return false;
} }
m_trafficProxy->removePlane(callsign.asString()); m_trafficProxy->removePlane(callsign.asString());
@@ -603,14 +604,14 @@ namespace BlackSimPlugin
{ {
const CCallsign callsign(flightgearAircraft.getCallsign()); const CCallsign callsign(flightgearAircraft.getCallsign());
const bool hasCallsign = !callsign.isEmpty(); const bool hasCallsign = !callsign.isEmpty();
if(!hasCallsign) if (!hasCallsign)
{ {
BLACK_VERIFY_X(false, Q_FUNC_INFO, "missing callsign"); BLACK_VERIFY_X(false, Q_FUNC_INFO, "missing callsign");
continue; continue;
} }
// skip no longer in range // skip no longer in range
if(!callsingsInRange.contains(callsign)) { continue; } if (!callsingsInRange.contains(callsign)) { continue; }
planesTransponders.callsigns.push_back(callsign.asString()); planesTransponders.callsigns.push_back(callsign.asString());
planesTransponders.codes.push_back(flightgearAircraft.getAircraft().getTransponderCode()); planesTransponders.codes.push_back(flightgearAircraft.getAircraft().getTransponderCode());
@@ -803,7 +804,7 @@ namespace BlackSimPlugin
{ {
BLACK_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "Need callsign"); BLACK_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "Need callsign");
if(callsign.isEmpty()) { return; } if (callsign.isEmpty()) { return; }
const CCallsign cs(callsign); const CCallsign cs(callsign);
CSimulatedAircraft failedRemoteAircraft = this->getAircraftInRangeForCallsign(cs); CSimulatedAircraft failedRemoteAircraft = this->getAircraftInRangeForCallsign(cs);
@@ -1000,7 +1001,8 @@ namespace BlackSimPlugin
QString flightgearVersion = service.getVersionNumber(); QString flightgearVersion = service.getVersionNumber();
QString flightgearVersionMinimum = "2019.2.0"; QString flightgearVersionMinimum = "2019.2.0";
if(flightgearVersion < flightgearVersionMinimum){ if (flightgearVersion < flightgearVersionMinimum)
{
CLogMessage(this).error(u"You are using Flightgear %1. This version of swift is only compatible with Flightgear %2 or newer. Consider upgrading!") << flightgearVersion << flightgearVersionMinimum; CLogMessage(this).error(u"You are using Flightgear %1. This version of swift is only compatible with Flightgear %2 or newer. Consider upgrading!") << flightgearVersion << flightgearVersionMinimum;
return; return;
} }