flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-17 10:55:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T397, further checks

Browse Source
This commit is contained in:
Klaus Basan
2018-10-11 03:23:08 +02:00
parent 9dd06c4c84
commit b476da6640
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/blackmisc/simulation/interpolatorspline.cpp
View File

@@ -108,8 +108,8 @@ namespace BlackMisc
if (!m_currentSituations.isEmpty()) if (!m_currentSituations.isEmpty())
{ {
m_s[0] = m_s[1] = m_s[2] = m_currentSituations.front(); m_s[0] = m_s[1] = m_s[2] = m_currentSituations.front();
m_s[0].addMsecs(-CFsdSetup::c_positionTimeOffsetMsec * 2); m_s[0].addMsecs(-CFsdSetup::c_positionTimeOffsetMsec * 2); // Ref T297 default offset time to fill data
m_s[1].addMsecs(-CFsdSetup::c_positionTimeOffsetMsec); m_s[1].addMsecs(-CFsdSetup::c_positionTimeOffsetMsec); // Ref T297 default offset time to fill data
return true; return true;
} }
m_s[0] = m_s[1] = m_s[2] = CAircraftSituation::null(); m_s[0] = m_s[1] = m_s[2] = CAircraftSituation::null();
@@ -118,8 +118,8 @@ namespace BlackMisc
else else
{ {
m_s[0] = m_s[1] = m_s[2] = m_lastSituation; // current m_s[0] = m_s[1] = m_s[2] = m_lastSituation; // current
m_s[0].addMsecs(-CFsdSetup::c_positionTimeOffsetMsec); // oldest m_s[0].addMsecs(-CFsdSetup::c_positionTimeOffsetMsec); // oldest, Ref T297 default offset time to fill data
m_s[2].addMsecs(CFsdSetup::c_positionTimeOffsetMsec); // latest m_s[2].addMsecs(CFsdSetup::c_positionTimeOffsetMsec); // latest, Ref T297 default offset time to fill data
if (m_currentSituations.isEmpty()) { return true; } if (m_currentSituations.isEmpty()) { return true; }
} }
@@ -298,6 +298,11 @@ namespace BlackMisc
newSituation.setPosition(currentPosition); newSituation.setPosition(currentPosition);
newSituation.setAltitude(alt); newSituation.setAltitude(alt);
newSituation.setMSecsSinceEpoch(this->getInterpolatedTime()); newSituation.setMSecsSinceEpoch(this->getInterpolatedTime());
if (CBuildConfig::isLocalDeveloperDebugBuild())
{
Q_ASSERT_X(CAircraftSituation::isValidVector(normalVector), Q_FUNC_INFO, "invalid vector");
Q_ASSERT_X(newSituation.isValidVectorRange(), Q_FUNC_INFO, "invalid situation");
}
if (interpolateGndFactor) if (interpolateGndFactor)
{ {

4
src/blackmisc/simulation/remoteaircraftprovider.cpp
View File

@@ -260,6 +260,7 @@ namespace BlackMisc
if (CBuildConfig::isLocalDeveloperDebugBuild()) if (CBuildConfig::isLocalDeveloperDebugBuild())
{ {
BLACK_VERIFY_X(situation.getTimeOffsetMs() > 0, Q_FUNC_INFO, "Missing offset"); BLACK_VERIFY_X(situation.getTimeOffsetMs() > 0, Q_FUNC_INFO, "Missing offset");
BLACK_VERIFY_X(situation.isValidVectorRange(), Q_FUNC_INFO, "Invalid vector");
} }
// add altitude offset (for testing only) // add altitude offset (for testing only)
@@ -303,7 +304,8 @@ namespace BlackMisc
// check sort order // check sort order
if (CBuildConfig::isLocalDeveloperDebugBuild()) if (CBuildConfig::isLocalDeveloperDebugBuild())
{ {
BLACK_VERIFY_X(newSituationsList.isSortedAdjustedLatestFirstWithoutNullPositions(), Q_FUNC_INFO, "wrong sort order"); BLACK_VERIFY_X(newSituationsList.isSortedAdjustedLatestFirstWithoutNullPositions(), Q_FUNC_INFO, "wrong adjusted sort order");
BLACK_VERIFY_X(newSituationsList.isSortedLatestFirst(), Q_FUNC_INFO, "wrong sort order");
BLACK_VERIFY_X(newSituationsList.size() <= IRemoteAircraftProvider::MaxSituationsPerCallsign, Q_FUNC_INFO, "Wrong size"); BLACK_VERIFY_X(newSituationsList.size() <= IRemoteAircraftProvider::MaxSituationsPerCallsign, Q_FUNC_INFO, "Wrong size");
} }