flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 11:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T268, airspace monitor also consider closest elevations (from same callsign situations)

Browse Source
This commit is contained in:
Klaus Basan
2018-07-09 22:17:54 +02:00
parent 27f43747ae
commit 1428d39f4b
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/blackcore/airspacemonitor.cpp
View File

@@ -303,12 +303,11 @@ namespace BlackCore
m_bookingsRequested = true;
}
void CAirspaceMonitor::enableWatchdog(bool enable)
bool CAirspaceMonitor::enableWatchdog(bool enable)
{
if (this->analyzer())
{
this->analyzer()->setEnabled(enable);
}
if (!this->analyzer()) { return false; }
this->analyzer()->setEnabled(enable);
return true;
}
void CAirspaceMonitor::testCreateDummyOnlineAtcStations(int number)
@@ -976,10 +975,20 @@ namespace BlackCore
if (!correctedSituation.hasGroundElevation() && !correctedSituation.canLikelySkipNearGroundInterpolation())
{
// fetch from cache or request
const CLength distance(correctedSituation.getDistancePerTime250ms()); // distnacee per ms
const CElevationPlane ep = this->findClosestElevationWithinRangeOrRequest(correctedSituation, distance, callsign);
Q_ASSERT_X(ep.isNull() || !ep.getRadius().isNull(), Q_FUNC_INFO, "null radius");
correctedSituation.setGroundElevation(ep, CAircraftSituation::FromCache);
const CAircraftSituationList situations = this->remoteAircraftSituations(callsign);
CElevationPlane ep = situations.findCLosestElevationWithinRange(correctedSituation, correctedSituation.getDistancePerTime(100, CElevationPlane::singlePointRadius()));
if (!ep.isNull())
{
correctedSituation.setGroundElevation(ep, CAircraftSituation::FromOtherSituations);
}
else
{
const CLength distance(correctedSituation.getDistancePerTime250ms(CElevationPlane::singlePointRadius())); // distnacee per ms
ep = this->findClosestElevationWithinRangeOrRequest(correctedSituation, distance, callsign);
Q_ASSERT_X(ep.isNull() || !ep.getRadius().isNull(), Q_FUNC_INFO, "null radius");
correctedSituation.setGroundElevation(ep, CAircraftSituation::FromCache);
}
if (!correctedSituation.hasGroundElevation())
{
// we have a new situation, so we try to get the elevation

2
src/blackcore/airspacemonitor.h
View File

@@ -119,7 +119,7 @@ namespace BlackCore
CAirspaceAnalyzer *analyzer() const { return m_analyzer; }
//! \copydoc CAirspaceAnalyzer::setEnabled
void enableWatchdog(bool enable);
bool enableWatchdog(bool enable);
//! Gracefully shut down, e.g. for thread safety
void gracefulShutdown();