ENH: Clean manual retry infrastructure

ENH: Add jobs status logging into the detail logging window ENH: Generate thumbnails in workers BUG: Fix missing update of server settings UI BUG: Add missing Python wrapping methods for ctkJobDetail ENH: Improve job logging
commontk · Sep 3, 2024 · 0d40cd2 · 0d40cd2
1 parent 6292d09
commit 0d40cd2
Show file tree

Hide file tree

Showing 58 changed files with 1,922 additions and 711 deletions.
diff --git a/Libs/Core/ctkAbstractJob.cpp b/Libs/Core/ctkAbstractJob.cpp
@@ -38,6 +38,7 @@ ctkAbstractJob::ctkAbstractJob()
   this->MaximumConcurrentJobsPerType = 20;
   this->Priority = QThread::Priority::LowPriority;
   this->CreationDateTime = QDateTime::currentDateTime();
+  this->DestroyAfterUse = false;
 }
 
 //----------------------------------------------------------------------------
@@ -218,7 +219,7 @@ QString ctkAbstractJob::loggedText() const
 }
 
 //----------------------------------------------------------------------------
-void ctkAbstractJob::setLoggedText(QString loggedText)
+void ctkAbstractJob::addLoggedText(QString loggedText)
 {
   if (loggedText.isEmpty())
   {
@@ -228,6 +229,18 @@ void ctkAbstractJob::setLoggedText(QString loggedText)
   this->LoggedText += loggedText;
 }
 
+//----------------------------------------------------------------------------
+bool ctkAbstractJob::destroyAfterUse() const
+{
+  return this->DestroyAfterUse;
+}
+
+//----------------------------------------------------------------------------
+void ctkAbstractJob::setDestroyAfterUse(bool destroyAfterUse)
+{
+  this->DestroyAfterUse = destroyAfterUse;
+}
+
 //----------------------------------------------------------------------------
 QVariant ctkAbstractJob::toVariant()
 {

diff --git a/Libs/Core/ctkAbstractJob.h b/Libs/Core/ctkAbstractJob.h
@@ -55,7 +55,8 @@ class CTK_CORE_EXPORT ctkAbstractJob : public QObject
   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);
+  Q_PROPERTY(QString loggedText READ loggedText WRITE addLoggedText);
+  Q_PROPERTY(bool destroyAfterUse READ destroyAfterUse WRITE setDestroyAfterUse);
 
 public:
   explicit ctkAbstractJob();
@@ -158,7 +159,7 @@ class CTK_CORE_EXPORT ctkAbstractJob : public QObject
   ///@{
   /// Logged Text
   QString loggedText() const;
-  void setLoggedText(QString loggedText);
+  void addLoggedText(QString loggedText);
   ///@}
 
   /// Generate worker for job
@@ -168,7 +169,7 @@ class CTK_CORE_EXPORT ctkAbstractJob : public QObject
   Q_INVOKABLE virtual ctkAbstractJob* clone() const = 0;
 
   /// Logger report string formatting for specific job
-  Q_INVOKABLE virtual QString loggerReport(const QString& status) const = 0;
+  Q_INVOKABLE virtual QString loggerReport(const QString& status) = 0;
 
   /// Return the QVariant value of this job.
   ///
@@ -177,6 +178,16 @@ class CTK_CORE_EXPORT ctkAbstractJob : public QObject
   /// \sa ctkJobDetail
   Q_INVOKABLE virtual QVariant toVariant();
 
+  /// Free used resources from job after worker is done
+  Q_INVOKABLE virtual void freeUsedResources() = 0;
+
+  ///@{
+  /// Destroy job pointer after worker is done
+  /// default: false
+  bool destroyAfterUse() const;
+  void setDestroyAfterUse(bool destroyAfterUse);
+  ///@}
+
 Q_SIGNALS:
   void started();
   void userStopped();
@@ -198,6 +209,7 @@ class CTK_CORE_EXPORT ctkAbstractJob : public QObject
   QDateTime CompletionDateTime;
   QString RunningThreadID;
   QString LoggedText;
+  bool DestroyAfterUse;
 
 private:
   Q_DISABLE_COPY(ctkAbstractJob)

diff --git a/Libs/Core/ctkCorePythonQtDecorators.h b/Libs/Core/ctkCorePythonQtDecorators.h
@@ -260,6 +260,51 @@ public Q_SLOTS:
   {
     return td->JobUID;
   }
+    void setCreationDateTime(ctkJobDetail* td, QString creationDateTime)
+  {
+    td->CreationDateTime = creationDateTime;
+  }
+
+  QString creationDateTime(ctkJobDetail* td)
+  {
+    return td->CreationDateTime;
+  }
+
+  void setStartDateTime(ctkJobDetail* td, QString startDateTime)
+  {
+    td->StartDateTime = startDateTime;
+  }
+  QString startDateTime(ctkJobDetail* td)
+  {
+    return td->StartDateTime;
+  }
+
+  void setCompletionDateTime(ctkJobDetail* td, QString completionDateTime)
+  {
+    td->CompletionDateTime = completionDateTime;
+  }
+  QString completionDateTime(ctkJobDetail* td)
+  {
+    return td->CompletionDateTime;
+  }
+
+  void setRunningThreadID(ctkJobDetail* td, QString runningThreadID)
+  {
+    td->RunningThreadID = runningThreadID;
+  }
+  QString runningThreadID(ctkJobDetail* td)
+  {
+    return td->RunningThreadID;
+  }
+
+  void setLogging(ctkJobDetail* td, QString logging)
+  {
+    td->Logging = logging;
+  }
+  QString logging(ctkJobDetail* td)
+  {
+    return td->Logging;
+  }
 };
 
 //-----------------------------------------------------------------------------