Move ctkDICOMThumbnailWidget to CTK/Widgets/ and rename it ctkThumbnailWidget

Libs/DICOM/Widgets/CMakeLists.txt

@@ -33,8 +33,6 @@ SET(KIT_SRCS
   ctkDICOMThumbnailGenerator.h
   ctkDICOMThumbnailListWidget.cpp
   ctkDICOMThumbnailListWidget.h
-  ctkDICOMThumbnailWidget.cpp
-  ctkDICOMThumbnailWidget.h
   )
 
 IF(CTK_WRAP_PYTHONQT_LIGHT)
@@ -60,7 +58,6 @@ SET(KIT_MOC_SRCS
   ctkDICOMServerNodeWidget.h
   ctkDICOMThumbnailGenerator.h
   ctkDICOMThumbnailListWidget.h
-  ctkDICOMThumbnailWidget.h
   )
 
 IF(CTK_WRAP_PYTHONQT_LIGHT)
@@ -79,7 +76,6 @@ SET(KIT_UI_FORMS
   Resources/UI/ctkDICOMQueryWidget.ui
   Resources/UI/ctkDICOMServerNodeWidget.ui
   Resources/UI/ctkDICOMThumbnailListWidget.ui
-  Resources/UI/ctkDICOMThumbnailWidget.ui
 )
 
 # Resources

Libs/DICOM/Widgets/Testing/Cpp/CMakeLists.txt

@@ -11,7 +11,6 @@ CREATE_TEST_SOURCELIST(Tests ${KIT}CppTests.cpp
   ctkDICOMQueryResultsTabWidgetTest1.cpp
   ctkDICOMQueryRetrieveWidgetTest1.cpp
   ctkDICOMServerNodeWidgetTest1.cpp
-  ctkDICOMThumbnailWidgetTest1.cpp
   )
 
 SET (TestsToRun ${Tests})
@@ -53,4 +52,3 @@ SET_PROPERTY(TEST ctkDICOMModelTest2 PROPERTY LABELS ${PROJECT_NAME})
 
 SIMPLE_TEST(ctkDICOMQueryRetrieveWidgetTest1)
 SIMPLE_TEST(ctkDICOMQueryResultsTabWidgetTest1)
-SIMPLE_TEST(ctkDICOMThumbnailWidgetTest1)

Libs/DICOM/Widgets/ctkDICOMAppWidget.cpp

@@ -48,7 +48,7 @@
 #include "ctkDICOMAppWidget.h"
 #include "ctkDICOMImportWidget.h"
 #include "ctkDICOMThumbnailGenerator.h"
-#include "ctkDICOMThumbnailWidget.h"
+#include "ctkThumbnailWidget.h"
 #include "ctkDICOMQueryResultsTabWidget.h"
 #include "ctkDICOMQueryRetrieveWidget.h"
 #include "ctkDICOMQueryWidget.h"
@@ -160,8 +160,8 @@ ctkDICOMAppWidget::ctkDICOMAppWidget(QWidget* _parent):Superclass(_parent),
   connect(d->TreeView, SIGNAL(clicked(const QModelIndex&)), d->ImagePreview, SLOT(onModelSelected(const QModelIndex &)));
   connect(d->TreeView, SIGNAL(clicked(const QModelIndex&)), this, SLOT(onModelSelected(const QModelIndex &)));
 
-  connect(d->ThumbnailsWidget, SIGNAL(selected(const ctkDICOMThumbnailWidget&)), this, SLOT(onThumbnailSelected(const ctkDICOMThumbnailWidget&)));
-  connect(d->ThumbnailsWidget, SIGNAL(doubleClicked(const ctkDICOMThumbnailWidget&)), this, SLOT(onThumbnailDoubleClicked(const ctkDICOMThumbnailWidget&)));
+  connect(d->ThumbnailsWidget, SIGNAL(selected(const ctkThumbnailWidget&)), this, SLOT(onThumbnailSelected(const ctkThumbnailWidget&)));
+  connect(d->ThumbnailsWidget, SIGNAL(doubleClicked(const ctkThumbnailWidget&)), this, SLOT(onThumbnailDoubleClicked(const ctkThumbnailWidget&)));
   connect(d->ImportDialog, SIGNAL(fileSelected(QString)),this,SLOT(onImportDirectory(QString)));
 
   connect(d->QueryRetrieveWidget, SIGNAL( canceled() ), d->QueryRetrieveWidget, SLOT( hide() ) );
@@ -291,7 +291,7 @@ void ctkDICOMAppWidget::openQueryDialog()
 }
 
 //----------------------------------------------------------------------------
-void ctkDICOMAppWidget::onThumbnailSelected(const ctkDICOMThumbnailWidget& widget)
+void ctkDICOMAppWidget::onThumbnailSelected(const ctkThumbnailWidget& widget)
 {
     Q_D(ctkDICOMAppWidget);
 
@@ -299,7 +299,7 @@ void ctkDICOMAppWidget::onThumbnailSelected(const ctkDICOMThumbnailWidget& widge
 }
 
 //----------------------------------------------------------------------------
-void ctkDICOMAppWidget::onThumbnailDoubleClicked(const ctkDICOMThumbnailWidget& widget)
+void ctkDICOMAppWidget::onThumbnailDoubleClicked(const ctkThumbnailWidget& widget)
 {
     Q_D(ctkDICOMAppWidget);
 

Libs/DICOM/Widgets/ctkDICOMAppWidget.h

@@ -27,7 +27,7 @@
 #include "ctkDICOMWidgetsExport.h"
 
 class ctkDICOMAppWidgetPrivate;
-class ctkDICOMThumbnailWidget;
+class ctkThumbnailWidget;
 class QModelIndex;
 
 class CTK_DICOM_WIDGETS_EXPORT ctkDICOMAppWidget : public QWidget
@@ -66,10 +66,10 @@ protected slots:
     void onModelSelected(const QModelIndex& index);
 
     /// To be called when a thumbnail in thumbnail list widget is selected
-    void onThumbnailSelected(const ctkDICOMThumbnailWidget& widget);
+    void onThumbnailSelected(const ctkThumbnailWidget& widget);
 
     /// To be called when a thumbnail in thumbnail list widget is double-clicked
-    void onThumbnailDoubleClicked(const ctkDICOMThumbnailWidget& widget);
+    void onThumbnailDoubleClicked(const ctkThumbnailWidget& widget);
 
     /// To be called when previous and next buttons are clicked
     void onNextImage();

Libs/DICOM/Widgets/ctkDICOMServerNodeWidget.cpp

@@ -156,7 +156,6 @@ void ctkDICOMServerNodeWidget::saveSettings()
 
   QSettings settings;
   const int rowCount = d->NodeTable->rowCount();
-  const int columnCount = d->NodeTable->columnCount();
   
   settings.setValue("ServerNodeCount", rowCount);
   for (int row = 0; row < rowCount; ++row)

Libs/DICOM/Widgets/ctkDICOMThumbnailListWidget.cpp

@@ -41,7 +41,7 @@
 
 // ctkDICOMWidgets includes
 #include "ctkDICOMThumbnailListWidget.h"
-#include "ctkDICOMThumbnailWidget.h"
+#include "ctkThumbnailWidget.h"
 #include "ui_ctkDICOMThumbnailListWidget.h"
 
 // STD includes
@@ -180,12 +180,12 @@ void ctkDICOMThumbnailListWidgetPrivate::clearAllThumbnails(){
     QLayoutItem* item;
     while((item = this->ScrollAreaContentWidget->layout()->takeAt(0)))
     {
-        ctkDICOMThumbnailWidget* thumbnailWidget = qobject_cast<ctkDICOMThumbnailWidget*>(item->widget());
+        ctkThumbnailWidget* thumbnailWidget = qobject_cast<ctkThumbnailWidget*>(item->widget());
         if(thumbnailWidget)
         {
-            q->disconnect(thumbnailWidget, SIGNAL(selected(ctkDICOMThumbnailWidget)), q, SLOT(onThumbnailSelected(ctkDICOMThumbnailWidget)));
-            q->disconnect(thumbnailWidget, SIGNAL(selected(ctkDICOMThumbnailWidget)), q, SIGNAL(selected(ctkDICOMThumbnailWidget)));
-            q->disconnect(thumbnailWidget, SIGNAL(doubleClicked(ctkDICOMThumbnailWidget)), q, SIGNAL(doubleClicked(ctkDICOMThumbnailWidget)));
+            q->disconnect(thumbnailWidget, SIGNAL(selected(ctkThumbnailWidget)), q, SLOT(onThumbnailSelected(ctkThumbnailWidget)));
+            q->disconnect(thumbnailWidget, SIGNAL(selected(ctkThumbnailWidget)), q, SIGNAL(selected(ctkThumbnailWidget)));
+            q->disconnect(thumbnailWidget, SIGNAL(doubleClicked(ctkThumbnailWidget)), q, SIGNAL(doubleClicked(ctkThumbnailWidget)));
         }
         item->widget()->deleteLater();
     }
@@ -206,7 +206,7 @@ void ctkDICOMThumbnailListWidgetPrivate::addThumbnailWidget(const QModelIndex& i
                                 model->data(seriesIndex ,ctkDICOMModel::UIDRole).toString() + "/" +
                                 model->data(imageIndex, ctkDICOMModel::UIDRole).toString() + ".png";
 
-        ctkDICOMThumbnailWidget* widget = new ctkDICOMThumbnailWidget(this->ScrollAreaContentWidget);
+        ctkThumbnailWidget* widget = new ctkThumbnailWidget(this->ScrollAreaContentWidget);
         QString widgetLabel = text;
         widget->setText( widgetLabel );
         QPixmap pix(thumbnailPath);
@@ -219,9 +219,9 @@ void ctkDICOMThumbnailListWidgetPrivate::addThumbnailWidget(const QModelIndex& i
         widget->setSourceIndex(sourceIndex);
         this->ScrollAreaContentWidget->layout()->addWidget(widget);
 
-        q->connect(widget, SIGNAL(selected(ctkDICOMThumbnailWidget)), q, SLOT(onThumbnailSelected(ctkDICOMThumbnailWidget)));
-        q->connect(widget, SIGNAL(selected(ctkDICOMThumbnailWidget)), q, SIGNAL(selected(ctkDICOMThumbnailWidget)));
-        q->connect(widget, SIGNAL(doubleClicked(ctkDICOMThumbnailWidget)), q, SIGNAL(doubleClicked(ctkDICOMThumbnailWidget)));
+        q->connect(widget, SIGNAL(selected(ctkThumbnailWidget)), q, SLOT(onThumbnailSelected(ctkThumbnailWidget)));
+        q->connect(widget, SIGNAL(selected(ctkThumbnailWidget)), q, SIGNAL(selected(ctkThumbnailWidget)));
+        q->connect(widget, SIGNAL(doubleClicked(ctkThumbnailWidget)), q, SIGNAL(doubleClicked(ctkThumbnailWidget)));
     }
 }
 
@@ -267,7 +267,7 @@ void ctkDICOMThumbnailListWidget::selectThumbnail(int index){
 
     for(int i=0; i<count; i++)
       {
-      ctkDICOMThumbnailWidget* thumbnailWidget = qobject_cast<ctkDICOMThumbnailWidget*>(d->ScrollAreaContentWidget->layout()->itemAt(i)->widget());
+      ctkThumbnailWidget* thumbnailWidget = qobject_cast<ctkThumbnailWidget*>(d->ScrollAreaContentWidget->layout()->itemAt(i)->widget());
       if(i == index)
         {
         thumbnailWidget->setSelected(true);
@@ -301,7 +301,7 @@ void ctkDICOMThumbnailListWidget::selectThumbnail(const QModelIndex &index){
 
         for(int i=0; i<count; i++)
         {
-            ctkDICOMThumbnailWidget* thumbnailWidget = qobject_cast<ctkDICOMThumbnailWidget*>(d->ScrollAreaContentWidget->layout()->itemAt(i)->widget());
+            ctkThumbnailWidget* thumbnailWidget = qobject_cast<ctkThumbnailWidget*>(d->ScrollAreaContentWidget->layout()->itemAt(i)->widget());
             if(thumbnailWidget->sourceIndex() == index){
                 thumbnailWidget->setSelected(true);
                 d->ScrollArea->ensureWidgetVisible(thumbnailWidget);
@@ -346,11 +346,11 @@ void ctkDICOMThumbnailListWidget::onModelSelected(const QModelIndex &index){
 }
 
 //----------------------------------------------------------------------------
-void ctkDICOMThumbnailListWidget::onThumbnailSelected(const ctkDICOMThumbnailWidget &widget){
+void ctkDICOMThumbnailListWidget::onThumbnailSelected(const ctkThumbnailWidget &widget){
     Q_D(ctkDICOMThumbnailListWidget);
     for(int i=0; i<d->ScrollAreaContentWidget->layout()->count(); i++)
     {
-        ctkDICOMThumbnailWidget* thumbnailWidget = qobject_cast<ctkDICOMThumbnailWidget*>(d->ScrollAreaContentWidget->layout()->itemAt(i)->widget());
+        ctkThumbnailWidget* thumbnailWidget = qobject_cast<ctkThumbnailWidget*>(d->ScrollAreaContentWidget->layout()->itemAt(i)->widget());
         if(thumbnailWidget && (&widget != thumbnailWidget))
         {
             thumbnailWidget->setSelected(false);
@@ -363,7 +363,7 @@ void ctkDICOMThumbnailListWidget::setThumbnailWidth(int width){
   Q_D(ctkDICOMThumbnailListWidget);
   for(int i=0; i<d->ScrollAreaContentWidget->layout()->count(); i++)
     {
-    ctkDICOMThumbnailWidget* thumbnailWidget = qobject_cast<ctkDICOMThumbnailWidget*>(d->ScrollAreaContentWidget->layout()->itemAt(i)->widget());
+    ctkThumbnailWidget* thumbnailWidget = qobject_cast<ctkThumbnailWidget*>(d->ScrollAreaContentWidget->layout()->itemAt(i)->widget());
     if(thumbnailWidget)
       {
         if(width > 0){

Libs/DICOM/Widgets/ctkDICOMThumbnailListWidget.h

@@ -28,7 +28,7 @@
 
 class QModelIndex;
 class ctkDICOMThumbnailListWidgetPrivate;
-class ctkDICOMThumbnailWidget;
+class ctkThumbnailWidget;
 
 class CTK_DICOM_WIDGETS_EXPORT ctkDICOMThumbnailListWidget : public QWidget
 {
@@ -53,12 +53,12 @@ private:
   Q_DISABLE_COPY(ctkDICOMThumbnailListWidget);
 
 signals:
-  void selected(const ctkDICOMThumbnailWidget& widget);
-  void doubleClicked(const ctkDICOMThumbnailWidget& widget);
+  void selected(const ctkThumbnailWidget& widget);
+  void doubleClicked(const ctkThumbnailWidget& widget);
 
 public slots:
   void onModelSelected(const QModelIndex& index);
-  void onThumbnailSelected(const ctkDICOMThumbnailWidget& widget);
+  void onThumbnailSelected(const ctkThumbnailWidget& widget);
 
   void setThumbnailWidth(int width);
 };

Libs/Widgets/CMakeLists.txt

@@ -103,6 +103,8 @@ SET(KIT_SRCS
   ctkSliderWidget.h
   ctkTestApplication.cpp
   ctkTestApplication.h
+  ctkThumbnailWidget.cpp
+  ctkThumbnailWidget.h
   ctkToolTipTrapper.cpp
   ctkToolTipTrapper.h
   ctkTransferFunctionBarsItem.cpp
@@ -201,6 +203,7 @@ SET(KIT_MOC_SRCS
   ctkQImageView.h
   ctkSliderWidget.h
   ctkTestApplication.h
+  ctkThumbnailWidget.h
   ctkToolTipTrapper.h
   ctkTransferFunctionBarsItem.h
   ctkTransferFunctionControlPointsItem.h
@@ -238,6 +241,7 @@ SET(KIT_UI_FORMS
   Resources/UI/ctkScreenshotDialog.ui
   Resources/UI/ctkSettingsDialog.ui
   Resources/UI/ctkSliderWidget.ui
+  Resources/UI/ctkThumbnailWidget.ui
   Resources/UI/ctkWorkflowGroupBox.ui
   )
 

Libs/DICOM/Widgets/Resources/UI/ctkDICOMThumbnailWidget.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>ctkDICOMThumbnailWidget</class>
- <widget class="QWidget" name="ctkDICOMThumbnailWidget">
+ <class>ctkThumbnailWidget</class>
+ <widget class="QWidget" name="ctkThumbnailWidget">
   <property name="geometry">
    <rect>
     <x>0</x>

Libs/Widgets/Testing/Cpp/CMakeLists.txt

@@ -53,6 +53,7 @@ SET(TEST_SOURCES
   ctkSettingsDialogTest1.cpp
   ctkSliderWidgetTest1.cpp
   ctkSliderWidgetTest2.cpp
+  ctkThumbnailWidgetTest1.cpp
   ctkToolTipTrapperTest1.cpp
   ctkTreeComboBoxTest1.cpp
   ctkWorkflowWidgetTest1.cpp
@@ -168,6 +169,7 @@ SIMPLE_TEST( ctkSettingsPanelTest2 )
 SIMPLE_TEST( ctkSettingsTest1 )
 SIMPLE_TEST( ctkSliderWidgetTest1 )
 SIMPLE_TEST( ctkSliderWidgetTest2 )
+SIMPLE_TEST( ctkThumbnailWidgetTest1 )
 SIMPLE_TEST( ctkToolTipTrapperTest1 )
 SIMPLE_TEST( ctkTreeComboBoxTest1 )
 SIMPLE_TEST( ctkWorkflowWidgetTest1 )

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

@@ -23,21 +23,21 @@
 #include <QTimer>
 
 // ctkDICOMCore includes
-#include "ctkDICOMThumbnailWidget.h"
+#include "ctkThumbnailWidget.h"
 
 // STD includes
 #include <iostream>
 
-int ctkDICOMThumbnailWidgetTest1( int argc, char * argv [] )
+int ctkThumbnailWidgetTest1( int argc, char * argv [] )
 {
   QApplication app(argc, argv);
 
-  ctkDICOMThumbnailWidget widget;
+  ctkThumbnailWidget widget;
 
   widget.setText("Test");
   if (widget.text() != "Test")
     {
-    std::cerr << "ctkDICOMThumbnailWidget::setText failed."
+    std::cerr << "ctkThumbnailWidget::setText failed."
               << " text: " << qPrintable(widget.text())
               << " expected: Test" << std::endl;
     return EXIT_FAILURE;
@@ -46,7 +46,7 @@ int ctkDICOMThumbnailWidgetTest1( int argc, char * argv [] )
   widget.setPixmap(QPixmap());
   if (widget.pixmap())
     {
-    std::cerr << "ctkDICOMThumbnailWidget::setPixmap failed:"
+    std::cerr << "ctkThumbnailWidget::setPixmap failed:"
               << widget.pixmap() << std::endl;
     return EXIT_FAILURE;
     }

Libs/DICOM/Widgets/ctkDICOMThumbnailWidget.cpp

@@ -19,8 +19,8 @@
 =========================================================================*/
 
 // ctkDICOMWidgets includes
-#include "ctkDICOMThumbnailWidget.h"
-#include "ui_ctkDICOMThumbnailWidget.h"
+#include "ctkThumbnailWidget.h"
+#include "ui_ctkThumbnailWidget.h"
 
 // STD includes
 #include <iostream>
@@ -30,17 +30,17 @@
 
 // logger includes
 #include "ctkLogger.h"
-static ctkLogger logger("org.commontk.DICOM.Widgets.ctkDICOMThumbnailListWidget");
+static ctkLogger logger("org.commontk.Widgets.ctkDICOMThumbnailListWidget");
 
 //----------------------------------------------------------------------------
-class ctkDICOMThumbnailWidgetPrivate: public Ui_ctkDICOMThumbnailWidget
+class ctkThumbnailWidgetPrivate: public Ui_ctkThumbnailWidget
 {
 public:
-    ctkDICOMThumbnailWidget* const q_ptr;
-    Q_DECLARE_PUBLIC(ctkDICOMThumbnailWidget);
+    ctkThumbnailWidget* const q_ptr;
+    Q_DECLARE_PUBLIC(ctkThumbnailWidget);
 
     // Constructor
-    ctkDICOMThumbnailWidgetPrivate(ctkDICOMThumbnailWidget* parent);
+    ctkThumbnailWidgetPrivate(ctkThumbnailWidget* parent);
 
     bool SelectedFlag;
     QColor BackgroundColor;
@@ -52,88 +52,88 @@ public:
 };
 
 //----------------------------------------------------------------------------
-// ctkDICOMThumbnailWidgetPrivate methods
+// ctkThumbnailWidgetPrivate methods
 
 //----------------------------------------------------------------------------
-ctkDICOMThumbnailWidgetPrivate::ctkDICOMThumbnailWidgetPrivate(ctkDICOMThumbnailWidget* parent): q_ptr(parent){
-    Q_Q(ctkDICOMThumbnailWidget);
+ctkThumbnailWidgetPrivate::ctkThumbnailWidgetPrivate(ctkThumbnailWidget* parent): q_ptr(parent){
+    Q_Q(ctkThumbnailWidget);
 
     this->SelectedFlag = false;
     this->BackgroundColor = q->palette().color(QPalette::Highlight);
 }
 
 //----------------------------------------------------------------------------
-void ctkDICOMThumbnailWidgetPrivate::updateThumbnail(){
+void ctkThumbnailWidgetPrivate::updateThumbnail(){
     this->PixmapLabel->setPixmap(this->OriginalThumbnail.scaledToWidth(this->PixmapLabel->width()));
 }
 
 //----------------------------------------------------------------------------
-// ctkDICOMThumbnailWidget methods
+// ctkThumbnailWidget methods
 
 //----------------------------------------------------------------------------
-ctkDICOMThumbnailWidget::ctkDICOMThumbnailWidget(QWidget* parentWidget)
+ctkThumbnailWidget::ctkThumbnailWidget(QWidget* parentWidget)
   : Superclass(parentWidget)
-  , d_ptr(new ctkDICOMThumbnailWidgetPrivate(this))
+  , d_ptr(new ctkThumbnailWidgetPrivate(this))
 {
-  Q_D(ctkDICOMThumbnailWidget);
+  Q_D(ctkThumbnailWidget);
 
   d->setupUi(this);
 }
 
 //----------------------------------------------------------------------------
-ctkDICOMThumbnailWidget::~ctkDICOMThumbnailWidget()
+ctkThumbnailWidget::~ctkThumbnailWidget()
 {
 }
 
 //----------------------------------------------------------------------------
-void ctkDICOMThumbnailWidget::setText(const QString &text)
+void ctkThumbnailWidget::setText(const QString &text)
 {
-  Q_D(ctkDICOMThumbnailWidget);
+  Q_D(ctkThumbnailWidget);
 
   d->TextLabel->setText(text);
 }
 
 //----------------------------------------------------------------------------
-QString ctkDICOMThumbnailWidget::text()const
+QString ctkThumbnailWidget::text()const
 {
-  Q_D(const ctkDICOMThumbnailWidget);
+  Q_D(const ctkThumbnailWidget);
   return d->TextLabel->text();
 }
 
 //----------------------------------------------------------------------------
-void ctkDICOMThumbnailWidget::setPixmap(const QPixmap &pixmap)
+void ctkThumbnailWidget::setPixmap(const QPixmap &pixmap)
 {
-  Q_D(ctkDICOMThumbnailWidget);
+  Q_D(ctkThumbnailWidget);
 
   d->OriginalThumbnail = pixmap;
   d->updateThumbnail();
 }
 
 //----------------------------------------------------------------------------
-const QPixmap* ctkDICOMThumbnailWidget::pixmap()const
+const QPixmap* ctkThumbnailWidget::pixmap()const
 {
-  Q_D(const ctkDICOMThumbnailWidget);
+  Q_D(const ctkThumbnailWidget);
 
   return &(d->OriginalThumbnail);
 }
 
 //----------------------------------------------------------------------------
-void ctkDICOMThumbnailWidget::setSourceIndex(QModelIndex index){
-    Q_D(ctkDICOMThumbnailWidget);
+void ctkThumbnailWidget::setSourceIndex(QModelIndex index){
+    Q_D(ctkThumbnailWidget);
 
     d->SourceIndex = index;
 }
 
 //----------------------------------------------------------------------------
-QModelIndex ctkDICOMThumbnailWidget::sourceIndex() const{
-    Q_D(const ctkDICOMThumbnailWidget);
+QModelIndex ctkThumbnailWidget::sourceIndex() const{
+    Q_D(const ctkThumbnailWidget);
 
     return d->SourceIndex;
 }
 
 //----------------------------------------------------------------------------
-void ctkDICOMThumbnailWidget::setSelected(bool flag){
-    Q_D(ctkDICOMThumbnailWidget);
+void ctkThumbnailWidget::setSelected(bool flag){
+    Q_D(ctkThumbnailWidget);
 
     if(flag)
     {
@@ -151,13 +151,13 @@ void ctkDICOMThumbnailWidget::setSelected(bool flag){
 }
 
 //----------------------------------------------------------------------------
-bool ctkDICOMThumbnailWidget::isSelected(){
-    Q_D(ctkDICOMThumbnailWidget);
+bool ctkThumbnailWidget::isSelected(){
+    Q_D(ctkThumbnailWidget);
     return d->SelectedFlag;
 }
 
 //----------------------------------------------------------------------------
-void ctkDICOMThumbnailWidget::mousePressEvent(QMouseEvent* event)
+void ctkThumbnailWidget::mousePressEvent(QMouseEvent* event)
 {
     Q_UNUSED(event);
     this->setSelected(true);
@@ -165,14 +165,14 @@ void ctkDICOMThumbnailWidget::mousePressEvent(QMouseEvent* event)
 }
 
 //----------------------------------------------------------------------------
-void ctkDICOMThumbnailWidget::mouseDoubleClickEvent(QMouseEvent *event){
+void ctkThumbnailWidget::mouseDoubleClickEvent(QMouseEvent *event){
     Q_UNUSED(event);
     emit doubleClicked(*this);
 }
 
 //----------------------------------------------------------------------------
-void ctkDICOMThumbnailWidget::resizeEvent(QResizeEvent *event){
-  Q_D(ctkDICOMThumbnailWidget);
+void ctkThumbnailWidget::resizeEvent(QResizeEvent *event){
+  Q_D(ctkThumbnailWidget);
   Q_UNUSED(event);
 
   d->updateThumbnail();

Libs/DICOM/Widgets/ctkDICOMThumbnailWidget.h

@@ -18,26 +18,26 @@
 
 =========================================================================*/
 
-#ifndef __ctkDICOMThumbnailWidget_h
-#define __ctkDICOMThumbnailWidget_h
+#ifndef __ctkThumbnailWidget_h
+#define __ctkThumbnailWidget_h
 
 // Qt includes 
 #include <QWidget>
 #include <QModelIndex>
 
-#include "ctkDICOMWidgetsExport.h"
+#include "ctkWidgetsExport.h"
 
-class ctkDICOMThumbnailWidgetPrivate;
+class ctkThumbnailWidgetPrivate;
 
-class CTK_DICOM_WIDGETS_EXPORT ctkDICOMThumbnailWidget : public QWidget
+class CTK_WIDGETS_EXPORT ctkThumbnailWidget : public QWidget
 {
   Q_OBJECT
   Q_PROPERTY(QString text READ text WRITE setText)
   Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap)
 public:
   typedef QWidget Superclass;
-  explicit ctkDICOMThumbnailWidget(QWidget* parent=0);
-  virtual ~ctkDICOMThumbnailWidget();
+  explicit ctkThumbnailWidget(QWidget* parent=0);
+  virtual ~ctkThumbnailWidget();
 
   void setText(const QString& text);
   QString text()const;
@@ -52,7 +52,7 @@ public:
   QModelIndex sourceIndex() const;
 
 protected:
-  QScopedPointer<ctkDICOMThumbnailWidgetPrivate> d_ptr;
+  QScopedPointer<ctkThumbnailWidgetPrivate> d_ptr;
 
   virtual void mousePressEvent(QMouseEvent* event);
   virtual void mouseDoubleClickEvent(QMouseEvent* event);
@@ -60,12 +60,12 @@ protected:
   virtual void resizeEvent(QResizeEvent* event);
 
 private:
-  Q_DECLARE_PRIVATE(ctkDICOMThumbnailWidget);
-  Q_DISABLE_COPY(ctkDICOMThumbnailWidget);
+  Q_DECLARE_PRIVATE(ctkThumbnailWidget);
+  Q_DISABLE_COPY(ctkThumbnailWidget);
 
 signals:
-  void selected(const ctkDICOMThumbnailWidget& widget);
-  void doubleClicked(const ctkDICOMThumbnailWidget& widget);
+  void selected(const ctkThumbnailWidget& widget);
+  void doubleClicked(const ctkThumbnailWidget& widget);
 };
 
 #endif