COMP: Move startNextJob/onJobCanceled to ctkAbstractWorker

commontk · Jan 17, 2024 · 3d86f96 · 3d86f96
1 parent 40f093e
commit 3d86f96
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 63 deletions.
diff --git a/Libs/Core/ctkAbstractWorker.cpp b/Libs/Core/ctkAbstractWorker.cpp
@@ -21,15 +21,18 @@
 
 =========================================================================*/
 
+// Qt includes
+#include <QEventLoop>
+#include <QTimer>
+
+// CTK includes
 #include "ctkAbstractJob.h"
 #include "ctkAbstractScheduler.h"
 #include "ctkAbstractWorker.h"
 
 // --------------------------------------------------------------------------
 ctkAbstractWorker::ctkAbstractWorker()
 {
-  this->Job = nullptr;
-  this->Scheduler = nullptr;
   this->setAutoDelete(false);
 }
 
@@ -91,3 +94,47 @@ void ctkAbstractWorker::setScheduler(QSharedPointer<ctkAbstractScheduler> schedu
 {
   this->Scheduler = scheduler;
 }
+
+//----------------------------------------------------------------------------
+void ctkAbstractWorker::startNextJob()
+{
+  if (!this->Scheduler || !this->Job)
+    {
+    return;
+    }
+
+  ctkAbstractJob* newJob = this->Job->clone();
+  newJob->setRetryCounter(newJob->retryCounter() + 1);
+  this->Scheduler->addJob(newJob);
+}
+
+//----------------------------------------------------------------------------
+void ctkAbstractWorker::onJobCanceled()
+{
+  if (!this->Job)
+    {
+    return;
+    }
+
+  if (this->Job->retryCounter() < this->Job->maximumNumberOfRetry() &&
+      this->Job->status() != ctkAbstractJob::JobStatus::Stopped)
+    {
+    QTimer timer;
+    timer.setSingleShot(true);
+    QEventLoop loop;
+    connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
+    timer.start(this->Job->retryDelay());
+
+    this->startNextJob();
+
+    emit this->Job->finished();
+    }
+  else if (this->Job->status() != ctkAbstractJob::JobStatus::Stopped)
+    {
+    emit this->Job->failed();
+    }
+  else
+    {
+    emit this->Job->finished();
+    }
+}
diff --git a/Libs/Core/ctkAbstractWorker.h b/Libs/Core/ctkAbstractWorker.h
@@ -66,6 +66,10 @@ class CTK_CORE_EXPORT ctkAbstractWorker : public QObject, public QRunnable
   void setScheduler(QSharedPointer<ctkAbstractScheduler> scheduler);
   ///@}
 
+public slots:
+  virtual void startNextJob();
+  virtual void onJobCanceled();
+
 protected:
   QSharedPointer<ctkAbstractJob> Job;
   QSharedPointer<ctkAbstractScheduler> Scheduler;

diff --git a/Libs/DICOM/Core/ctkDICOMWorker.cpp b/Libs/DICOM/Core/ctkDICOMWorker.cpp
@@ -21,67 +21,10 @@
 
 =========================================================================*/
 
-#include "ctkDICOMJob.h"
-#include "ctkDICOMScheduler.h"
 #include "ctkDICOMWorker.h"
 
 //------------------------------------------------------------------------------
 ctkDICOMWorker::ctkDICOMWorker() = default;
 
 //------------------------------------------------------------------------------
 ctkDICOMWorker::~ctkDICOMWorker() = default;
-
-//----------------------------------------------------------------------------
-void ctkDICOMWorker::startNextJob()
-{
-  QSharedPointer<ctkDICOMScheduler> scheduler =
-    qobject_cast<QSharedPointer<ctkDICOMScheduler>>(this->Scheduler);
-  if (!scheduler)
-    {
-    return;
-    }
-
-  QSharedPointer<ctkDICOMJob> job =
-    qobject_cast<QSharedPointer<ctkDICOMJob>>(this->Job);
-  if (!job)
-    {
-    return;
-    }
-
-  ctkDICOMJob* newJob = job->clone();
-  newJob->setRetryCounter(newJob->retryCounter() + 1);
-  scheduler->addJob(newJob);
-}
-
-//----------------------------------------------------------------------------
-void ctkDICOMWorker::onJobCanceled()
-{
-  QSharedPointer<ctkDICOMJob> job =
-    qobject_cast<QSharedPointer<ctkDICOMJob>>(this->Job);
-  if (!job)
-    {
-    return;
-    }
-
-  if (job->retryCounter() < job->maximumNumberOfRetry() &&
-      job->status() != ctkAbstractJob::JobStatus::Stopped)
-    {
-    QTimer timer;
-    timer.setSingleShot(true);
-    QEventLoop loop;
-    connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
-    timer.start(job->retryDelay());
-
-    this->startNextJob();
-
-    emit job->finished();
-    }
-  else if (job->status() != ctkAbstractJob::JobStatus::Stopped)
-    {
-    emit job->failed();
-    }
-  else
-    {
-    emit job->finished();
-    }
-}
diff --git a/Libs/DICOM/Core/ctkDICOMWorker.h b/Libs/DICOM/Core/ctkDICOMWorker.h
@@ -45,10 +45,6 @@ class CTK_DICOM_CORE_EXPORT ctkDICOMWorker : public ctkAbstractWorker
   explicit ctkDICOMWorker();
   virtual ~ctkDICOMWorker();
 
-public slots:
-  void startNextJob();
-  void onJobCanceled();
-
 private:
   Q_DISABLE_COPY(ctkDICOMWorker)
 };