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

Ref T397, improved handling and check of interpolated situation

Browse Source
This commit is contained in:
Klaus Basan
2018-10-19 03:51:33 +02:00
parent b054aa1d31
commit 5193745d12
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/blackmisc/simulation/interpolator.cpp
View File

@@ -12,6 +12,7 @@
#include "blackmisc/simulation/interpolationlogger.h" #include "blackmisc/simulation/interpolationlogger.h"
#include "blackmisc/simulation/interpolatorlinear.h" #include "blackmisc/simulation/interpolatorlinear.h"
#include "blackmisc/simulation/interpolatorspline.h" #include "blackmisc/simulation/interpolatorspline.h"
#include "blackmisc/network/fsdsetup.h"
#include "blackmisc/aviation/callsign.h" #include "blackmisc/aviation/callsign.h"
#include "blackmisc/aviation/heading.h" #include "blackmisc/aviation/heading.h"
#include "blackmisc/pq/angle.h" #include "blackmisc/pq/angle.h"
@@ -28,6 +29,7 @@ using namespace BlackConfig;
using namespace BlackMisc::Aviation; using namespace BlackMisc::Aviation;
using namespace BlackMisc::Geo; using namespace BlackMisc::Geo;
using namespace BlackMisc::Math; using namespace BlackMisc::Math;
using namespace BlackMisc::Network;
using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::PhysicalQuantities;
namespace BlackMisc namespace BlackMisc
@@ -120,11 +122,6 @@ namespace BlackMisc
if (!oldest.isNull()) { situations.push_back(oldest); } if (!oldest.isNull()) { situations.push_back(oldest); }
const bool sorted = situations.isSortedAdjustedLatestFirstWithoutNullPositions(); const bool sorted = situations.isSortedAdjustedLatestFirstWithoutNullPositions();
if (CBuildConfig::isLocalDeveloperDebugBuild())
{
BLACK_VERIFY_X(sorted, Q_FUNC_INFO, "Wrong adjusted timestamp order");
}
if (setup.isNull() || !setup.isAircraftPartsEnabled()) { return sorted; } if (setup.isNull() || !setup.isAircraftPartsEnabled()) { return sorted; }
bool details = false; bool details = false;
@@ -242,11 +239,24 @@ namespace BlackMisc
else else
{ {
m_invalidSituations++; m_invalidSituations++;
// further handling could go here, mainly we continue with last situation
if (m_invalidSituations < 3 || (m_invalidSituations % 10) == 0) // further handling could go here, mainly we continue with last situation
const bool noSituation = currentSituation.isNull();
const qint64 diff = noSituation ? -1 : m_currentTimeMsSinceEpoch - currentSituation.getAdjustedMSecsSinceEpoch();
const qint64 thresholdMs = noSituation ? qRound(CFsdSetup::c_interimPositionTimeOffsetMsec * 0.5) : qRound(currentSituation.getTimeOffsetMs() * 0.5);
const bool threshold = diff > thresholdMs;
if (noSituation || threshold)
{ {
CLogMessage(this).warning("Invalid situation no %1 for interpolation reported for '%2'") << m_invalidSituations << m_callsign.asString(); // Problem 1, we have no "last situation"
// Problem 2, "it takes too long to recover"
if (noSituation)
{
CLogMessage(this).warning("No situation no %1 for interpolation reported for '%2'") << m_invalidSituations << m_callsign.asString();
}
else
{
CLogMessage(this).warning("Invalid situation, diff %1ms no %2 for interpolation reported for '%3'") << diff << m_invalidSituations << m_callsign.asString();
}
} }
}// valid? }// valid?
@@ -254,7 +264,6 @@ namespace BlackMisc
Q_ASSERT_X(currentSituation.hasMSLGeodeticHeight(), Q_FUNC_INFO, "No MSL altitude"); Q_ASSERT_X(currentSituation.hasMSLGeodeticHeight(), Q_FUNC_INFO, "No MSL altitude");
m_currentInterpolationStatus.setInterpolatedAndCheckSituation(isValid, currentSituation); m_currentInterpolationStatus.setInterpolatedAndCheckSituation(isValid, currentSituation);
m_lastSituation = currentSituation; m_lastSituation = currentSituation;
Q_ASSERT_X(m_currentInterpolationStatus.hasValidInterpolatedSituation(), Q_FUNC_INFO, "Expect valid situation");
// logging // logging
if (this->doLogging()) if (this->doLogging())