Cleanup ctkThumbnailListWidget and ctkDICOMThumbnailListWidget

Fix compilation warnings reported by dashboards.

Libs/DICOM/Widgets/Testing/Cpp/ctkDICOMThumbnailListWidgetTest1.cpp

@@ -44,7 +44,8 @@ int ctkDICOMThumbnailListWidgetTest1( int argc, char * argv [] )
 
   try
     {
-    ctkDICOMDatabase myCTK( argv[1] );
+    QFileInfo databasePath(QString(argv[1]));
+    ctkDICOMDatabase myCTK( databasePath.absoluteFilePath() );
 
     if (!myCTK.initializeDatabase(argv[2]))
       {
@@ -56,8 +57,7 @@ int ctkDICOMThumbnailListWidgetTest1( int argc, char * argv [] )
     model.setDatabase(myCTK.database());
 
     ctkDICOMThumbnailListWidget widget;
-    //widget.setDatabaseDirectory(QDir::currentPath());
-    widget.setDatabaseDirectory("E:\\work\\CTK\\CTK-VTK-64\\CTK-build\\Libs\\DICOM\\Widgets\\Testing\\Cpp");
+    widget.setDatabaseDirectory(databasePath.absolutePath());
     widget.addThumbnails(model.index(0,0));
     widget.show();
 

Libs/DICOM/Widgets/ctkDICOMThumbnailListWidget.cpp

@@ -94,7 +94,6 @@ ctkDICOMThumbnailListWidgetPrivate
 void ctkDICOMThumbnailListWidgetPrivate
 ::addPatientThumbnails(const QModelIndex &index)
 {
-  Q_Q(ctkDICOMThumbnailListWidget);
   QModelIndex patientIndex = index;
 
   ctkDICOMModel* model = const_cast<ctkDICOMModel*>(
@@ -122,7 +121,6 @@ void ctkDICOMThumbnailListWidgetPrivate
 void ctkDICOMThumbnailListWidgetPrivate
 ::addStudyThumbnails(const QModelIndex &index)
 {
-  Q_Q(ctkDICOMThumbnailListWidget);
   QModelIndex studyIndex = index;
 
   ctkDICOMModel* model = const_cast<ctkDICOMModel*>(qobject_cast<const ctkDICOMModel*>(index.model()));
@@ -148,7 +146,6 @@ void ctkDICOMThumbnailListWidgetPrivate
 void ctkDICOMThumbnailListWidgetPrivate
 ::addSeriesThumbnails(const QModelIndex &index)
 {
-  Q_Q(ctkDICOMThumbnailListWidget);
   QModelIndex studyIndex = index.parent();
   QModelIndex seriesIndex = index;
 
@@ -175,9 +172,8 @@ void ctkDICOMThumbnailListWidgetPrivate
 ::addThumbnailWidget(const QModelIndex& imageIndex,
                      const QModelIndex& sourceIndex, const QString &text)
 {
-  Q_Q(ctkDICOMThumbnailListWidget);
-
-  ctkDICOMModel* model = const_cast<ctkDICOMModel*>(qobject_cast<const ctkDICOMModel*>(imageIndex.model()));
+  ctkDICOMModel* model = const_cast<ctkDICOMModel*>(
+    qobject_cast<const ctkDICOMModel*>(imageIndex.model()));
 
   if(!model)
     {

Libs/Widgets/ctkThumbnailListWidget.cpp

@@ -54,6 +54,8 @@ static ctkLogger logger("org.commontk.Widgets.ctkThumbnailListWidget");
 ctkThumbnailListWidgetPrivate
 ::ctkThumbnailListWidgetPrivate(ctkThumbnailListWidget* parent)
   : q_ptr(parent)
+  , CurrentThumbnail(-1)
+  , ThumbnailSize(-1, -1)
   , RequestRelayout(false)
 {
 }
@@ -70,9 +72,6 @@ void ctkThumbnailListWidgetPrivate::init()
   flowLayout->setHorizontalSpacing(4);
   this->ScrollAreaContentWidget->setLayout(flowLayout);
   this->ScrollArea->installEventFilter(q);
-
-  this->ThumbnailSize = QSize(-1, -1);
-  this->CurrentThumbnail = -1;
 }
 
 //----------------------------------------------------------------------------
@@ -185,16 +184,16 @@ void ctkThumbnailListWidget::addThumbnails(const QList<QPixmap>& thumbnails)
 {
   for(int i=0; i<thumbnails.count(); i++)
     {
-    this->addThumbnail("", thumbnails[i]);
+    this->addThumbnail(thumbnails[i]);
     }
 }
 
 //----------------------------------------------------------------------------
-void ctkThumbnailListWidget::addThumbnail(const QString& label, const QPixmap& pixmap)
+void ctkThumbnailListWidget::addThumbnail(const QPixmap& pixmap, const QString& label)
 {
   Q_D(ctkThumbnailListWidget);
   ctkThumbnailLabel* widget = new ctkThumbnailLabel(d->ScrollAreaContentWidget);
-  widget->setText("");
+  widget->setText(label);
   if(d->ThumbnailSize.isValid())
     {
     widget->setFixedSize(d->ThumbnailSize);

Libs/Widgets/ctkThumbnailListWidget.h

@@ -43,7 +43,7 @@ public:
   virtual ~ctkThumbnailListWidget();
 
   /// Add a thumbnail to the widget
-  void addThumbnail(const QString& label, const QPixmap& thumbnail);
+  void addThumbnail(const QPixmap& thumbnail, const QString& label = QString());
 
   /// Add multiple thumbnails to the widget
   void addThumbnails(const QList<QPixmap>& thumbnails);

Libs/Widgets/ctkThumbnailListWidget_p.h

@@ -43,13 +43,13 @@ public:
   void addThumbnail(ctkThumbnailLabel* thumbnail);
   void updateScrollAreaContentWidgetSize(QSize size);
 
+protected:
+  ctkThumbnailListWidget* const q_ptr;
+
   int CurrentThumbnail;
   QSize ThumbnailSize;
   bool RequestRelayout;
 
-protected:
-  ctkThumbnailListWidget* const q_ptr;
-
 private:
   Q_DISABLE_COPY( ctkThumbnailListWidgetPrivate );
 };