mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-12 23:35:33 +08:00
refs #551, formatting and minor changes found during searching for the issue
This commit is contained in:
@@ -189,7 +189,8 @@ namespace BlackCore
|
||||
maxRenderedBoundary = this->m_simulatorMaxRenderedBoundary;
|
||||
}
|
||||
|
||||
//! \fixme Analyzer: generate only when restricted?
|
||||
// remark for simulation snapshot is used when there are restrictions
|
||||
// nevertheless we calculate all the time as the snapshot could be used in other scenarios
|
||||
|
||||
CSimulatedAircraftList aircraftInRange(getAircraftInRange()); // thread safe copy from provider
|
||||
CAirspaceAircraftSnapshot snapshot(
|
||||
|
||||
@@ -33,7 +33,7 @@ namespace BlackCore
|
||||
|
||||
// data, split situations by time
|
||||
if (currentTimeMsSinceEpoc < 0) { currentTimeMsSinceEpoc = QDateTime::currentMSecsSinceEpoch(); }
|
||||
qint64 splitTimeMsSinceEpoch = currentTimeMsSinceEpoc - TimeOffsetMs;
|
||||
qint64 splitTimeMsSinceEpoch = currentTimeMsSinceEpoc - TimeOffsetMs; // \todo needs to be variable in the future with interim positions
|
||||
|
||||
QList<CAircraftSituationList> splitSituations(remoteAircraftSituations(callsign).splitByTime(splitTimeMsSinceEpoch, true));
|
||||
CAircraftSituationList &situationsNewer = splitSituations[0]; // newer part
|
||||
@@ -87,7 +87,8 @@ namespace BlackCore
|
||||
// < 0 should not happen due to the split, > 1 can happen if new values are delayed beyond split time
|
||||
// 1) values > 1 mean extrapolation
|
||||
// 2) values > 2 mean no new situations coming in
|
||||
double simulationTimeFraction = 1 - ((newSituation.getMSecsSinceEpoch() - splitTimeMsSinceEpoch) / deltaTime);
|
||||
double distanceToSplitTime = newSituation.getMSecsSinceEpoch() - splitTimeMsSinceEpoch;
|
||||
double simulationTimeFraction = 1 - (distanceToSplitTime / deltaTime);
|
||||
if (simulationTimeFraction > 2.0)
|
||||
{
|
||||
if (this->m_withDebugMsg)
|
||||
|
||||
@@ -35,7 +35,7 @@ namespace BlackCore
|
||||
{
|
||||
this->setObjectName("Simulator: " + info.getIdentifier());
|
||||
|
||||
// provider signals
|
||||
// provider signals, hook up with remote aircraft provider
|
||||
m_remoteAircraftProviderConnections.append(
|
||||
this->m_remoteAircraftProvider->connectRemoteAircraftProviderSignals(
|
||||
this, // receiver must match object in bind
|
||||
@@ -339,7 +339,7 @@ namespace BlackCore
|
||||
changed = r > 0;
|
||||
}
|
||||
|
||||
// we handled snapshot
|
||||
// we have handled snapshot
|
||||
if (changed)
|
||||
{
|
||||
emit airspaceSnapshotHandled();
|
||||
|
||||
@@ -100,7 +100,7 @@ namespace BlackCore
|
||||
//! Slow timer used to highlight aircraft, can be used for other things too
|
||||
virtual void ps_oneSecondTimer();
|
||||
|
||||
//! Recalculate the rendered aircraft
|
||||
//! Recalculate the rendered aircraft, this happens when restrictions are applied (max. aircraft, range)
|
||||
virtual void ps_recalculateRenderedAircraft(const BlackMisc::Simulation::CAirspaceAircraftSnapshot &snapshot);
|
||||
|
||||
//! Provider added situation
|
||||
|
||||
Reference in New Issue
Block a user