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

Ref T229, adjusted CInterpolationStatus

Browse Source 
* The `changed`flag in interpolation was faulty.
* It was able to determine if the value was really changed by interpolation, which was the same as indicating that the value was interpolated.
* But there were cases, when the value was interpolated and not changed.
* Also there were cases when the value was changed, but not interpolated.
This commit is contained in:
Klaus Basan
2018-01-19 03:03:23 +01:00
parent 67426b755f
commit 75c2eec3d1
2 changed files with 21 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -373,39 +373,32 @@ namespace BlackMisc
situation.setOnGround(CAircraftSituation::OnGround, CAircraftSituation::OnGroundByGuessing);
}
void CInterpolationStatus::setInterpolationSucceeded(bool succeeded, const CAircraftSituation &situation)
void CInterpolationStatus::setInterpolatedAndCheckSituation(bool succeeded, const CAircraftSituation &situation)
{
m_interpolationSucceeded = succeeded;
this->setValidSituation(situation);
m_isInterpolated = succeeded;
this->checkIfValidSituation(situation);
}
void CInterpolationStatus::setValidSituation(const CAircraftSituation &situation)
void CInterpolationStatus::checkIfValidSituation(const CAircraftSituation &situation)
{
m_validSituation = !situation.isGeodeticHeightNull() && !situation.isPositionNull();
m_isValidSituation = !situation.isGeodeticHeightNull() && !situation.isPositionNull();
}
bool CInterpolationStatus::validAndChangedInterpolatedSituation() const
bool CInterpolationStatus::hasValidInterpolatedSituation() const
{
return m_interpolationSucceeded && m_changedPosition && m_validSituation;
}
bool CInterpolationStatus::validInterpolatedSituation() const
{
return m_interpolationSucceeded && m_validSituation;
return m_isInterpolated && m_isValidSituation;
}
void CInterpolationStatus::reset()
{
m_validSituation = false;
m_changedPosition = false;
m_interpolationSucceeded = false;
m_isValidSituation = false;
m_isInterpolated = false;
}
QString CInterpolationStatus::toQString() const
{
return "Interpolation: " % boolToYesNo(m_interpolationSucceeded) %
" situation valid: " % boolToYesNo(m_interpolationSucceeded) %
" changed pos.: " % boolToYesNo(m_changedPosition);
return QStringLiteral("Interpolated: ") % boolToYesNo(m_isInterpolated) %
QStringLiteral(" | situation valid: ") % boolToYesNo(m_isValidSituation);
}
bool CPartsStatus::allTrue() const