From bbd5ad2cbc9f4d0d741cb9427f1e1cf73816e563 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 6 May 2015 02:48:13 +0200 Subject: [PATCH] refs #395, removed worker from interpolator It was planned to do all interpolation calculations at once in background, this concept is not used anymore --- src/blackcore/interpolator.cpp | 5 +++-- src/blackcore/interpolator.h | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/blackcore/interpolator.cpp b/src/blackcore/interpolator.cpp index 450b35b6d..333be929e 100644 --- a/src/blackcore/interpolator.cpp +++ b/src/blackcore/interpolator.cpp @@ -19,11 +19,12 @@ using namespace BlackMisc::Simulation; namespace BlackCore { - IInterpolator::IInterpolator(IRemoteAircraftProvider *provider, const QString &workerName, QObject *parent) : - CContinuousWorker(parent, workerName), + IInterpolator::IInterpolator(IRemoteAircraftProvider *provider, const QString &objectName, QObject *parent) : + QObject(parent), CRemoteAircraftAware(provider) { Q_ASSERT_X(provider, Q_FUNC_INFO, "missing provider"); + this->setObjectName(objectName); } CAircraftPartsList IInterpolator::getPartsBeforeTime(const CCallsign &callsign, qint64 cutoffTime, BlackCore::IInterpolator::PartsStatus &partsStatus) diff --git a/src/blackcore/interpolator.h b/src/blackcore/interpolator.h index 4480ecf88..dd31b2293 100644 --- a/src/blackcore/interpolator.h +++ b/src/blackcore/interpolator.h @@ -23,7 +23,7 @@ namespace BlackCore { //! Interpolator, calculation inbetween positions class BLACKCORE_EXPORT IInterpolator : - public BlackMisc::CContinuousWorker, + public QObject, public BlackMisc::Simulation::CRemoteAircraftAware { Q_OBJECT @@ -80,7 +80,7 @@ namespace BlackCore protected: //! Constructor - IInterpolator(BlackMisc::Simulation::IRemoteAircraftProvider *provider, const QString &workerName, QObject *parent = nullptr); + IInterpolator(BlackMisc::Simulation::IRemoteAircraftProvider *provider, const QString &objectName, QObject *parent); bool m_withDebugMsg = false; //!< allows to disable debug messages };