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

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index a0a227f..fe6120e 100644
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -7,9 +7,14 @@ if(COMMAND cmake_policy)
   cmake_policy(SET CMP0007 NEW)
 endif(COMMAND cmake_policy)
 #=========================================================
+OPTION(CLITK_USE_PACS_CONNECTION "USE PACS CONNECTION"       OFF)
+#=========================================================
 
+# Look for OpenGL2 version
+if (VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
+  add_definitions(-DVTK_OPENGL2)
+endif ()
 
-#=========================================================
 #List of vv tools to compile
 set(vv_TOOLS
   vvToolMedianFilter
@@ -17,12 +22,12 @@ set(vv_TOOLS
   vvToolCropImage
   vvToolBinarize
   vvToolImageArithm
-  vvToolResample
   vvToolMIP
   vvToolConvert ## with dummy vvToolConvert.ui
   vvToolROIManager
   vvToolSegmentation
   vvToolProfile
+  vvToolHistogram
   ## these ones are for tests (not working)
   # vvToolTest
   # vvToolFoo
@@ -39,7 +44,7 @@ set(vv_TOOLS
 #  >> add the relevant $_LIBS variable to the tool that has dependencies?
 set(vvToolBinarize_LIBS clitkBinarizeImageLib)
 set(vvToolProfile_LIBS clitkProfileImageLib)
-set(vvToolResample_LIBS clitkResampleImageLib)
+set(vvToolHistogram_LIBS clitkHistogramImageLib)
 set(vvToolConvert_LIBS clitkImageConvertLib)
 set(vvToolExtractPatient_LIBS clitkSegmentationGgoLib)
 set(vvToolExtractLung_LIBS clitkSegmentationGgoLib)
@@ -90,9 +95,10 @@ set(vv_SRCS
   vvGlyph2D.cxx
   vvSlicerManager.cxx
   vvSlicerManagerCommand.cxx
+  vvToolHistogramCommand.cxx
   vvUtils.cxx
-#  vvMaximumIntensityProjection.cxx
-  vvMesh.cxx
+#  vvMaximumIntensityProjection.cxx 
+ vvMesh.cxx
   vvMeshActor.cxx
   vvMeshReader.cxx
   vvMidPosition.cxx
@@ -110,7 +116,6 @@ set(vv_SRCS
 
 #=========================================================
 # Qt related commands
-
 if(vv_QT_VERSION VERSION_GREATER "4")
   find_package(Qt5Widgets REQUIRED)
   find_package(Qt5Network REQUIRED)
@@ -176,6 +181,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 +316,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)
 #=========================================================
 
 #-----------------------------------------------------------------------------
@@ -342,7 +367,7 @@ target_link_libraries(vv vvLib)
 
 #=========================================================
 # Install options (also used by CPack)
-install(TARGETS vv DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
+install(TARGETS vv DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
 #=========================================================