refs #863 Move interpolator logging into a separate class.

A single logger instance can be shared between multiple interpolator instances.
This commit is contained in:
Mathew Sutcliffe
2017-02-06 19:24:39 +00:00
parent e67b5fccc4
commit 04ddd3bfa5
16 changed files with 419 additions and 318 deletions

View File

@@ -363,9 +363,8 @@ namespace BlackCore
}
if (p == "clear" || p == "clr")
{
//! \todo refactoring broken by rebase
//this->m_interpolator->clearLog();
//CStatusMessage(this).info("Cleared interpolation logging");
this->m_interpolationLogger.clearLog();
CStatusMessage(this).info("Cleared interpolation logging");
return true;
}
if (p == "write" || p == "save")
@@ -374,9 +373,8 @@ namespace BlackCore
this->m_interpolationRenderingSetup.clearInterpolatorLogCallsigns();
// write
//! \todo refactoring broken by rebase
//this->m_interpolator->writeLogInBackground();
//CLogMessage(this).info("Started writing interpolation log");
this->m_interpolationLogger.writeLogInBackground();
CLogMessage(this).info("Started writing interpolation log");
return true;
}

View File

@@ -31,6 +31,7 @@
#include "blackmisc/simulation/simulatorsettings.h"
#include "blackmisc/simulation/interpolationrenderingsetup.h"
#include "blackmisc/simulation/interpolationhints.h"
#include "blackmisc/simulation/interpolationlogger.h"
#include "blackmisc/weather/weathergridprovider.h"
#include "blackmisc/pq/length.h"
#include "blackmisc/pq/time.h"
@@ -184,6 +185,7 @@ namespace BlackCore
BlackMisc::Simulation::CSimulatorInternals m_simulatorInternals; //!< setup object
BlackMisc::Simulation::CInterpolationAndRenderingSetup m_interpolationRenderingSetup; //!< logging, rendering etc.
mutable QReadWriteLock m_interpolationRenderingSetupMutex; //!< mutex protecting setup object
BlackMisc::Simulation::CInterpolationLogger m_interpolationLogger; //!< log interpolation
// some optional functionality which can be used by the sims as needed
BlackMisc::Simulation::CSimulatedAircraftList m_aircraftToAddAgainWhenRemoved; //!< add this model again when removed, normally used to change model