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

Style

Browse Source
This commit is contained in:
Klaus Basan
2019-07-21 03:56:31 +02:00
committed by Mat Sutcliffe
parent eb014639fe
commit 08d7cddfe5
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackcore/simulator.cpp
View File

@@ -77,7 +77,7 @@ namespace BlackCore
return true; return true;
} }
// will be added with next snapshot onRecalculatedRenderedAircraft // will be removed with next snapshot onRecalculatedRenderedAircraft
return false; return false;
} }
@@ -98,7 +98,11 @@ namespace BlackCore
if (!remoteAircraft.isEnabled()) { return false; } if (!remoteAircraft.isEnabled()) { return false; }
// if not restriced, directly change // if not restriced, directly change
if (!renderingRestricted) { this->callPhysicallyAddRemoteAircraft(remoteAircraft); return true; } if (!renderingRestricted)
{
this->callPhysicallyAddRemoteAircraft(remoteAircraft);
return true;
}
// restricted -> will be added with next snapshot onRecalculatedRenderedAircraft // restricted -> will be added with next snapshot onRecalculatedRenderedAircraft
return false; return false;

8
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -369,14 +369,14 @@ namespace BlackSimPlugin
} }
emitOwnAircraftModelChanged(m_serviceProxy->getAircraftModelPath(), m_serviceProxy->getAircraftModelFilename(), m_serviceProxy->getAircraftLivery(), emitOwnAircraftModelChanged(m_serviceProxy->getAircraftModelPath(), m_serviceProxy->getAircraftModelFilename(), m_serviceProxy->getAircraftLivery(),
m_serviceProxy->getAircraftIcaoCode(), m_serviceProxy->getAircraftModelString(), m_serviceProxy->getAircraftName(), m_serviceProxy->getAircraftDescription()); m_serviceProxy->getAircraftIcaoCode(), m_serviceProxy->getAircraftModelString(), m_serviceProxy->getAircraftName(), m_serviceProxy->getAircraftDescription());
QString xplaneVersion = QStringLiteral("%1.%2").arg(m_serviceProxy->getXPlaneVersionMajor()).arg(m_serviceProxy->getXPlaneVersionMinor()); QString xplaneVersion = QStringLiteral("%1.%2").arg(m_serviceProxy->getXPlaneVersionMajor()).arg(m_serviceProxy->getXPlaneVersionMinor());
setSimulatorDetails("X-Plane", {}, xplaneVersion); setSimulatorDetails("X-Plane", {}, xplaneVersion);
connect(m_serviceProxy, &CXSwiftBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::emitOwnAircraftModelChanged); connect(m_serviceProxy, &CXSwiftBusServiceProxy::aircraftModelChanged, this, &CSimulatorXPlane::emitOwnAircraftModelChanged);
connect(m_serviceProxy, &CXSwiftBusServiceProxy::airportsInRangeUpdated, this, &CSimulatorXPlane::setAirportsInRange); connect(m_serviceProxy, &CXSwiftBusServiceProxy::airportsInRangeUpdated, this, &CSimulatorXPlane::setAirportsInRange);
m_serviceProxy->updateAirportsInRange(); m_serviceProxy->updateAirportsInRange();
connect(m_trafficProxy, &CXSwiftBusTrafficProxy::simFrame, this, &CSimulatorXPlane::updateRemoteAircraft); connect(m_trafficProxy, &CXSwiftBusTrafficProxy::simFrame, this, &CSimulatorXPlane::updateRemoteAircraft);
connect(m_trafficProxy, &CXSwiftBusTrafficProxy::remoteAircraftAdded, this, &CSimulatorXPlane::onRemoteAircraftAdded); connect(m_trafficProxy, &CXSwiftBusTrafficProxy::remoteAircraftAdded, this, &CSimulatorXPlane::onRemoteAircraftAdded);
connect(m_trafficProxy, &CXSwiftBusTrafficProxy::remoteAircraftAddingFailed, this, &CSimulatorXPlane::onRemoteAircraftAddingFailed); connect(m_trafficProxy, &CXSwiftBusTrafficProxy::remoteAircraftAddingFailed, this, &CSimulatorXPlane::onRemoteAircraftAddingFailed);
if (m_watcher) { m_watcher->setConnection(m_dBusConnection); } if (m_watcher) { m_watcher->setConnection(m_dBusConnection); }
m_trafficProxy->removeAllPlanes(); m_trafficProxy->removeAllPlanes();