Add Qt Designer plugins to DICOM widgets

Libs/DICOM/Widgets/CMakeLists.txt

@@ -97,9 +97,9 @@ ctkMacroBuildLib(
   )
 
 # Plugins
-#IF(BUILD_QTDESIGNER_PLUGINS)
-#  ADD_SUBDIRECTORY(Plugins)
-#ENDIF()
+IF(BUILD_QTDESIGNER_PLUGINS)
+  ADD_SUBDIRECTORY(Plugins)
+ENDIF()
 
 # Testing
 IF(BUILD_TESTING)

Libs/DICOM/Widgets/Plugins/CMakeLists.txt

@@ -12,15 +12,16 @@ SET(PLUGIN_SRCS
   ctkDICOMWidgetsPlugins.h
   ctkDICOMWidgetsAbstractPlugin.cpp
   ctkDICOMWidgetsAbstractPlugin.h
-  ctkQueryRetrieveWidgetPlugin.cpp
-  ctkQueryRetrieveWidgetPlugin.h
+
+  ctkDICOMQueryRetrieveWidgetPlugin.cpp
+  ctkDICOMQueryRetrieveWidgetPlugin.h
   )
 
 # Headers that should run through moc
 SET(PLUGIN_MOC_SRCS
   ctkDICOMWidgetsPlugins.h
 
-  ctkQueryRetrieveWidgetPlugin.h
+  ctkDICOMQueryRetrieveWidgetPlugin.h
   )
 
 # Resources

Libs/DICOM/Widgets/Plugins/ctkDICOMQueryRetrieveWidget.cpp

@@ -19,24 +19,24 @@
 =========================================================================*/
 
 // CTK includes
-#include "ctkDICOMQueryRetrievePlugin.h"
-#include "ctkDICOMQueryRetrieve.h"
+#include "ctkDICOMQueryRetrieveWidgetPlugin.h"
+#include "ctkDICOMQueryRetrieveWidget.h"
 
 //-----------------------------------------------------------------------------
-ctkDICOMQueryRetrievePlugin::ctkDICOMQueryRetrievePlugin(QObject* pluginParent)
+ctkDICOMQueryRetrieveWidgetPlugin::ctkDICOMQueryRetrieveWidgetPlugin(QObject* pluginParent)
   : QObject(pluginParent)
 {
 }
 
 //-----------------------------------------------------------------------------
-QWidget *ctkDICOMQueryRetrievePlugin::createWidget(QWidget *parentForWidget)
+QWidget *ctkDICOMQueryRetrieveWidgetPlugin::createWidget(QWidget *parentForWidget)
 {
-  ctkDICOMQueryRetrieve* newWidget = new ctkDICOMQueryRetrieve(parentForWidget);
+  ctkDICOMQueryRetrieveWidget* newWidget = new ctkDICOMQueryRetrieveWidget(parentForWidget);
   return newWidget;
 }
 
 //-----------------------------------------------------------------------------
-QString ctkDICOMQueryRetrievePlugin::domXml() const
+QString ctkDICOMQueryRetrieveWidgetPlugin::domXml() const
 {
   return "<widget class=\"ctkDICOMQueryRetrieve\" \
           name=\"QueryRetrieve\">\n"
@@ -44,25 +44,25 @@ QString ctkDICOMQueryRetrievePlugin::domXml() const
 }
 
 // --------------------------------------------------------------------------
-QIcon ctkDICOMQueryRetrievePlugin::icon() const
+QIcon ctkDICOMQueryRetrieveWidgetPlugin::icon() const
 {
   return QIcon(":/Icons/listview.png");
 }
 
 //-----------------------------------------------------------------------------
-QString ctkDICOMQueryRetrievePlugin::includeFile() const
+QString ctkDICOMQueryRetrieveWidgetPlugin::includeFile() const
 {
   return "ctkDICOMQueryRetrieve.h";
 }
 
 //-----------------------------------------------------------------------------
-bool ctkDICOMQueryRetrievePlugin::isContainer() const
+bool ctkDICOMQueryRetrieveWidgetPlugin::isContainer() const
 {
   return false;
 }
 
 //-----------------------------------------------------------------------------
-QString ctkDICOMQueryRetrievePlugin::name() const
+QString ctkDICOMQueryRetrieveWidgetPlugin::name() const
 {
   return "ctkDICOMQueryRetrieve";
 }

Libs/DICOM/Widgets/Plugins/ctkDICOMQueryRetrieveWidget.h

@@ -22,16 +22,16 @@
 #define __ctkDICOMQueryRetrievePlugin_h
 
 // CTK includes
-#include "ctkWidgetsAbstractPlugin.h"
+#include "ctkDICOMWidgetsAbstractPlugin.h"
 
-class CTK_DICOM_WIDGETS_PLUGINS_EXPORT ctkDICOMQueryRetrievePlugin
+class CTK_DICOM_WIDGETS_PLUGINS_EXPORT ctkDICOMQueryRetrieveWidgetPlugin
   : public QObject
-  , public ctkWidgetsAbstractPlugin
+  , public ctkDICOMWidgetsAbstractPlugin
 {
   Q_OBJECT
 
 public:
-  ctkDICOMQueryRetrievePlugin(QObject *_parent = 0);
+  ctkDICOMQueryRetrieveWidgetPlugin(QObject *_parent = 0);
   
   QWidget *createWidget(QWidget *_parent);
   QString  domXml() const; 

Libs/DICOM/Widgets/Plugins/ctkDICOMWidgetsPlugins.h

@@ -26,7 +26,7 @@
 
 // CTK includes
 #include "ctkDICOMWidgetsPluginsExport.h"
-#include "ctkQueryRetrieveWidgetPlugin.h"
+#include "ctkDICOMQueryRetrieveWidgetPlugin.h"
 
 /// \class Group the plugins in one library
 class CTK_DICOM_WIDGETS_PLUGINS_EXPORT ctkDICOMWidgetsPlugins
@@ -40,7 +40,7 @@ public:
   QList<QDesignerCustomWidgetInterface*> customWidgets() const
     {
     QList<QDesignerCustomWidgetInterface *> plugins;
-    plugins << new ctkQueryRetrieveWidgetPlugin
+    plugins << new ctkDICOMQueryRetrieveWidgetPlugin;
     return plugins;
     }
 };