mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-06 18:25:37 +08:00
Ref T268, allow to log loopback situations
* those are situations reported back from simulator * and can be logged
This commit is contained in:
@@ -196,9 +196,32 @@ namespace BlackCore
|
||||
m_lastSentParts.remove(callsign);
|
||||
m_lastSentSituations.remove(callsign);
|
||||
m_clampedLogMsg.remove(callsign);
|
||||
m_loopbackSituations.clear();
|
||||
this->removeInterpolationSetupPerCallsign(callsign);
|
||||
}
|
||||
|
||||
bool ISimulator::addLoopbackSituation(const CAircraftSituation &situation)
|
||||
{
|
||||
const CCallsign cs = situation.getCallsign();
|
||||
if (!this->isLogCallsign(cs)) { return false; }
|
||||
CAircraftSituationList &situations = m_loopbackSituations[cs];
|
||||
situations.push_frontKeepLatestAdjustedFirst(situation, true, 10);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ISimulator::addLoopbackSituation(const CCallsign &callsign, const CElevationPlane &elevationPlane, const CLength &cg)
|
||||
{
|
||||
if (!this->isLogCallsign(callsign)) { return false; }
|
||||
CAircraftSituation situation(callsign, elevationPlane);
|
||||
situation.setGroundElevation(elevationPlane, CAircraftSituation::FromProvider);
|
||||
situation.setCG(cg);
|
||||
situation.setCurrentUtcTime();
|
||||
situation.setTimeOffsetMs(0);
|
||||
CAircraftSituationList &situations = m_loopbackSituations[callsign];
|
||||
situations.push_frontKeepLatestAdjustedFirst(situation, true, 10);
|
||||
return true;
|
||||
}
|
||||
|
||||
void ISimulator::reset()
|
||||
{
|
||||
this->clearAllRemoteAircraftData();
|
||||
@@ -749,6 +772,11 @@ namespace BlackCore
|
||||
return true;
|
||||
}
|
||||
|
||||
CAircraftSituationList ISimulator::getLoopbackSituations(const CCallsign &callsign) const
|
||||
{
|
||||
return m_loopbackSituations.value(callsign);
|
||||
}
|
||||
|
||||
CAirportList ISimulator::getAirportsInRange() const
|
||||
{
|
||||
// default implementation
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "blackmisc/aviation/callsignset.h"
|
||||
#include "blackmisc/network/clientprovider.h"
|
||||
#include "blackmisc/weather/weathergridprovider.h"
|
||||
#include "blackmisc/geo/elevationplane.h"
|
||||
#include "blackmisc/pq/length.h"
|
||||
#include "blackmisc/pq/time.h"
|
||||
#include "blackmisc/statusmessage.h"
|
||||
@@ -267,6 +268,9 @@ namespace BlackCore
|
||||
//! Time between two update requests
|
||||
qint64 getStatisticsAircraftUpdatedRequestedDeltaMs() const { return m_statsUpdateAircraftRequestedDeltaMs; }
|
||||
|
||||
//! The traced loopback situations
|
||||
BlackMisc::Aviation::CAircraftSituationList getLoopbackSituations(const BlackMisc::Aviation::CCallsign &callsign) const;
|
||||
|
||||
//! Access to logger
|
||||
const BlackMisc::Simulation::CInterpolationLogger &interpolationLogger() const { return m_interpolationLogger; }
|
||||
|
||||
@@ -401,6 +405,12 @@ namespace BlackCore
|
||||
//! Clear the related data as statistics etc.
|
||||
virtual void clearData(const BlackMisc::Aviation::CCallsign &callsign);
|
||||
|
||||
//! Add a loopback situation if logging is enabled
|
||||
bool addLoopbackSituation(const BlackMisc::Aviation::CAircraftSituation &situation);
|
||||
|
||||
//! Add a loopback situation if logging is enabled
|
||||
bool addLoopbackSituation(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Geo::CElevationPlane &elevationPlane, const BlackMisc::PhysicalQuantities::CLength &cg);
|
||||
|
||||
//! Full reset of state
|
||||
//! \remark reset as it was unloaded without unloading
|
||||
//! \sa ISimulator::clearAllRemoteAircraftData
|
||||
@@ -495,6 +505,9 @@ namespace BlackCore
|
||||
// some optional functionality which can be used by the simulators as needed
|
||||
BlackMisc::Simulation::CSimulatedAircraftList m_addAgainAircraftWhenRemoved; //!< add this model again when removed, normally used to change model
|
||||
|
||||
// loopback situations, situations which are received from simulator for remote aircraft
|
||||
BlackMisc::Aviation::CAircraftSituationListPerCallsign m_loopbackSituations; //!< traced loopback situations
|
||||
|
||||
// limit the update aircraft to a maximum per second
|
||||
BlackMisc::CTokenBucket m_limitUpdateAircraftBucket { 5, 100, 5 }; //!< means 50 per second
|
||||
bool m_limitUpdateAircraft = false; //!< limit the update frequency by using BlackMisc::CTokenBucket
|
||||
|
||||
Reference in New Issue
Block a user