BUG: Hide empty patient and study widgets when filtering

Libs/DICOM/Core/ctkDICOMQuery.cpp

@@ -571,7 +571,6 @@ bool ctkDICOMQuery::queryPatients()
       {
         logger.warn(QString("ctkDICOMQuery: the number of responses of the query task at patients level "
                             "surpassed the maximum value of permitted results (i.e. %1).").arg(d->MaximumPatientsQuery));
-
         break;
       }
       DcmDataset *dataset = (*it)->m_dataset;

Libs/DICOM/Core/ctkDICOMScheduler.h

@@ -190,7 +190,6 @@ class CTK_DICOM_CORE_EXPORT ctkDICOMScheduler : public ctkJobScheduler
   Q_INVOKABLE void runJobs(const QMap<QString, ctkDICOMJobDetail>& jobDetails);
   Q_INVOKABLE void raiseJobsPriorityForSeries(const QStringList& selectedSeriesInstanceUIDs,
                                               QThread::Priority priority = QThread::HighestPriority);
-
   ///@}
 
   ///@{

Libs/DICOM/Widgets/ctkDICOMPatientItemWidget.cpp

@@ -70,7 +70,7 @@ class ctkDICOMPatientItemWidgetPrivate : public Ui_ctkDICOMPatientItemWidget
   QString formatDate(const QString&);
   bool isStudyItemAlreadyAdded(const QString& studyItem);
   void clearLayout(QLayout* layout, bool deleteWidgets = true);
-  void createStudies(bool queryRetrieve = true);
+  void createStudies();
   void updateAllowedServersUIFromDB();
   void setAllDeniedServerEnabledStatus(bool enabled);
   void saveAllowedServersStringListFromUI();
@@ -100,6 +100,8 @@ class ctkDICOMPatientItemWidgetPrivate : public Ui_ctkDICOMPatientItemWidget
   QStringList AllowedServers = QStringList();
 
   bool IsGUIUpdating;
+  bool QueryOn;
+  bool RetrieveOn;
 };
 
 //----------------------------------------------------------------------------
@@ -125,6 +127,8 @@ ctkDICOMPatientItemWidgetPrivate::ctkDICOMPatientItemWidgetPrivate(ctkDICOMPatie
   this->StudiesListVerticalSpacer = new QSpacerItem(0, 5, QSizePolicy::Fixed, QSizePolicy::Expanding);
 
   this->IsGUIUpdating = false;
+  this->QueryOn = true;
+  this->RetrieveOn = true;
 }
 
 //----------------------------------------------------------------------------
@@ -233,7 +237,7 @@ void ctkDICOMPatientItemWidgetPrivate::clearLayout(QLayout* layout, bool deleteW
 }
 
 //----------------------------------------------------------------------------
-void ctkDICOMPatientItemWidgetPrivate::createStudies(bool queryRetrieve)
+void ctkDICOMPatientItemWidgetPrivate::createStudies()
 {
   Q_Q(ctkDICOMPatientItemWidget);
   if (this->IsGUIUpdating)
@@ -369,7 +373,7 @@ void ctkDICOMPatientItemWidgetPrivate::createStudies(bool queryRetrieve)
     if (cont < this->NumberOfStudiesPerPatient)
     {
       studyItemWidget->setCollapsed(false);
-      studyItemWidget->generateSeries(queryRetrieve);
+      studyItemWidget->generateSeries(this->QueryOn, this->RetrieveOn);
     }
     cont++;
 
@@ -761,6 +765,8 @@ void ctkDICOMPatientItemWidget::addStudyItemWidget(const QString& studyItem)
                 this, SLOT(onSeriesItemClicked()));
   this->connect(studyItemWidget->seriesListTableWidget(), SIGNAL(itemSelectionChanged()),
                 this, SLOT(raiseSelectedSeriesJobsPriority()));
+  this->connect(studyItemWidget, SIGNAL(updateGUIFinished()),
+                this, SIGNAL(updateGUIFinished()));
 
   d->StudyItemWidgetsList.append(studyItemWidget);
 }
@@ -830,17 +836,22 @@ void ctkDICOMPatientItemWidget::updateAllowedServersUIFromDB()
 }
 
 //------------------------------------------------------------------------------
-void ctkDICOMPatientItemWidget::generateStudies(bool queryRetrieve)
+void ctkDICOMPatientItemWidget::generateStudies(bool query, bool retrieve)
 {
   Q_D(ctkDICOMPatientItemWidget);
 
-  d->createStudies(queryRetrieve);
-  if (queryRetrieve && d->Scheduler && d->Scheduler->queryRetrieveServersCount() > 0)
+  d->QueryOn = query;
+  d->RetrieveOn = retrieve;
+  if (query && d->Scheduler && d->Scheduler->queryRetrieveServersCount() > 0)
   {
     d->Scheduler->queryStudies(d->PatientID,
                                QThread::NormalPriority,
                                d->AllowedServers);
   }
+  else
+  {
+    d->createStudies();
+  }
 }
 
 //------------------------------------------------------------------------------

Libs/DICOM/Widgets/ctkDICOMPatientItemWidget.h

@@ -178,13 +178,17 @@ class CTK_DICOM_WIDGETS_EXPORT ctkDICOMPatientItemWidget : public QWidget
   ///@}
 
 public Q_SLOTS:
-  void generateStudies(bool queryRetrieve = true);
+  void generateStudies(bool query = true, bool retrieve = true);
   void generateSeriesAtToggle(bool toggled = true, const QString& studyItem = "");
   void updateGUIFromScheduler(const QVariant& data);
   void onSeriesItemClicked();
   void raiseSelectedSeriesJobsPriority();
   void onPatientServersCheckableComboBoxChanged();
 
+Q_SIGNALS:
+  /// Emitted when the GUI finished to update after a studies query.
+  void updateGUIFinished();
+
 protected:
   QScopedPointer<ctkDICOMPatientItemWidgetPrivate> d_ptr;
 

Libs/DICOM/Widgets/ctkDICOMSeriesItemWidget.cpp

@@ -62,7 +62,7 @@ class ctkDICOMSeriesItemWidgetPrivate : public Ui_ctkDICOMSeriesItemWidget
 
   void init();
   QString getDICOMCenterFrameFromInstances(QStringList instancesList);
-  void createThumbnail(ctkDICOMJobDetail td, bool queryRetrieve = true);
+  void createThumbnail(ctkDICOMJobDetail td);
   void drawModalityThumbnail();
   void drawThumbnail(const QString& file, int numberOfFrames);
   void drawTextWithShadow(QPainter *painter,
@@ -101,6 +101,9 @@ class ctkDICOMSeriesItemWidgetPrivate : public Ui_ctkDICOMSeriesItemWidget
   int NumberOfDownloads;
   QImage ThumbnailImage;
   bool isThumbnailDocument;
+
+  bool QueryOn;
+  bool RetrieveOn;
 };
 
 //----------------------------------------------------------------------------
@@ -133,6 +136,9 @@ ctkDICOMSeriesItemWidgetPrivate::ctkDICOMSeriesItemWidgetPrivate(ctkDICOMSeriesI
 
   this->DicomDatabase = nullptr;
   this->Scheduler = nullptr;
+
+  this->QueryOn = true;
+  this->RetrieveOn = true;
 }
 
 //----------------------------------------------------------------------------
@@ -197,7 +203,7 @@ QString ctkDICOMSeriesItemWidgetPrivate::getDICOMCenterFrameFromInstances(QStrin
 }
 
 //----------------------------------------------------------------------------
-void ctkDICOMSeriesItemWidgetPrivate::createThumbnail(ctkDICOMJobDetail td, bool queryRetrieve)
+void ctkDICOMSeriesItemWidgetPrivate::createThumbnail(ctkDICOMJobDetail td)
 {
   if (!this->DicomDatabase)
   {
@@ -301,7 +307,7 @@ void ctkDICOMSeriesItemWidgetPrivate::createThumbnail(ctkDICOMJobDetail td, bool
         (jobType == ctkDICOMJobResponseSet::JobType::None ||
          jobType == ctkDICOMJobResponseSet::JobType::QueryInstances))
     {
-      if (queryRetrieve)
+      if (this->RetrieveOn)
       {
         this->Scheduler->retrieveSOPInstance(this->PatientID,
                                              this->StudyInstanceUID,
@@ -326,7 +332,7 @@ void ctkDICOMSeriesItemWidgetPrivate::createThumbnail(ctkDICOMJobDetail td, bool
         this->Scheduler->getJobsByDICOMUIDs({},
                                             {},
                                             {this->SeriesInstanceUID});
-      if (jobs.count() == 0 && queryRetrieve)
+      if (jobs.count() == 0 && this->RetrieveOn)
       {
         this->Scheduler->retrieveSeries(this->PatientID,
                                         this->StudyInstanceUID,
@@ -417,15 +423,15 @@ void ctkDICOMSeriesItemWidgetPrivate::drawThumbnail(const QString& file, int num
   font.setPixelSize(textSize);
 
   QPixmap resultPixmap(scaledThumbnailSizePixel, scaledThumbnailSizePixel);
-  resultPixmap.fill(Qt::transparent);
 
   ctkDICOMThumbnailGenerator thumbnailGenerator;
   thumbnailGenerator.setWidth(scaledThumbnailSizePixel);
   thumbnailGenerator.setHeight(scaledThumbnailSizePixel);
   bool thumbnailGenerated = true;
   bool emptyThumbnailGenerated = false;
   QPainter painter;
-  if (this->ThumbnailImage.width() != scaledThumbnailSizePixel)
+
+  if (this->ThumbnailImage.isNull())
   {
     if (!thumbnailGenerator.generateThumbnail(file, this->ThumbnailImage))
     {
@@ -443,11 +449,12 @@ void ctkDICOMSeriesItemWidgetPrivate::drawThumbnail(const QString& file, int num
         painter.end();
       }
     }
-    else
-    {
+  }
+
+  if (thumbnailGenerated)
+  {
     QColor firstPixelColor = this->ThumbnailImage.pixelColor(0, 0);
     resultPixmap.fill(firstPixelColor);
-    }
   }
 
   if (thumbnailGenerated && !this->isThumbnailDocument)
@@ -456,7 +463,6 @@ void ctkDICOMSeriesItemWidgetPrivate::drawThumbnail(const QString& file, int num
     {
       painter.setRenderHint(QPainter::Antialiasing, true);
       painter.setRenderHint(QPainter::SmoothPixmapTransform, true);
-      painter.setRenderHint(QPainter::LosslessImageRendering, true);
       painter.setFont(font);
 
       QRectF rect = resultPixmap.rect();
@@ -770,11 +776,11 @@ void ctkDICOMSeriesItemWidget::forceRetrieve()
 {
   Q_D(ctkDICOMSeriesItemWidget);
 
-  d->IsCloud = true;
+  d->IsCloud = false;
   d->RetrieveFailed = false;
   d->StopJobs = false;
-  ctkDICOMJobDetail td;
-  d->createThumbnail(td);
+  d->DicomDatabase->removeSeries(d->SeriesInstanceUID, false, false);
+  this->generateInstances(true);
 }
 
 //----------------------------------------------------------------------------
@@ -862,7 +868,7 @@ void ctkDICOMSeriesItemWidget::setDicomDatabase(QSharedPointer<ctkDICOMDatabase>
 }
 
 //------------------------------------------------------------------------------
-void ctkDICOMSeriesItemWidget::generateInstances(bool queryRetrieve)
+void ctkDICOMSeriesItemWidget::generateInstances(bool query, bool retrieve)
 {
   Q_D(ctkDICOMSeriesItemWidget);
   if (!d->DicomDatabase)
@@ -871,10 +877,11 @@ void ctkDICOMSeriesItemWidget::generateInstances(bool queryRetrieve)
     return;
   }
 
-  ctkDICOMJobDetail td;
-  d->createThumbnail(td, queryRetrieve);
+  d->QueryOn = query;
+  d->RetrieveOn = retrieve;
+
   QStringList instancesList = d->DicomDatabase->instancesForSeries(d->SeriesInstanceUID);
-  if (queryRetrieve && !d->StopJobs &&
+  if (query && !d->StopJobs &&
       instancesList.count() == 0 &&
       d->Scheduler &&
       d->Scheduler->queryRetrieveServersCount() > 0)
@@ -885,6 +892,11 @@ void ctkDICOMSeriesItemWidget::generateInstances(bool queryRetrieve)
                                  d->RaiseJobsPriority ? QThread::HighestPriority : QThread::NormalPriority,
                                  d->AllowedServers);
   }
+  else
+  {
+    ctkDICOMJobDetail td;
+    d->createThumbnail(td);
+  }
 }
 
 //----------------------------------------------------------------------------

Libs/DICOM/Widgets/ctkDICOMSeriesItemWidget.h

@@ -169,7 +169,7 @@ class CTK_DICOM_WIDGETS_EXPORT ctkDICOMSeriesItemWidget : public QWidget
   void setDicomDatabase(QSharedPointer<ctkDICOMDatabase> dicomDatabase);
 
 public Q_SLOTS:
-  void generateInstances(bool queryRetrieve = true);
+  void generateInstances(bool query = true, bool retrieve = true);
   void updateGUIFromScheduler(const QVariant& data);
   void updateSeriesProgressBar(const QVariant& data);
   void onJobStarted(const QVariant& data);