瀏覽代碼

Renamed self defined signals according to qt naming conventions

Andreas Fetzer 11 年之前
父節點
當前提交
9add7b1959
共有 2 個文件被更改,包括 18 次插入23 次删除
  1. 12 17
      Libs/DICOM/Widgets/ctkDICOMTableManager.cpp
  2. 6 6
      Libs/DICOM/Widgets/ctkDICOMTableManager.h

+ 12 - 17
Libs/DICOM/Widgets/ctkDICOMTableManager.cpp

@@ -74,28 +74,23 @@ void ctkDICOMTableManagerPrivate::init()
   this->seriesTable = new ctkDICOMTableView(q, "Series");
   this->seriesTable->setQueryForeignKey("StudyInstanceUID");
 
-  QObject::connect(this->patientsTable, SIGNAL(signalQueryChanged(QStringList)),
-                   this->studiesTable, SLOT(onUpdateQuery(const QStringList&)));//any selection in the study table
-  QObject::connect(this->studiesTable, SIGNAL(signalQueryChanged(QStringList)),
-                   this->seriesTable, SLOT(onUpdateQuery(const QStringList&)));
-
   // For propagating patient selection changes
-  QObject::connect(this->patientsTable, SIGNAL(signalSelectionChanged(const QItemSelection&, const QItemSelection&)),
-                   q, SIGNAL(signalPatientsSelectionChanged(const QItemSelection&, const QItemSelection&)));
-  QObject::connect(this->patientsTable, SIGNAL(signalSelectionChanged(const QStringList&)),
-                   q, SIGNAL(signalPatientsSelectionChanged(const QStringList&)));
+  QObject::connect(this->patientsTable, SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
+                   q, SIGNAL(patientsSelectionChanged(const QItemSelection&, const QItemSelection&)));
+  QObject::connect(this->patientsTable, SIGNAL(selectionChanged(const QStringList&)),
+                   q, SIGNAL(patientsSelectionChanged(const QStringList&)));
 
   // For propagating study selection changes
-  QObject::connect(this->studiesTable, SIGNAL(signalSelectionChanged(const QItemSelection&, const QItemSelection&)),
-                   q, SIGNAL(signalStudiesSelectionChanged(const QItemSelection&, const QItemSelection&)));
-  QObject::connect(this->studiesTable, SIGNAL(signalSelectionChanged(const QStringList&)),
-                   q, SIGNAL(signalStudiesSelectionChanged(const QStringList&)));
+  QObject::connect(this->studiesTable, SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
+                   q, SIGNAL(studiesSelectionChanged(const QItemSelection&, const QItemSelection&)));
+  QObject::connect(this->studiesTable, SIGNAL(selectionChanged(const QStringList&)),
+                   q, SIGNAL(studiesSelectionChanged(const QStringList&)));
 
   // For propagating series selection changes
-  QObject::connect(this->seriesTable, SIGNAL(signalSelectionChanged(const QItemSelection&, const QItemSelection&)),
-                   q, SIGNAL(signalSeriesSelectionChanged(const QItemSelection&, const QItemSelection&)));
-  QObject::connect(this->seriesTable, SIGNAL(signalSelectionChanged(const QStringList&)),
-                   q, SIGNAL(signalSeriesSelectionChanged(const QStringList&)));
+  QObject::connect(this->seriesTable, SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
+                   q, SIGNAL(seriesSelectionChanged(const QItemSelection&, const QItemSelection&)));
+  QObject::connect(this->seriesTable, SIGNAL(selectionChanged(const QStringList&)),
+                   q, SIGNAL(seriesSelectionChanged(const QStringList&)));
 
   this->patientsTable->setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Preferred);
   this->studiesTable->setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Preferred);

+ 6 - 6
Libs/DICOM/Widgets/ctkDICOMTableManager.h

@@ -51,13 +51,13 @@ public:
 
 Q_SIGNALS:
   // Signals for propagating selection changes of the different tables
-  void signalPatientsSelectionChanged(const QItemSelection&, const QItemSelection&);
-  void signalStudiesSelectionChanged(const QItemSelection&, const QItemSelection&);
-  void signalSeriesSelectionChanged(const QItemSelection&, const QItemSelection&);
+  void patientsSelectionChanged(const QItemSelection&, const QItemSelection&);
+  void studiesSelectionChanged(const QItemSelection&, const QItemSelection&);
+  void seriesSelectionChanged(const QItemSelection&, const QItemSelection&);
 
-  void signalPatientsSelectionChanged(const QStringList &uids);
-  void signalStudiesSelectionChanged(const QStringList &uids);
-  void signalSeriesSelectionChanged(const QStringList &uids);
+  void patientsSelectionChanged(const QStringList &uids);
+  void studiesSelectionChanged(const QStringList &uids);
+  void seriesSelectionChanged(const QStringList &uids);
 
 protected:
   QScopedPointer<ctkDICOMTableManagerPrivate> d_ptr;