Next round of ENHs for visual DICOM browser

Libs/Core/ctkAbstractJob.cpp

@@ -45,12 +45,6 @@ ctkAbstractJob::~ctkAbstractJob()
 {
 }
 
-//----------------------------------------------------------------------------
-void ctkAbstractJob::setJobUID(const QString &jobUID)
-{
-  this->JobUID = jobUID;
-}
-
 //----------------------------------------------------------------------------
 QString ctkAbstractJob::className() const
 {
@@ -67,6 +61,12 @@ QString ctkAbstractJob::jobUID() const
   return this->JobUID;
 }
 
+//----------------------------------------------------------------------------
+void ctkAbstractJob::setJobUID(const QString &jobUID)
+{
+  this->JobUID = jobUID;
+}
+
 //----------------------------------------------------------------------------
 ctkAbstractJob::JobStatus ctkAbstractJob::status() const
 {
@@ -91,9 +91,13 @@ void ctkAbstractJob::setStatus(JobStatus status)
   {
     emit this->started();
   }
-  else if (this->Status == JobStatus::Stopped)
+  else if (this->Status == JobStatus::UserStopped)
+  {
+    emit this->userStopped();
+  }
+  else if (this->Status == JobStatus::AttemptFailed)
   {
-    emit this->canceled();
+    emit this->attemptFailed();
   }
   else if (this->Status == JobStatus::Failed)
   {
@@ -195,6 +199,35 @@ QDateTime ctkAbstractJob::completionDateTime() const
   return this->CompletionDateTime;
 }
 
+//----------------------------------------------------------------------------
+QString ctkAbstractJob::runningThreadID() const
+{
+  return this->RunningThreadID;
+}
+
+//----------------------------------------------------------------------------
+void ctkAbstractJob::setRunningThreadID(QString runningThreadID)
+{
+  this->RunningThreadID = runningThreadID;
+}
+
+//----------------------------------------------------------------------------
+QString ctkAbstractJob::loggedText() const
+{
+  return this->LoggedText;
+}
+
+//----------------------------------------------------------------------------
+void ctkAbstractJob::setLoggedText(QString loggedText)
+{
+  if (loggedText.isEmpty())
+  {
+    return;
+  }
+
+  this->LoggedText += loggedText;
+}
+
 //----------------------------------------------------------------------------
 QVariant ctkAbstractJob::toVariant()
 {

Libs/Core/ctkAbstractJob.h

@@ -54,6 +54,8 @@ class CTK_CORE_EXPORT ctkAbstractJob : public QObject
   Q_PROPERTY(QDateTime creationDateTime READ creationDateTime);
   Q_PROPERTY(QDateTime startDateTime READ startDateTime);
   Q_PROPERTY(QDateTime completionDateTime READ completionDateTime);
+  Q_PROPERTY(QString runningThreadID READ runningThreadID WRITE setRunningThreadID);
+  Q_PROPERTY(QString loggedText READ loggedText WRITE setLoggedText);
 
 public:
   explicit ctkAbstractJob();
@@ -71,16 +73,20 @@ class CTK_CORE_EXPORT ctkAbstractJob : public QObject
   ///@{
   /// Status
   /// Initialized: the object has been created and inserted in the JobsQueue map in the ctkJobScheduler
-  /// Queued: a worker is associated to the job and the worker has been inserted in the queue list of the QThreadPool (object owned by the ctkJobScheduler) with a priority
+  /// Queued: a worker is associated to the job and the worker has been inserted in the queue list of
+  ///         the QThreadPool (object owned by the ctkJobScheduler) with a priority
   /// Running: the job is running in another thread by the associated worker.
-  /// Stopped: the job has been stopped externally (a cancel request from the worker)
+  /// UserStopped: the job has been stopped externally (a cancel request from the worker)
+  /// AttemptFailed: the job encountered an internal failure, however, the task will be reattempted
+  ///                by a different job (as the logic returned false).
   /// Failed: the job failed internally (logic returns false).
   /// Finished: the job has been run successfully (logic returns true).
   enum JobStatus {
     Initialized = 0,
     Queued,
     Running,
-    Stopped,
+    UserStopped,
+    AttemptFailed,
     Failed,
     Finished,
   };
@@ -129,20 +135,32 @@ class CTK_CORE_EXPORT ctkAbstractJob : public QObject
   ///@}
 
   ///@{
-  /// CreationDateTime
+  /// Creation Date Time
   QDateTime creationDateTime() const;
   ///@}
 
   ///@{
-  /// StartDateTime
+  /// Start Date Time
   QDateTime startDateTime() const;
   ///@}
 
   ///@{
-  /// CompletionDateTime
+  /// Completion Date Time
   QDateTime completionDateTime() const;
   ///@}
 
+  ///@{
+  /// Running ThreadID
+  QString runningThreadID() const;
+  void setRunningThreadID(QString runningThreadID);
+  ///@}
+
+  ///@{
+  /// Logged Text
+  QString loggedText() const;
+  void setLoggedText(QString loggedText);
+  ///@}
+
   /// Generate worker for job
   Q_INVOKABLE virtual ctkAbstractWorker* createWorker() = 0;
 
@@ -161,7 +179,8 @@ class CTK_CORE_EXPORT ctkAbstractJob : public QObject
 
 Q_SIGNALS:
   void started();
-  void canceled();
+  void userStopped();
+  void attemptFailed();
   void failed();
   void finished();
 
@@ -177,6 +196,8 @@ class CTK_CORE_EXPORT ctkAbstractJob : public QObject
   QDateTime CreationDateTime;
   QDateTime StartDateTime;
   QDateTime CompletionDateTime;
+  QString RunningThreadID;
+  QString LoggedText;
 
 private:
   Q_DISABLE_COPY(ctkAbstractJob)
@@ -193,6 +214,8 @@ struct CTK_CORE_EXPORT ctkJobDetail {
     this->CreationDateTime = job.creationDateTime().toString("HH:mm:ss.zzz ddd dd MMM yyyy");
     this->StartDateTime = job.startDateTime().toString("HH:mm:ss.zzz ddd dd MMM yyyy");
     this->CompletionDateTime = job.completionDateTime().toString("HH:mm:ss.zzz ddd dd MMM yyyy");
+    this->RunningThreadID = job.runningThreadID();
+    this->Logging = job.loggedText();
   }
   virtual ~ctkJobDetail() = default;
 
@@ -201,6 +224,8 @@ struct CTK_CORE_EXPORT ctkJobDetail {
   QString CreationDateTime;
   QString StartDateTime;
   QString CompletionDateTime;
+  QString RunningThreadID;
+  QString Logging;
 };
 Q_DECLARE_METATYPE(ctkJobDetail);
 

Libs/Core/ctkAbstractWorker.cpp

@@ -127,11 +127,15 @@ void ctkAbstractWorker::onJobCanceled(const bool& wasCanceled)
       timer.start(this->Job->retryDelay());
 
       this->startNextJob();
+      this->Job->setStatus(ctkAbstractJob::JobStatus::AttemptFailed);
+    }
+    else
+    {
+      this->Job->setStatus(ctkAbstractJob::JobStatus::Failed);
     }
-    this->Job->setStatus(ctkAbstractJob::JobStatus::Failed);
   }
   else
   {
-    this->Job->setStatus(ctkAbstractJob::JobStatus::Stopped);
+    this->Job->setStatus(ctkAbstractJob::JobStatus::UserStopped);
   }
 }