X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FCMakeLists.txt;h=7d74f721cadc1d815ebcef9803b13145d13ab98c;hb=776f50aff3e47001b78e1c7dc4d51e789434f92a;hp=a0a227fc848cf71fe9cd9b9c55c3c758f29c7993;hpb=efd062fa968addfa491d08a1637bb0f414989ff5;p=clitk.git

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index a0a227f..7d74f72 100644
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -7,8 +7,7 @@ if(COMMAND cmake_policy)
   cmake_policy(SET CMP0007 NEW)
 endif(COMMAND cmake_policy)
 #=========================================================
-
-
+OPTION(CLITK_USE_PACS_CONNECTION "USE PACS CONNECTION"       OFF)
 #=========================================================
 #List of vv tools to compile
 set(vv_TOOLS
@@ -70,6 +69,7 @@ set(vv_COMMON_WITH_UI
   vvToolSimpleInputSelectorWidget
   vvToolInputSelectorWidget
   vvRegisterForm
+  vvWipeImage
 )
 
 # All others sources
@@ -91,8 +91,8 @@ set(vv_SRCS
   vvSlicerManager.cxx
   vvSlicerManagerCommand.cxx
   vvUtils.cxx
-#  vvMaximumIntensityProjection.cxx
-  vvMesh.cxx
+#  vvMaximumIntensityProjection.cxx 
+ vvMesh.cxx
   vvMeshActor.cxx
   vvMeshReader.cxx
   vvMidPosition.cxx
@@ -110,7 +110,6 @@ set(vv_SRCS
 
 #=========================================================
 # Qt related commands
-
 if(vv_QT_VERSION VERSION_GREATER "4")
   find_package(Qt5Widgets REQUIRED)
   find_package(Qt5Network REQUIRED)
@@ -176,6 +175,28 @@ if(vv_QT_VERSION VERSION_GREATER "4")
 else()
   QT4_ADD_RESOURCES(vv_SRCS vvIcons.qrc)
 endif()
+
+# Add DICOM SERVER gui selector if the adequate GDCM is available
+if(CLITK_USE_PACS_CONNECTION)
+  SET(vv_SRCS ${vv_SRCS}
+    vvQPacsConnection.cxx
+	vvPacsSettingsDialog.cxx
+	vvDicomServerQueryFactory.cxx
+	)
+  if(vv_QT_VERSION VERSION_GREATER "4")
+    qt5_wrap_cpp(vv_SRCS vvQPacsConnection.h
+      vvPacsSettingsDialog.h)
+    qt5_wrap_ui(vv_UI_CXX 
+	  qt_ui/vvPacsConnection.ui
+      qt_ui/vvPacsSettingsDialog.ui)
+  else()
+    QT4_WRAP_CPP(vv_SRCS vvQPacsConnection.h
+      vvPacsSettingsDialog.h)
+    QT4_WRAP_UI(vv_UI_CXX 
+	  qt_ui/vvPacsConnection.ui
+      qt_ui/vvPacsSettingsDialog.ui)
+  endif()
+endif(CLITK_USE_PACS_CONNECTION)
   
   # Add the autotools in the header vvToolsList.h for initialization of the dummy
   # variables in vv.cxx for the tools contained in vvLib
@@ -289,12 +310,10 @@ endif()
 
 #=========================================================
 # Use CxImage to create animated gifs
-if(CLITK_EXPERIMENTAL)
-  set(vvCxImage clitkCxImage)
-  set(vv_SRCS ${vv_SRCS} vvAnimatedGIFWriter.cxx)
-  include_directories(${CLITK_SOURCE_DIR}/utilities/CxImage)
-  add_subdirectory(${CLITK_SOURCE_DIR}/utilities/CxImage ${PROJECT_BINARY_DIR}/utilities/CxImage)
-endif(CLITK_EXPERIMENTAL)
+set(vvCxImage clitkCxImage)
+set(vv_SRCS ${vv_SRCS} vvAnimatedGIFWriter.cxx)
+include_directories(${CLITK_SOURCE_DIR}/utilities/CxImage)
+add_subdirectory(${CLITK_SOURCE_DIR}/utilities/CxImage ${PROJECT_BINARY_DIR}/utilities/CxImage)
 #=========================================================
 
 #-----------------------------------------------------------------------------