X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FCMakeLists.txt;h=7075ca1235ddb9971de164cdec680887c0b60709;hb=f2a8299c90172b676e337ed5ade8ea3e2baa7e5f;hp=c901fabf4ce7dcb1bf4cb6c7a06826ba15a76086;hpb=3378f6c372da1e07e35c45562749416fcfee6798;p=clitk.git

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index c901fab..7075ca1 100644
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -6,7 +6,12 @@ if(COMMAND cmake_policy)
   cmake_policy(SET CMP0003 NEW)
 endif(COMMAND cmake_policy)
 #=========================================================
-
+OPTION(CLITK_USE_PACS_CONNECTION "USE PACS CONNECTION"       OFF)
+IF (CLITK_USE_PACS_CONNECTION)
+	SET(CLITK_PACS_MOVE_PATH ${PROJECT_BINARY_DIR}/move)
+	file(MAKE_DIRECTORY ${CLITK_PACS_MOVE_PATH})
+	add_definitions( -DPACS_MOVE_PATH=${LIBINTERFACE_VERSION} )
+ENDIF()
 #=========================================================
 #List of vv tools to compile
 SET(vv_TOOLS
@@ -71,7 +76,6 @@ SET(vv_COMMON_WITH_UI
 SET(vv_SRCS
   vvQProgressDialogITKCommand.cxx
   vvQDicomSeriesSelector.cxx
-  vvQPacsConnection.cxx
   QTreePushButton.cxx
   vvMainWindowBase.cxx
   vvImageWarp.cxx
@@ -87,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
@@ -114,7 +118,6 @@ QT4_WRAP_CPP(vv_SRCS
   vvDocumentation.h  
   vvHelpDialog.h  
   vvQDicomSeriesSelector.h 
-  vvQPacsConnection.h
   vvSlicerManager.h
   vvStructureSetActor.h
   vvROIActor.h
@@ -124,13 +127,28 @@ QT4_WRAP_CPP(vv_SRCS
 QT4_WRAP_UI(vv_UI_CXX 
   qt_ui/vvHelpDialog.ui 
   qt_ui/vvDocumentation.ui 
-  qt_ui/vvDicomSeriesSelector.ui 
-   qt_ui/vvPacsConnection.ui 
-  qt_ui/vvDummyWindow.ui #For testing
-  )
+  qt_ui/vvDicomSeriesSelector.ui
+qt_ui/vvDummyWindow.ui 	 #For testing 
+#qt_ui/vvPacsConnection.ui
+ #    qt_ui/vvPacsSettingsDialog.ui
+)
 
 QT4_ADD_RESOURCES(vv_SRCS vvIcons.qrc)
 
+# 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
+	  )
+  QT4_WRAP_CPP(vv_SRCS vvQPacsConnection.h
+     vvPacsSettingsDialog.h)
+  QT4_WRAP_UI(vv_UI_CXX 
+	qt_ui/vvPacsConnection.ui
+     qt_ui/vvPacsSettingsDialog.ui)
+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
 if(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/vvToolsList.h)
@@ -144,15 +162,15 @@ endif(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt IS_NEWER_THAN ${CMAKE_CURRENT_B
 
 # Add the autotools and the common files ui
 foreach(tool ${vv_TOOLS} ${vv_COMMON_WITH_UI})
-    SET(vv_SRCS ${vv_SRCS} ${tool}.cxx)
-    QT4_WRAP_CPP(vv_SRCS ${tool}.h)
-    QT4_WRAP_UI(vv_UI_CXX qt_ui/${tool}.ui)
+  SET(vv_SRCS ${vv_SRCS} ${tool}.cxx)
+  QT4_WRAP_CPP(vv_SRCS ${tool}.h)
+  QT4_WRAP_UI(vv_UI_CXX qt_ui/${tool}.ui)
 endforeach(tool)
 
 # Add the common source files
 foreach(tool ${vv_COMMON})
-    SET(vv_SRCS ${vv_SRCS} ${tool}.cxx)
-    QT4_WRAP_CPP(vv_SRCS ${tool}.h)
+  SET(vv_SRCS ${vv_SRCS} ${tool}.cxx)
+  QT4_WRAP_CPP(vv_SRCS ${tool}.h)
 endforeach(tool)
 
 # if Windows and Qt was built as a static lib then don't set QT_DLL flag