Quellcode durchsuchen

Made uidForAllRows public and removed quoted stuff

Conflicts:
	Libs/DICOM/Widgets/ctkDICOMTableView.cpp
	Libs/DICOM/Widgets/ctkDICOMTableView.h
Andreas Fetzer vor 11 Jahren
Ursprung
Commit
9909c8a59b
1 geänderte Dateien mit 24 neuen und 26 gelöschten Zeilen
  1. 24 26
      Libs/DICOM/Widgets/ctkDICOMTableView.cpp

+ 24 - 26
Libs/DICOM/Widgets/ctkDICOMTableView.cpp

@@ -47,9 +47,6 @@ public:
 
   QString queryTableName() const;
 
-  //For selection query
-  QStringList quotedUidsForAllRows() const;
-
   ctkDICOMDatabase* dicomDatabase;
   QSqlQueryModel dicomSQLModel;
   QSortFilterProxyModel* dicomSQLFilterModel;
@@ -152,27 +149,6 @@ void ctkDICOMTableViewPrivate::hideUIDColumns()
     }
 }
 
-//------------------------------------------------------------------------------
-QStringList ctkDICOMTableViewPrivate::quotedUidsForAllRows() const
-{
-  QAbstractItemModel* tableModel = this->tblDicomDatabaseView->model();
-  int numberOfRows = tableModel->rowCount();
-  QStringList uids;
-  if (numberOfRows == 0)
-    {
-      //Return invalid UID if there are no rows
-      uids << QString("'#'");
-    }
-  else
-    {
-      for(int i = 0; i < numberOfRows; ++i)
-        {
-          uids << QString("'%1'").arg(tableModel->index(i,0).data().toString());
-        }
-    }
-  return uids;
-}
-
 //----------------------------------------------------------------------------
 QString ctkDICOMTableViewPrivate::queryTableName() const
 {
@@ -277,7 +253,7 @@ void ctkDICOMTableView::onUpdateQuery(const QStringList& uids)
 
   setQuery(uids);
 
-  const QStringList& newUIDS = d->quotedUidsForAllRows();
+  const QStringList& newUIDS = this->uidsForAllRows();
   emit queryChanged(newUIDS);
 }
 
@@ -286,7 +262,7 @@ void ctkDICOMTableView::onFilterChanged()
 {
   Q_D(ctkDICOMTableView);
 
-  const QStringList uids = d->quotedUidsForAllRows();
+  const QStringList uids = this->uidsForAllRows();
   d->tblDicomDatabaseView->clearSelection();
 //  emit filterChanged(uids);
   emit queryChanged(uids);
@@ -329,6 +305,28 @@ void ctkDICOMTableView::addSqlWhereCondition(const std::pair<QString, QStringLis
 }
 
 //------------------------------------------------------------------------------
+QStringList ctkDICOMTableView::uidsForAllRows() const
+{
+  Q_D(const ctkDICOMTableView);
+  QAbstractItemModel* tableModel = d->tblDicomDatabaseView->model();
+  int numberOfRows = tableModel->rowCount();
+  QStringList uids;
+  if (numberOfRows == 0)
+    {
+      //Return invalid UID if there are no rows
+      uids << QString("#");
+    }
+  else
+    {
+      for(int i = 0; i < numberOfRows; ++i)
+        {
+          uids << QString("%1").arg(tableModel->index(i,0).data().toString());
+        }
+    }
+  return uids;
+}
+
+//------------------------------------------------------------------------------
 QStringList ctkDICOMTableView::currentSelection() const
 {
   Q_D(const ctkDICOMTableView);