From b87a3dffaa407ba072248e001fe5a6b762ef1c74 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 23 Oct 2016 18:35:27 +0200 Subject: [PATCH] refs #780, during tests adjusted * doxygen for fsx driver * moved stats members in base class (so all drivers can update those --- src/blackcore/simulatorcommon.h | 4 ++++ src/plugins/simulator/fsx/simulatorfsx.h | 27 +++--------------------- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/src/blackcore/simulatorcommon.h b/src/blackcore/simulatorcommon.h index 772a10364..1628a7cb3 100644 --- a/src/blackcore/simulatorcommon.h +++ b/src/blackcore/simulatorcommon.h @@ -130,6 +130,10 @@ namespace BlackCore bool m_pausedSimFreezesInterpolation = false; //!< paused simulator will also pause interpolation (so AI aircraft will hold) BlackMisc::Simulation::CSimulatorSetup m_simulatorSetup; //!< setup object BlackMisc::Simulation::CAircraftModel m_defaultModel; //!< default model + qint64 m_statsUpdateAircraftTimeTotalMs = 0; //!< statistics update time + qint64 m_statsUpdateAircraftTimeAvgMs = 0; //!< statistics update time + int m_statsUpdateAircraftCountMs = 0; //!< statistics update time + private: bool m_debugMessages = false; //!< Display debug messages diff --git a/src/plugins/simulator/fsx/simulatorfsx.h b/src/plugins/simulator/fsx/simulatorfsx.h index e91eb1ee3..6d5015685 100644 --- a/src/plugins/simulator/fsx/simulatorfsx.h +++ b/src/plugins/simulator/fsx/simulatorfsx.h @@ -88,35 +88,19 @@ namespace BlackSimPlugin //! SimConnect Callback static void CALLBACK SimConnectProc(SIMCONNECT_RECV *pData, DWORD cbData, void *pContext); - //! \copydoc BlackCore::ISimulator::connectTo() + //! \name ISimulator implementations + //! @{ virtual bool connectTo() override; - - //! \copydoc BlackCore::ISimulator::disconnectFrom() virtual bool disconnectFrom() override; - - //! \copydoc BlackCore::ISimulator::physicallyAddRemoteAircraft() virtual bool physicallyAddRemoteAircraft(const BlackMisc::Simulation::CSimulatedAircraft &newRemoteAircraft) override; - - //! \copydoc BlackCore::ISimulator::physicallyRemoveRemoteAircraft() virtual bool physicallyRemoveRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign) override; - - //! \copydoc BlackCore::ISimulator::physicallyRemoveAllRemoteAircraft virtual int physicallyRemoveAllRemoteAircraft() override; - - //! \copydoc BlackCore::ISimulator::updateOwnSimulatorCockpit virtual bool updateOwnSimulatorCockpit(const BlackMisc::Simulation::CSimulatedAircraft &ownAircraft, const BlackMisc::CIdentifier &originator) override; - - //! \copydoc BlackCore::ISimulator::displayStatusMessage virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const override; - - //! \copydoc BlackCore::ISimulator::displayTextMessage() virtual void displayTextMessage(const BlackMisc::Network::CTextMessage &message) const override; - - //! \copydoc BlackCore::ISimulator::isPhysicallyRenderedAircraft virtual bool isPhysicallyRenderedAircraft(const BlackMisc::Aviation::CCallsign &callsign) const override; - - //! \copydoc BlackCore::ISimulator::physicallyRenderedAircraft virtual BlackMisc::Aviation::CCallsignSet physicallyRenderedAircraft() const override; + //! @} //! Called when data about our own aircraft are received void updateOwnAircraftFromSimulator(DataDefinitionOwnAircraft simulatorOwnAircraft); @@ -203,11 +187,6 @@ namespace BlackSimPlugin HANDLE m_hSimConnect = nullptr; //!< Handle to SimConnect object QHash m_simConnectObjects; - // statistics - qint64 m_statsUpdateAircraftTimeTotal = 0; - qint64 m_statsUpdateAircraftTimeAvg = 0; - int m_statsUpdateAircraftCount = 0; - BlackMisc::Geo::CCoordinateGeodetic m_lastWeatherPosition; //!< Own aircraft position at which weather was fetched and injected last BlackMisc::CSetting m_weatherScenarioSettings { this, &CSimulatorFsx::reloadWeatherSettings }; };