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

Ref T554, collect auto-publish data in simulator

Browse Source
This commit is contained in:
Klaus Basan
2019-02-24 03:16:42 +01:00
committed by Mat Sutcliffe
parent 3023b0152f
commit 961afa531b
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/blackcore/simulator.cpp
View File

@@ -793,7 +793,14 @@ namespace BlackCore
this->setMaxElevationsRemembered(aircraftCount * 3); // at least 3 elevations per aircraft, even better as not all are requesting elevations this->setMaxElevationsRemembered(aircraftCount * 3); // at least 3 elevations per aircraft, even better as not all are requesting elevations
this->rememberGroundElevation(callsign, elevation); this->rememberGroundElevation(callsign, elevation);
} }
if (!cg.isNull() && !this->hasSameCG(cg, callsign)) { this->insertCG(cg, modelString, callsign); } if (!cg.isNull() && !this->hasSameCG(cg, callsign))
{
this->insertCG(cg, modelString, callsign);
// here we know we have a valid model and CG
m_autoPublishing.insert(modelString, cg);
m_autoPublishing.insert(modelString, this->getSimulatorInfo());
}
} }
void ISimulator::emitSimulatorCombinedStatus(SimulatorStatus oldStatus) void ISimulator::emitSimulatorCombinedStatus(SimulatorStatus oldStatus)
@@ -927,6 +934,8 @@ namespace BlackCore
void ISimulator::unload() void ISimulator::unload()
{ {
this->disconnectFrom(); // disconnect from simulator this->disconnectFrom(); // disconnect from simulator
m_autoPublishing.writeJsonToFile();
m_autoPublishing.clear();
m_remoteAircraftProviderConnections.disconnectAll(); // disconnect signals from provider m_remoteAircraftProviderConnections.disconnectAll(); // disconnect signals from provider
} }

7
src/blackcore/simulator.h
View File

@@ -24,6 +24,7 @@
#include "blackmisc/simulation/remoteaircraftprovider.h" #include "blackmisc/simulation/remoteaircraftprovider.h"
#include "blackmisc/simulation/simulationenvironmentprovider.h" #include "blackmisc/simulation/simulationenvironmentprovider.h"
#include "blackmisc/simulation/interpolationsetupprovider.h" #include "blackmisc/simulation/interpolationsetupprovider.h"
#include "blackmisc/simulation/autopublishdata.h"
#include "blackmisc/aviation/airportlist.h" #include "blackmisc/aviation/airportlist.h"
#include "blackmisc/aviation/callsignset.h" #include "blackmisc/aviation/callsignset.h"
#include "blackmisc/network/clientprovider.h" #include "blackmisc/network/clientprovider.h"
@@ -282,6 +283,9 @@ namespace BlackCore
//! Interpolation messages for callsign //! Interpolation messages for callsign
virtual BlackMisc::CStatusMessageList getInterpolationMessages(const BlackMisc::Aviation::CCallsign &callsign) const = 0; virtual BlackMisc::CStatusMessageList getInterpolationMessages(const BlackMisc::Aviation::CCallsign &callsign) const = 0;
//! Get the data for auto publishing
const BlackMisc::Simulation::CAutoPublishData &getPublishData() const { return m_autoPublishing; }
//! Counter added aircraft //! Counter added aircraft
int getStatisticsPhysicallyAddedAircraft() const { return m_statsPhysicallyAddedAircraft; } int getStatisticsPhysicallyAddedAircraft() const { return m_statsPhysicallyAddedAircraft; }
@@ -423,7 +427,7 @@ namespace BlackCore
//! \sa ISimulator::clearAllRemoteAircraftData //! \sa ISimulator::clearAllRemoteAircraftData
virtual int physicallyRemoveAllRemoteAircraft(); virtual int physicallyRemoveAllRemoteAircraft();
//! Set elevation and CG in the providers //! Set elevation and CG in the providers and for auto publishing
void rememberElevationAndCG(const BlackMisc::Aviation::CCallsign &callsign, const QString &modelString, const BlackMisc::Geo::CElevationPlane &elevation, const BlackMisc::PhysicalQuantities::CLength &cg); void rememberElevationAndCG(const BlackMisc::Aviation::CCallsign &callsign, const QString &modelString, const BlackMisc::Geo::CElevationPlane &elevation, const BlackMisc::PhysicalQuantities::CLength &cg);
//! Emit the combined status //! Emit the combined status
@@ -546,6 +550,7 @@ namespace BlackCore
BlackMisc::Simulation::CSimulatorInternals m_simulatorInternals; //!< setup object BlackMisc::Simulation::CSimulatorInternals m_simulatorInternals; //!< setup object
BlackMisc::Simulation::CInterpolationLogger m_interpolationLogger; //!< log.interpolation BlackMisc::Simulation::CInterpolationLogger m_interpolationLogger; //!< log.interpolation
BlackMisc::Simulation::CAutoPublishData m_autoPublishing; //!< for the DB
BlackMisc::Aviation::CAircraftSituationPerCallsign m_lastSentSituations; //!< last situations sent to simulator BlackMisc::Aviation::CAircraftSituationPerCallsign m_lastSentSituations; //!< last situations sent to simulator
BlackMisc::Aviation::CAircraftPartsPerCallsign m_lastSentParts; //!< last parts sent to simulator BlackMisc::Aviation::CAircraftPartsPerCallsign m_lastSentParts; //!< last parts sent to simulator