Refactored setting the query in separate function

Libs/DICOM/Widgets/ctkDICOMTableView.cpp

@@ -97,8 +97,7 @@ void ctkDICOMTableViewPrivate::setUpTableView()
   Q_Q(ctkDICOMTableView);
   if (this->dicomDatabase)
     {
-      QString query = "select * from "+this->queryTableName;
-      this->dicomSQLModel.setQuery(query, this->dicomDatabase->database());
+      q->setQuery();
       this->dicomSQLFilterModel->setSourceModel(&this->dicomSQLModel);
       this->dicomSQLFilterModel->setFilterKeyColumn(-1);
       this->dicomSQLFilterModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
@@ -219,13 +218,30 @@ void ctkDICOMTableView::onSelectionChanged()
 void ctkDICOMTableView::onDatabaseChanged()
 {
   Q_D(ctkDICOMTableView);
-  QString query = "select * from " + d->queryTableName;
-  d->dicomSQLModel.setQuery(query, d->dicomDatabase->database());
+  setQuery();
 }
 
 void ctkDICOMTableView::onUpdateQuery(const QStringList& uids)
 {
   Q_D(ctkDICOMTableView);
+
+  setQuery(uids);
+
+  QStringList newUIDS = d->uidsForAllRows();
+  emit queryChanged(newUIDS);
+}
+
+void ctkDICOMTableView::onFilterChanged()
+{
+  Q_D(ctkDICOMTableView);
+
+  QStringList uids = d->uidsForAllRows();
+  emit queryChanged(uids);
+}
+
+void ctkDICOMTableView::setQuery(const QStringList &uids)
+{
+  Q_D(ctkDICOMTableView);
   QString query;
 
   if (uids.empty() || d->queryForeignKey.length() == 0)
@@ -238,14 +254,4 @@ void ctkDICOMTableView::onUpdateQuery(const QStringList& uids)
       query.append(uids.join(",")).append(");");
     }
   d->dicomSQLModel.setQuery(query, d->dicomDatabase->database());
-  QStringList newUIDS = d->uidsForAllRows();
-  emit queryChanged(newUIDS);
-}
-
-void ctkDICOMTableView::onFilterChanged()
-{
-  Q_D(ctkDICOMTableView);
-
-  QStringList uids = d->uidsForAllRows();
-  emit queryChanged(uids);
 }

Libs/DICOM/Widgets/ctkDICOMTableView.h

@@ -82,6 +82,13 @@ public:
    */
   void setQueryForeignKey(const QString &foreignKey);
 
+  /**
+   * Set the query for the underlying database. If the uid list is not empty just the
+   * entries with the according uids are selected
+   * @param uids a list of uids which should be selected
+   */
+  void setQuery (const QStringList &uids = QStringList());
+
 public Q_SLOTS:
 
   /**