Move ctkDICOMImage into ctkDICOMWidgets

It depends on QtGUI, so it can't be in ctkDICOMCore

Libs/DICOM/Core/CMakeLists.txt

@@ -13,8 +13,6 @@ SET(KIT_SRCS
   ctkDICOMDatabase.h
   ctkDICOMDataset.cpp
   ctkDICOMDataset.h
-  ctkDICOMImage.cpp
-  ctkDICOMImage.h
   ctkDICOMIndexer.cpp
   ctkDICOMIndexer.h
   ctkDICOMModel.cpp
@@ -54,7 +52,6 @@ ENDIF()
 # Headers that should run through moc
 SET(KIT_MOC_SRCS
   ctkDICOMDatabase.h
-  ctkDICOMImage.h
   ctkDICOMModel.h
   ctkDICOMQuery.h
   ctkDICOMRetrieve.h

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

@@ -3,7 +3,6 @@ SET(KIT ${PROJECT_NAME})
 CREATE_TEST_SOURCELIST(Tests ${KIT}CppTests.cpp
   ctkDICOMDatabaseTest1.cpp
   ctkDICOMDatasetTest1.cpp
-  ctkDICOMImageTest1.cpp
   ctkDICOMIndexerTest1.cpp
   ctkDICOMModelTest1.cpp
   ctkDICOMQueryTest1.cpp
@@ -36,11 +35,6 @@ ENDMACRO( SIMPLE_TEST  )
 #
 SIMPLE_TEST(ctkDICOMDatabaseTest1)
 SIMPLE_TEST(ctkDICOMDatasetTest1)
-
-ADD_TEST( ctkDICOMImageTest1 ${KIT_TESTS}
-          ctkDICOMImageTest1 ${CTKData_DIR}/Data/DICOM/MRHEAD/000055.IMA)
-SET_PROPERTY(TEST ctkDICOMImageTest1 PROPERTY LABELS ${PROJECT_NAME})
-
 SIMPLE_TEST( ctkDICOMIndexerTest1 )
 SIMPLE_TEST( ctkDICOMPersonNameTest1)
 

Libs/DICOM/Widgets/CMakeLists.txt

@@ -13,6 +13,8 @@ SET(KIT_SRCS
   ctkDICOMDatasetView.h
   ctkDICOMDirectoryListWidget.cpp
   ctkDICOMDirectoryListWidget.h
+  ctkDICOMImage.cpp
+  ctkDICOMImage.h
   ctkDICOMListenerWidget.cpp
   ctkDICOMListenerWidget.h
   ctkDICOMQueryRetrieveWidget.cpp
@@ -50,6 +52,7 @@ ENDIF()
 SET(KIT_MOC_SRCS
   ctkDICOMDatasetView.h
   ctkDICOMDirectoryListWidget.h
+  ctkDICOMImage.h
   ctkDICOMServerNodeWidget.h
   ctkDICOMAppWidget.h
   ctkDICOMThumbnailWidget.h

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

@@ -4,6 +4,7 @@ CREATE_TEST_SOURCELIST(Tests ${KIT}CppTests.cpp
   ctkDICOMAppWidgetTest1.cpp
   ctkDICOMDatasetViewTest1.cpp
   ctkDICOMDirectoryListWidgetTest1.cpp
+  ctkDICOMImageTest1.cpp
   ctkDICOMImportWidgetTest1.cpp
   ctkDICOMListenerWidgetTest1.cpp
   ctkDICOMModelTest2.cpp
@@ -37,6 +38,11 @@ ADD_TEST( ctkDICOMDatasetViewTest1  ${KIT_TESTS}
           ctkDICOMDatasetViewTest1  ${CTKData_DIR}/Data/DICOM/MRHEAD/000055.IMA)
 SET_PROPERTY(TEST ctkDICOMDatasetViewTest1 PROPERTY LABELS ${PROJECT_NAME})
 SIMPLE_TEST(ctkDICOMDirectoryListWidgetTest1)
+
+ADD_TEST( ctkDICOMImageTest1 ${KIT_TESTS}
+          ctkDICOMImageTest1 ${CTKData_DIR}/Data/DICOM/MRHEAD/000055.IMA)
+SET_PROPERTY(TEST ctkDICOMImageTest1 PROPERTY LABELS ${PROJECT_NAME})
+
 SIMPLE_TEST(ctkDICOMImportWidgetTest1)
 SIMPLE_TEST(ctkDICOMListenerWidgetTest1)
 

Libs/DICOM/Core/ctkDICOMImage.h

@@ -26,7 +26,7 @@
 #include <QObject>
 #include <QImage>
 
-#include "ctkDICOMCoreExport.h"
+#include "ctkDICOMWidgetsExport.h"
 
 class ctkDICOMImagePrivate;
 class DicomImage;
@@ -36,7 +36,7 @@ class DicomImage;
 
   This class wraps a DicomImage object and exposes it as a Qt class.
 */
-class CTK_DICOM_CORE_EXPORT ctkDICOMImage : public QObject
+class CTK_DICOM_WIDGETS_EXPORT ctkDICOMImage : public QObject
 {
   Q_OBJECT
   Q_PROPERTY(unsigned long frameCount READ frameCount);

Plugins/org.commontk.dah.exampleapp/target_libraries.cmake

@@ -6,4 +6,5 @@
 
 SET(target_libraries
   CTKDICOMCore
+  CTKDICOMWidgets
   )