ENH: Add operation status icon for patient widgets

commontk · May 20, 2024 · a7aa8c1 · a7aa8c1
1 parent 6dc3159
commit a7aa8c1
Show file tree

Hide file tree

Showing 10 changed files with 275 additions and 27 deletions.
diff --git a/Libs/DICOM/Widgets/Resources/UI/Icons/patient_failed.svg b/Libs/DICOM/Widgets/Resources/UI/Icons/patient_failed.svg
diff --git a/Libs/DICOM/Widgets/Resources/UI/Icons/patient_pending.svg b/Libs/DICOM/Widgets/Resources/UI/Icons/patient_pending.svg
diff --git a/Libs/DICOM/Widgets/Resources/UI/Icons/patient_success.svg b/Libs/DICOM/Widgets/Resources/UI/Icons/patient_success.svg
diff --git a/Libs/DICOM/Widgets/Resources/UI/ctkDICOMWidget.qrc b/Libs/DICOM/Widgets/Resources/UI/ctkDICOMWidget.qrc
@@ -32,5 +32,8 @@
         <file>Icons/search_local.svg</file>
         <file>Icons/query.svg</file>
         <file>Icons/wait.svg</file>
+        <file>Icons/patient_failed.svg</file>
+        <file>Icons/patient_pending.svg</file>
+        <file>Icons/patient_success.svg</file>
     </qresource>
 </RCC>
diff --git a/Libs/DICOM/Widgets/ctkDICOMPatientItemWidget.cpp b/Libs/DICOM/Widgets/ctkDICOMPatientItemWidget.cpp
@@ -99,7 +99,8 @@ class ctkDICOMPatientItemWidgetPrivate : public Ui_ctkDICOMPatientItemWidget
   QMap<QString, QMetaObject::Connection> StudyItemWidgetsConnectionMap;
   QSpacerItem* StudiesListVerticalSpacer;
 
-  QStringList AllowedServers = QStringList();
+  QStringList AllowedServers;
+  ctkDICOMPatientItemWidget::OperationStatus Status;
 
   bool IsGUIUpdating;
   bool QueryOn;
@@ -131,6 +132,9 @@ ctkDICOMPatientItemWidgetPrivate::ctkDICOMPatientItemWidgetPrivate(ctkDICOMPatie
 
   this->StudiesListVerticalSpacer = new QSpacerItem(0, 5, QSizePolicy::Fixed, QSizePolicy::Expanding);
 
+  this->AllowedServers = QStringList();
+  this->Status = ctkDICOMPatientItemWidget::NoOperation;
+
   this->IsGUIUpdating = false;
   this->QueryOn = true;
   this->RetrieveOn = true;
@@ -580,6 +584,8 @@ ctkDICOMPatientItemWidget::~ctkDICOMPatientItemWidget()
 //------------------------------------------------------------------------------
 CTK_SET_CPP(ctkDICOMPatientItemWidget, const QStringList&, setAllowedServers, AllowedServers);
 CTK_GET_CPP(ctkDICOMPatientItemWidget, QStringList, allowedServers, AllowedServers);
+CTK_SET_CPP(ctkDICOMPatientItemWidget, const OperationStatus&, setOperationStatus, Status);
+CTK_GET_CPP(ctkDICOMPatientItemWidget, ctkDICOMPatientItemWidget::OperationStatus, operationStatus, Status);
 CTK_GET_CPP(ctkDICOMPatientItemWidget, QString, patientItem, PatientItem);
 CTK_SET_CPP(ctkDICOMPatientItemWidget, const QString&, setPatientID, PatientID);
 CTK_GET_CPP(ctkDICOMPatientItemWidget, QString, patientID, PatientID);

diff --git a/Libs/DICOM/Widgets/ctkDICOMPatientItemWidget.h b/Libs/DICOM/Widgets/ctkDICOMPatientItemWidget.h
@@ -50,6 +50,7 @@ class CTK_DICOM_WIDGETS_EXPORT ctkDICOMPatientItemWidget : public QWidget
   Q_PROPERTY(int numberOfStudiesPerPatient READ numberOfStudiesPerPatient WRITE setNumberOfStudiesPerPatient);
   Q_PROPERTY(ctkDICOMStudyItemWidget::ThumbnailSizeOption thumbnailSize READ thumbnailSize WRITE setThumbnailSize);
   Q_PROPERTY(QStringList allowedServers READ allowedServers WRITE setAllowedServers);
+  Q_PROPERTY(OperationStatus operationStatus READ operationStatus WRITE setOperationStatus);
 
 public:
   typedef QWidget Superclass;
@@ -189,6 +190,21 @@ class CTK_DICOM_WIDGETS_EXPORT ctkDICOMPatientItemWidget : public QWidget
   Q_INVOKABLE void updateAllowedServersUIFromDB();
   ///@}
 
+  enum OperationStatus
+  {
+    NoOperation = 0,
+    InProgress,
+    Completed,
+    Failed,
+  };
+
+  ///@{
+  /// Set the operation status
+  /// NoOperation by default
+  void setOperationStatus(const OperationStatus& status);
+  OperationStatus operationStatus() const;
+  ///@}
+
 public Q_SLOTS:
   void generateStudies(bool query = true, bool retrieve = true);
   void generateSeriesAtToggle(bool toggled = true, const QString& studyItem = "");

diff --git a/Libs/DICOM/Widgets/ctkDICOMSeriesItemWidget.cpp b/Libs/DICOM/Widgets/ctkDICOMSeriesItemWidget.cpp
@@ -986,7 +986,7 @@ void ctkDICOMSeriesItemWidget::onJobUserStopped(const QVariant &data)
       td.SeriesInstanceUID == d->SeriesInstanceUID)
   {
     d->SeriesThumbnail->setOperationStatus(ctkThumbnailLabel::Failed);
-    d->SeriesThumbnail->setStatusIcon(QIcon(":/Icons/error.svg"));
+    d->SeriesThumbnail->setStatusIcon(QIcon(":/Icons/error_red.svg"));
 
     if (td.JobType == ctkDICOMJobResponseSet::JobType::RetrieveSOPInstance)
     {
@@ -1015,7 +1015,7 @@ void ctkDICOMSeriesItemWidget::onJobFailed(const QVariant &data)
       td.SeriesInstanceUID == d->SeriesInstanceUID)
   {
     d->SeriesThumbnail->setOperationStatus(ctkThumbnailLabel::Failed);
-    d->SeriesThumbnail->setStatusIcon(QIcon(":/Icons/error.svg"));
+    d->SeriesThumbnail->setStatusIcon(QIcon(":/Icons/error_red.svg"));
 
     if (td.JobType == ctkDICOMJobResponseSet::JobType::RetrieveSOPInstance)
     {

diff --git a/Libs/DICOM/Widgets/ctkDICOMStudyItemWidget.cpp b/Libs/DICOM/Widgets/ctkDICOMStudyItemWidget.cpp
@@ -813,7 +813,7 @@ void ctkDICOMStudyItemWidget::onJobUserStopped(const QVariant &data)
       td.StudyInstanceUID == d->StudyInstanceUID)
   {
     d->Status = ctkDICOMStudyItemWidget::Failed;
-    d->OperationStatusPushButton->setIcon(QIcon(":/Icons/error.svg"));
+    d->OperationStatusPushButton->setIcon(QIcon(":/Icons/error_red.svg"));
   }
 }
 
@@ -829,7 +829,7 @@ void ctkDICOMStudyItemWidget::onJobFailed(const QVariant &data)
       td.StudyInstanceUID == d->StudyInstanceUID)
   {
     d->Status = ctkDICOMStudyItemWidget::Failed;
-    d->OperationStatusPushButton->setIcon(QIcon(":/Icons/error.svg"));
+    d->OperationStatusPushButton->setIcon(QIcon(":/Icons/error_red.svg"));
   }
 }