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

Ref T243, use offset times from network vatlib

Browse Source 
* changed network config received signature (now with offset time)
* removed code to fix offset time, no longer needed
* using push_frontKeepLatestAdjustedFirst guaranteeing correct order
This commit is contained in:
Klaus Basan
2018-02-02 21:04:56 +01:00
parent 6e933b089c
commit 7e0c1033ba
3 changed files with 18 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/blackcore/airspacemonitor.cpp
View File

@@ -519,9 +519,11 @@ namespace BlackCore
emit this->changedAtcStationsOnline();
}
void CAirspaceMonitor::testAddAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const CAircraftParts &parts, bool incremental)
void CAirspaceMonitor::testAddAircraftParts(const CCallsign &callsign, const CAircraftParts &parts, bool incremental)
{
this->onAircraftConfigReceived(callsign, parts.toJson(), !incremental);
this->onAircraftConfigReceived(callsign,
incremental ? parts.toIncrementalJson() : parts.toJson(),
5000);
}
void CAirspaceMonitor::clear()
@@ -1097,11 +1099,6 @@ namespace BlackCore
// store situation history
CAircraftSituation fullSituation(situation);
this->storeAircraftSituation(fullSituation);
{
//! \fixme Workaround to consolidate time offset from storeAircraftSituation
QReadLocker lock(&m_lockSituations);
fullSituation.setTimeOffsetMs(m_situationsByCallsign[callsign].front().getTimeOffsetMs());
}
emit this->addedAircraftSituation(fullSituation);
const bool existsInRange = this->isAircraftInRange(callsign);
@@ -1160,11 +1157,6 @@ namespace BlackCore
// store situation history
this->storeAircraftSituation(interimSituation);
{
//! \fixme Workaround to consolidate time offset from storeAircraftSituation
QReadLocker lock(&m_lockSituations);
interimSituation.setTimeOffsetMs(m_situationsByCallsign[callsign].front().getTimeOffsetMs());
}
emit this->addedAircraftSituation(interimSituation);
// if we have not aircraft in range yer, we stop here
@@ -1226,14 +1218,15 @@ namespace BlackCore
this->updateAircraftInRange(callsign, vm);
}
void CAirspaceMonitor::onAircraftConfigReceived(const BlackMisc::Aviation::CCallsign &callsign, const QJsonObject &jsonObject, bool isFull)
void CAirspaceMonitor::onAircraftConfigReceived(const CCallsign &callsign, const QJsonObject &jsonObject, int currentOffset)
{
Q_ASSERT(CThreadUtils::isCurrentThreadObjectThread(this));
const CSimulatedAircraft simAircraft(getAircraftInRangeForCallsign(callsign));
const CSimulatedAircraft remoteAircraft(getAircraftInRangeForCallsign(callsign));
const bool isFull = jsonObject.value("is_full_data").toBool();
// If we are not yet synchronized, we throw away any incremental packet
if (!simAircraft.hasValidCallsign()) { return; }
if (!simAircraft.isPartsSynchronized() && !isFull) { return; }
if (!remoteAircraft.hasValidCallsign()) { return; }
if (!remoteAircraft.isPartsSynchronized() && !isFull) { return; }
CAircraftParts parts;
try
@@ -1259,14 +1252,10 @@ namespace BlackCore
// make sure in any case right time
parts.setCurrentUtcTime();
parts.setTimeOffsetMs(currentOffset);
// store part history (parts always absolute)
this->storeAircraftParts(callsign, parts);
{
//! \fixme Workaround to consolidate time offset from storeAircraftParts
QReadLocker lock(&m_lockParts);
parts.setTimeOffsetMs(m_partsByCallsign[callsign].front().getTimeOffsetMs());
}
emit this->addedAircraftParts(callsign, parts);
if (m_enableAircraftPartsHistory)
@@ -1303,12 +1292,6 @@ namespace BlackCore
// check sort order
Q_ASSERT_X(situationList.size() < 2 || situationList[0].getMSecsSinceEpoch() >= situationList[1].getMSecsSinceEpoch(), Q_FUNC_INFO, "wrong sort order");
// a full position update received after an interim position update should use the time offset of the interim position
if (situationList.size() >= 2 && (situationList[0].isInterim() || situationList[1].isInterim()))
{
situationList[0].setTimeOffsetMs(std::min(situationList[0].getTimeOffsetMs(), situationList[1].getTimeOffsetMs()));
}
}
void CAirspaceMonitor::storeAircraftParts(const CCallsign &callsign, const CAircraftParts &parts)
@@ -1316,19 +1299,10 @@ namespace BlackCore
BLACK_VERIFY_X(!callsign.isEmpty(), Q_FUNC_INFO, "empty callsign");
if (callsign.isEmpty()) { return; }
// get time offset from situation
qint64 timeOffsetMs = CNetworkVatlib::c_positionTimeOffsetMsec;
{
QReadLocker lock(&m_lockSituations);
const CAircraftSituationList &situationList = m_situationsByCallsign[callsign];
if (!situationList.isEmpty()) { timeOffsetMs = situationList[0].getTimeOffsetMs(); }
}
// list sorted from new to old
QWriteLocker lock(&m_lockParts);
CAircraftPartsList &partsList = m_partsByCallsign[callsign];
partsList.push_front(parts);
partsList.front().setTimeOffsetMs(timeOffsetMs);
partsList.push_frontKeepLatestAdjustedFirst(parts, IRemoteAircraftProvider::MaxPartsPerCallsign);
// remove outdated parts (but never remove the most recent one)
IRemoteAircraftProvider::removeOutdatedParts(partsList);

2
src/blackcore/airspacemonitor.h
View File

@@ -388,7 +388,7 @@ namespace BlackCore
void onReceivedAtcBookings(const BlackMisc::Aviation::CAtcStationList &bookedStations);
void onReadUnchangedAtcBookings();
void onReceivedDataFile();
void onAircraftConfigReceived(const BlackMisc::Aviation::CCallsign &callsign, const QJsonObject &jsonObject, bool isFull);
void onAircraftConfigReceived(const BlackMisc::Aviation::CCallsign &callsign, const QJsonObject &jsonObject, int currentOffset);
void onAircraftInterimUpdateReceived(const BlackMisc::Aviation::CAircraftSituation &situation);
void onConnectionStatusChanged(BlackCore::INetwork::ConnectionStatus oldStatus, BlackCore::INetwork::ConnectionStatus newStatus);
};

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

@@ -327,7 +327,12 @@ namespace BlackMisc
m_aircraftParts.back().addMsecs(-10000); // number here does
m_aircraftParts.front().addMsecs(-5000); // not really matter
}
m_aircraftParts.push_front(parts);
// we add new situations at front and keep the latest values (real time) first
m_aircraftParts.push_frontKeepLatestFirst(parts, IRemoteAircraftProvider::MaxPartsPerCallsign);
if (!hasOffset) { m_aircraftParts.front().setTimeOffsetMs(offset); }
// force remote provider to cleanup
IRemoteAircraftProvider::removeOutdatedParts(m_aircraftParts);
qint64 offset = 6000; //! \fixme copied from CNetworkVatlib::c_positionTimeOffsetMsec