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

Ref T268, XPlane to do not request updates of values "not near ground"

Browse Source
This commit is contained in:
Klaus Basan
2018-07-04 21:18:46 +02:00
parent 898b7354f4
commit 1ba99b5392
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -766,15 +766,25 @@ namespace BlackSimPlugin
void CSimulatorXPlane::requestRemoteAircraftDataFromXPlane() void CSimulatorXPlane::requestRemoteAircraftDataFromXPlane()
{ {
//! \todo KB 2018-07 It is not required to request all elevations and CGs, but only for aircraft "near ground relevant"
// - we could use the elevation cache and CG cache to decide if we need to request
// - if an aircraft is on ground but not moving, we do not need to request elevation if we already have it (it will not change
if (!isConnected()) { return; } if (!isConnected()) { return; }
m_trafficProxy->getRemoteAircraftsData(m_xplaneAircraftObjects.getAllCallsignStrings(), [ = ](const QStringList & callsigns, const QDoubleList & latitudesDeg, const QDoubleList & longitudesDeg, const QDoubleList & elevationsM, const QDoubleList & verticalOffsets) CCallsignSet callsigns = m_xplaneAircraftObjects.getAllCallsigns();
const CCallsignSet remove = this->getLastSentCanLikelySkipNearGroundInterpolation().getCallsigns();
callsigns.remove(remove);
if (callsigns.isEmpty()) { return; }
const QStringList csStrings = callsigns.getCallsignStrings();
m_trafficProxy->getRemoteAircraftsData(csStrings, [ = ](const QStringList & callsigns, const QDoubleList & latitudesDeg, const QDoubleList & longitudesDeg, const QDoubleList & elevationsM, const QDoubleList & verticalOffsets)
{ {
updateRemoteAircraftsFromSimulator(callsigns, latitudesDeg, longitudesDeg, elevationsM, verticalOffsets); updateRemoteAircraftFromSimulator(callsigns, latitudesDeg, longitudesDeg, elevationsM, verticalOffsets);
}); });
} }
void CSimulatorXPlane::updateRemoteAircraftsFromSimulator(const QStringList &callsigns, const QDoubleList &latitudesDeg, const QDoubleList &longitudesDeg, void CSimulatorXPlane::updateRemoteAircraftFromSimulator(
const QDoubleList &elevationsM, const QDoubleList &verticalOffsets) const QStringList &callsigns, const QDoubleList &latitudesDeg, const QDoubleList &longitudesDeg,
const QDoubleList &elevationsM, const QDoubleList &verticalOffsets)
{ {
for (int i = 0; i < callsigns.size(); i++) for (int i = 0; i < callsigns.size(); i++)
{ {
@@ -783,8 +793,6 @@ namespace BlackSimPlugin
// we skip if we are not near ground // we skip if we are not near ground
const CXPlaneMPAircraft xpAircraft = m_xplaneAircraftObjects[cs]; const CXPlaneMPAircraft xpAircraft = m_xplaneAircraftObjects[cs];
if (xpAircraft.getSituationAsSent().canLikelySkipNearGroundInterpolation()) { continue; }
const CAltitude elevationAlt(elevationsM[i], CLengthUnit::m(), CLengthUnit::ft()); const CAltitude elevationAlt(elevationsM[i], CLengthUnit::m(), CLengthUnit::ft());
const CElevationPlane elevation(CLatitude(latitudesDeg[i], CAngleUnit::deg()), CLongitude(longitudesDeg[i], CAngleUnit::deg()), elevationAlt, CElevationPlane::singlePointRadius()); const CElevationPlane elevation(CLatitude(latitudesDeg[i], CAngleUnit::deg()), CLongitude(longitudesDeg[i], CAngleUnit::deg()), elevationAlt, CElevationPlane::singlePointRadius());
const CLength cg(verticalOffsets[i], CLengthUnit::m(), CLengthUnit::ft()); const CLength cg(verticalOffsets[i], CLengthUnit::m(), CLengthUnit::ft());
@@ -936,8 +944,8 @@ namespace BlackSimPlugin
// user changed settings, restart the listener // user changed settings, restart the listener
if (m_watcher) if (m_watcher)
{ {
stop(); this->stop();
start(); this->start();
} }
} }
} // namespace } // namespace

4
src/plugins/simulator/xplane/simulatorxplane.h
View File

@@ -179,8 +179,8 @@ namespace BlackSimPlugin
void updateRemoteAircraft(); void updateRemoteAircraft();
void requestRemoteAircraftDataFromXPlane(); void requestRemoteAircraftDataFromXPlane();
void updateRemoteAircraftsFromSimulator(const QStringList &callsigns, const QDoubleList &latitudesDeg, const QDoubleList &longitudesDeg, void updateRemoteAircraftFromSimulator(const QStringList &callsigns, const QDoubleList &latitudesDeg, const QDoubleList &longitudesDeg,
const QDoubleList &elevationsM, const QDoubleList &verticalOffsets); const QDoubleList &elevationsM, const QDoubleList &verticalOffsets);
void updateAirportsInRange(); void updateAirportsInRange();
void remoteAircraftAdded(const QString &callsign); void remoteAircraftAdded(const QString &callsign);
void remoteAircraftAddingFailed(const QString &callsign); void remoteAircraftAddingFailed(const QString &callsign);