Added some style improvements

Libs/DICOM/Widgets/ctkDICOMBrowser.cpp

@@ -228,9 +228,12 @@ ctkDICOMBrowser::ctkDICOMBrowser(QWidget* _parent):Superclass(_parent),
   d->DirectoryButton->setDirectory(databaseDirectory);
 
   // TableView signals
-  connect(d->dicomTableManager, SIGNAL(patientsSelectionChanged(const QItemSelection&, const QItemSelection&)),this, SLOT(onModelSelected(const QItemSelection&,const QItemSelection&)));
-  connect(d->dicomTableManager, SIGNAL(studiesSelectionChanged(const QItemSelection&, const QItemSelection&)),this, SLOT(onModelSelected(const QItemSelection&,const QItemSelection&)));
-  connect(d->dicomTableManager, SIGNAL(seriesSelectionChanged(const QItemSelection&, const QItemSelection&)),this, SLOT(onModelSelected(const QItemSelection&,const QItemSelection&)));
+  connect(d->dicomTableManager, SIGNAL(patientsSelectionChanged(const QItemSelection&, const QItemSelection&)),
+          this, SLOT(onModelSelected(const QItemSelection&,const QItemSelection&)));
+  connect(d->dicomTableManager, SIGNAL(studiesSelectionChanged(const QItemSelection&, const QItemSelection&)),
+          this, SLOT(onModelSelected(const QItemSelection&,const QItemSelection&)));
+  connect(d->dicomTableManager, SIGNAL(seriesSelectionChanged(const QItemSelection&, const QItemSelection&)),
+          this, SLOT(onModelSelected(const QItemSelection&,const QItemSelection&)));
   d->dicomTableManager->setCTKDICOMDatabase(d->DICOMDatabase.data());
 
   connect(d->DirectoryButton, SIGNAL(directoryChanged(QString)), this, SLOT(setDatabaseDirectory(QString)));
@@ -504,8 +507,10 @@ void ctkDICOMBrowser::onImportDirectory(QString directory)
 }
 
 //----------------------------------------------------------------------------
-void ctkDICOMBrowser::onModelSelected(const QItemSelection &, const QItemSelection &)
+void ctkDICOMBrowser::onModelSelected(const QItemSelection &item1, const QItemSelection &item2)
 {
+  Q_UNUSED(item1);
+  Q_UNUSED(item2);
   Q_D(ctkDICOMBrowser);
   d->ActionRemove->setEnabled(true);
 }

Libs/DICOM/Widgets/ctkDICOMTableManager.cpp

@@ -18,7 +18,7 @@
 
 =========================================================================*/
 
-// ctk includes
+// CTK includes
 #include "ctkDICOMTableManager.h"
 #include "ctkDICOMTableView.h"
 #include "ui_ctkDICOMTableManager.h"
@@ -45,17 +45,23 @@ public:
   ctkDICOMDatabase* dicomDatabase;
 };
 
+//------------------------------------------------------------------------------
+
 ctkDICOMTableManagerPrivate::ctkDICOMTableManagerPrivate(ctkDICOMTableManager &obj)
   : q_ptr(&obj)
 {
 
 }
 
+//------------------------------------------------------------------------------
+
 ctkDICOMTableManagerPrivate::~ctkDICOMTableManagerPrivate()
 {
 
 }
 
+//------------------------------------------------------------------------------
+
 void ctkDICOMTableManagerPrivate::init()
 {
   //setup UI
@@ -87,12 +93,14 @@ void ctkDICOMTableManagerPrivate::init()
                    q, SIGNAL(seriesSelectionChanged(const QStringList&)));
 }
 
+//------------------------------------------------------------------------------
+
 void ctkDICOMTableManagerPrivate::setCTKDICOMDatabase(ctkDICOMDatabase* db)
 {
   this->patientsTable->setCTKDicomDataBase(db);
   this->studiesTable->setCTKDicomDataBase(db);
   this->seriesTable->setCTKDicomDataBase(db);
-  dicomDatabase = db;
+  this->dicomDatabase = db;
 }
 
 //----------------------------------------------------------------------------
@@ -108,6 +116,8 @@ ctkDICOMTableManager::ctkDICOMTableManager(QWidget *parent)
   d->init();
 }
 
+//------------------------------------------------------------------------------
+
 ctkDICOMTableManager::ctkDICOMTableManager(ctkDICOMDatabase *db, QWidget *parent)
   : Superclass(parent)
   , d_ptr(new ctkDICOMTableManagerPrivate(*this))
@@ -117,29 +127,39 @@ ctkDICOMTableManager::ctkDICOMTableManager(ctkDICOMDatabase *db, QWidget *parent
   d->setCTKDICOMDatabase(db);
 }
 
+//------------------------------------------------------------------------------
+
 ctkDICOMTableManager::~ctkDICOMTableManager()
 {
 
 }
 
+//------------------------------------------------------------------------------
+
 void ctkDICOMTableManager::setCTKDICOMDatabase(ctkDICOMDatabase* db)
 {
   Q_D(ctkDICOMTableManager);
   d->setCTKDICOMDatabase(db);
 }
 
-void ctkDICOMTableManager::setTableOrientation(const Qt::Orientation &o)
+//------------------------------------------------------------------------------
+
+void ctkDICOMTableManager::setTableOrientation(const Qt::Orientation &o) const
 {
-  Q_D(ctkDICOMTableManager);
+  Q_D(const ctkDICOMTableManager);
   d->tableSplitter->setOrientation(o);
 }
 
+//------------------------------------------------------------------------------
+
 Qt::Orientation ctkDICOMTableManager::tableOrientation()
 {
   Q_D(ctkDICOMTableManager);
   return d->tableSplitter->orientation();
 }
 
+//------------------------------------------------------------------------------
+
 void ctkDICOMTableManager::deleteSelectedRows()
 {
   Q_D(ctkDICOMTableManager);

Libs/DICOM/Widgets/ctkDICOMTableManager.h

@@ -18,8 +18,8 @@
 
 =========================================================================*/
 
-#ifndef CTKDICOMTABLEMANAGER_H
-#define CTKDICOMTABLEMANAGER_H
+#ifndef __ctkDICOMTableManager_h
+#define __ctkDICOMTableManager_h
 
 #include "ctkDICOMWidgetsExport.h"
 #include "ctkDICOMDatabase.h"
@@ -39,6 +39,11 @@ class ctkDICOMTableManager : public QWidget
 {
   Q_OBJECT
 
+  /**
+    * Property for setting the table layout either to vertical or horizontal alignment
+    */
+  Q_PROPERTY(Qt::Orientation tableOrientation READ tableOrientation WRITE setTableOrientation)
+
 public:
   typedef QWidget Superclass;
 
@@ -52,11 +57,7 @@ public:
    */
   void setCTKDICOMDatabase(ctkDICOMDatabase* db);
 
-  /**
-    * Property for setting the table layout either to vertical or horizontal alignment
-    */
-  Q_PROPERTY(Qt::Orientation tableOrientation READ tableOrientation WRITE setTableOrientation)
-  void setTableOrientation(const Qt::Orientation&);
+  void setTableOrientation(const Qt::Orientation&) const;
   Qt::Orientation tableOrientation();
 
   /**
@@ -82,4 +83,4 @@ private:
   Q_DISABLE_COPY(ctkDICOMTableManager)
 };
 
-#endif // CTKDICOMTABLEMANAGER_H
+#endif // __ctkDICOMTableManager_h

Libs/DICOM/Widgets/ctkDICOMTableView.cpp

@@ -23,8 +23,8 @@
 #include "ui_ctkDICOMTableView.h"
 
 // Qt includes
-#include <QSqlQueryModel>
 #include <QSortFilterProxyModel>
+#include <QSqlQueryModel>
 
 //------------------------------------------------------------------------------
 class ctkDICOMTableViewPrivate : public Ui_ctkDICOMTableView
@@ -64,6 +64,8 @@ ctkDICOMTableViewPrivate::ctkDICOMTableViewPrivate(ctkDICOMTableView &obj)
   this->dicomSQLFilterModel = new QSortFilterProxyModel();
 }
 
+//------------------------------------------------------------------------------
+
 ctkDICOMTableViewPrivate::ctkDICOMTableViewPrivate(ctkDICOMTableView &obj, ctkDICOMDatabase* db)
   : q_ptr(&obj)
   , dicomDatabase(db)
@@ -71,6 +73,8 @@ ctkDICOMTableViewPrivate::ctkDICOMTableViewPrivate(ctkDICOMTableView &obj, ctkDI
   this->dicomSQLFilterModel = new QSortFilterProxyModel();
 }
 
+//------------------------------------------------------------------------------
+
 ctkDICOMTableViewPrivate::~ctkDICOMTableViewPrivate()
 {
   delete this->dicomSQLFilterModel;
@@ -94,6 +98,8 @@ void ctkDICOMTableViewPrivate::init()
     }
 }
 
+//------------------------------------------------------------------------------
+
 void ctkDICOMTableViewPrivate::setUpTableView()
 {
   Q_Q(ctkDICOMTableView);
@@ -119,6 +125,8 @@ void ctkDICOMTableViewPrivate::setUpTableView()
     }
 }
 
+//------------------------------------------------------------------------------
+
 //Temporay solution to hide UID columns
 void ctkDICOMTableViewPrivate::hideUIDColumns()
 {
@@ -134,6 +142,8 @@ void ctkDICOMTableViewPrivate::hideUIDColumns()
     }
 }
 
+//------------------------------------------------------------------------------
+
 QStringList ctkDICOMTableViewPrivate::uidsForAllRows()
 {
   QAbstractItemModel* tableModel = this->tblDicomDatabaseView->model();
@@ -170,6 +180,8 @@ ctkDICOMTableView::ctkDICOMTableView(QWidget *parent, QString queryTableName)
   d->lblTableName->setText(queryTableName);
 }
 
+//------------------------------------------------------------------------------
+
 ctkDICOMTableView::ctkDICOMTableView(ctkDICOMDatabase* ctkDicomDataBase, QWidget *parent, QString queryTableName)
   : Superclass(parent)
   , d_ptr(new ctkDICOMTableViewPrivate(*this))
@@ -180,10 +192,14 @@ ctkDICOMTableView::ctkDICOMTableView(ctkDICOMDatabase* ctkDicomDataBase, QWidget
   d->init();
 }
 
+//------------------------------------------------------------------------------
+
 ctkDICOMTableView::~ctkDICOMTableView()
 {
 }
 
+//------------------------------------------------------------------------------
+
 void ctkDICOMTableView::setCTKDicomDataBase(ctkDICOMDatabase *dicomDatabase)
 {
   Q_D(ctkDICOMTableView);
@@ -191,6 +207,8 @@ void ctkDICOMTableView::setCTKDicomDataBase(ctkDICOMDatabase *dicomDatabase)
   d->setUpTableView();
 }
 
+//------------------------------------------------------------------------------
+
 void ctkDICOMTableView::setQueryTableName(const QString &tableName)
 {
   Q_D(ctkDICOMTableView);
@@ -198,12 +216,16 @@ void ctkDICOMTableView::setQueryTableName(const QString &tableName)
   d->lblTableName->setText(tableName);
 }
 
+//------------------------------------------------------------------------------
+
 void ctkDICOMTableView::setQueryForeignKey(const QString &foreignKey)
 {
   Q_D(ctkDICOMTableView);
   d->queryForeignKey = foreignKey;
 }
 
+//------------------------------------------------------------------------------
+
 void ctkDICOMTableView::onSelectionChanged()
 {
   Q_D(ctkDICOMTableView);
@@ -218,12 +240,16 @@ void ctkDICOMTableView::onSelectionChanged()
   emit queryChanged(uids);
 }
 
+//------------------------------------------------------------------------------
+
 void ctkDICOMTableView::onDatabaseChanged()
 {
   Q_D(ctkDICOMTableView);
   setQuery();
 }
 
+//------------------------------------------------------------------------------
+
 void ctkDICOMTableView::onUpdateQuery(const QStringList& uids)
 {
   Q_D(ctkDICOMTableView);
@@ -234,6 +260,8 @@ void ctkDICOMTableView::onUpdateQuery(const QStringList& uids)
   emit queryChanged(newUIDS);
 }
 
+//------------------------------------------------------------------------------
+
 void ctkDICOMTableView::onFilterChanged()
 {
   Q_D(ctkDICOMTableView);
@@ -242,6 +270,8 @@ void ctkDICOMTableView::onFilterChanged()
   emit queryChanged(uids);
 }
 
+//------------------------------------------------------------------------------
+
 void ctkDICOMTableView::setQuery(const QStringList &uids)
 {
   Q_D(ctkDICOMTableView);
@@ -260,6 +290,7 @@ void ctkDICOMTableView::setQuery(const QStringList &uids)
     d->dicomSQLModel.setQuery(query, d->dicomDatabase->database());
 }
 
+//------------------------------------------------------------------------------
 
 QStringList ctkDICOMTableView::currentSelection()
 {