X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FCMakeLists.txt;h=9453e1b0362114fecc112a6a3e1b9ec21b81c992;hb=ede4bde17381eccd3641cd3e27470213f442ab03;hp=c61497546f75320380adbb17de22be78d44e2c5e;hpb=59f4a998a65e0ffa4a83193706ed2d9a3d40edb9;p=clitk.git

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index c614975..9453e1b 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,10 @@ set(vv_TOOLS
   vvToolCropImage
   vvToolBinarize
   vvToolImageArithm
-  vvToolResample
   vvToolMIP
   vvToolConvert ## with dummy vvToolConvert.ui
   vvToolROIManager
   vvToolSegmentation
-  vvToolProfile
   ## these ones are for tests (not working)
   # vvToolTest
   # vvToolFoo
@@ -34,12 +37,18 @@ set(vv_TOOLS
   # vvToolExtractLung
   # vvToolStructureSetManager
 )
+#List of vv tools to compile
+#Ensure compatibility with QVTKOpenGL for VTK < v8.1 and QVTKOpenGLNativeWidget for others
+set(vv_TOOLS_VTK7
+  vvToolProfile
+  vvToolHistogram
+)
 # dependencies of the tools
 # Future issues : when tool depend on other tools ... how to manage that ?
 #  >> 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)
@@ -60,8 +69,6 @@ set(vv_COMMON_WITH_UI
   vvOverlayPanel
   vvLandmarksPanel
   vvProgressDialog
-  vvSegmentationDialog
-  vvSurfaceViewerDialog
   vvDeformationDialog
   vvStructSelector
   vvIntensityValueSlider
@@ -71,6 +78,13 @@ set(vv_COMMON_WITH_UI
   vvToolInputSelectorWidget
   vvRegisterForm
 )
+# in COMMON_WITH_UI -> must have .h and .cxx and VTK7.ui
+#Ensure compatibility with QVTKOpenGL for VTK < v8.1 and QVTKOpenGLNativeWidget for others
+set(vv_COMMON_WITH_UI_VTK7
+  vvMainWindow
+  vvSegmentationDialog
+  vvSurfaceViewerDialog
+)
 
 # All others sources
 set(vv_SRCS
@@ -90,9 +104,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
@@ -114,10 +129,19 @@ if(vv_QT_VERSION VERSION_GREATER "4")
   find_package(Qt5Widgets REQUIRED)
   find_package(Qt5Network REQUIRED)
   find_package(Qt5Designer REQUIRED)
+else()
+  find_package(Qt4 REQUIRED)
+endif()
 
+if(vv_QT_VERSION VERSION_GREATER "4")
   link_directories(${QT5Widgets_LIBRARIES})
   link_directories(${QT5Network_LIBRARIES})
   link_directories(${QT5Designer_LIBRARIES})
+else()
+  link_directories(${QT_LIBRARY_DIR})
+endif()
+
+if(vv_QT_VERSION VERSION_GREATER "4")
   qt5_wrap_cpp(vv_SRCS
     vvMainWindowBase.h
     QTreePushButton.h
@@ -130,69 +154,7 @@ if(vv_QT_VERSION VERSION_GREATER "4")
     vvROIActor.h
     vvToolCreatorBase.h
     )
-  
-  qt5_wrap_ui(vv_UI_CXX
-    qt_ui/vvHelpDialog.ui
-    qt_ui/vvDocumentation.ui
-    qt_ui/vvDicomSeriesSelector.ui
-    qt_ui/vvDummyWindow.ui #For testing
-    )
-  
-  QT5_add_resources(vv_SRCS vvIcons.qrc)
-  
-  # 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)
-    file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/vvToolsList.h)
-    foreach(tool ${vv_TOOLS})
-      file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/vvToolsList.h "#include \"${tool}.h\"\n")
-      file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/vvToolsList.h "extern const vvToolCreator<${tool}> *dummy${tool};\n")
-      file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/vvToolsList.h "const vvToolCreator<${tool}> *dummy${tool}2 = dummy${tool};\n\n")
-    endforeach(tool)
-  endif(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/vvToolsList.h)
-  
-  # Add the autotools and the common files ui
-  foreach(tool ${vv_TOOLS} ${vv_COMMON_WITH_UI})
-      set(vv_SRCS ${vv_SRCS} ${tool}.cxx)
-      QT5_WRAP_CPP(vv_SRCS ${tool}.h)
-      QT5_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)
-      QT5_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
-  set(QT_STATIC 0)
-  if(WIN32)
-    if(EXISTS ${Qt5Widgets_LIBRARIES}/QtCore.prl)
-      file(READ ${Qt5Widgets_LIBRARIES}/QtCore.prl QT_CORE_PRL)
-      if(${QT_CORE_PRL} MATCHES "static")
-        set(QT_STATIC 1)
-      endif(${QT_CORE_PRL} MATCHES "static")
-    endif(EXISTS ${Qt5Widgets_LIBRARIES}/QtCore.prl)
-  endif(WIN32)
-  if(NOT QT_STATIC)
-    add_definitions(-DQT_DLL)
-  endif(NOT QT_STATIC)
- 
-  add_definitions(-DQT_THREAD_SUPPORT)
-  include_directories(
-    ${Qt5Widgets_INCLUDE_DIRS}
-    ${Qt5Gui_INCLUDE_DIRS}
-    ${Qt5Core_INCLUDE_DIRS}
-    ${Qt5Network_INCLUDE_DIRS}
-    ${Qt5Designer_INCLUDE_DIRS}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    )
 else()
-  find_package(Qt4 REQUIRED)
-  link_directories(${QT_LIBRARY_DIR})
-  
-  
   QT4_WRAP_CPP(vv_SRCS
     vvMainWindowBase.h
     QTreePushButton.h
@@ -200,25 +162,62 @@ else()
     vvHelpDialog.h
     vvQDicomSeriesSelector.h
     vvSlicerManager.h
+    vvSlicer.h
     vvStructureSetActor.h
     vvROIActor.h
     vvToolCreatorBase.h
     )
-  
+endif()
+
+if(vv_QT_VERSION VERSION_GREATER "4")
+  qt5_wrap_ui(vv_UI_CXX
+    qt_ui/vvHelpDialog.ui
+    qt_ui/vvDocumentation.ui
+    qt_ui/vvDicomSeriesSelector.ui
+    qt_ui/vvDummyWindow.ui #For testing
+    )
+else()
   QT4_WRAP_UI(vv_UI_CXX
     qt_ui/vvHelpDialog.ui
     qt_ui/vvDocumentation.ui
     qt_ui/vvDicomSeriesSelector.ui
     qt_ui/vvDummyWindow.ui #For testing
     )
-  
+endif()
+
+if(vv_QT_VERSION VERSION_GREATER "4")
+  QT5_add_resources(vv_SRCS vvIcons.qrc)
+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
   if(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/vvToolsList.h)
     file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/vvToolsList.h)
-    foreach(tool ${vv_TOOLS})
+    foreach(tool ${vv_TOOLS} ${vv_TOOLS_VTK7})
       file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/vvToolsList.h "#include \"${tool}.h\"\n")
       file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/vvToolsList.h "extern const vvToolCreator<${tool}> *dummy${tool};\n")
       file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/vvToolsList.h "const vvToolCreator<${tool}> *dummy${tool}2 = dummy${tool};\n\n")
@@ -228,41 +227,91 @@ else()
   # 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)
+      if(vv_QT_VERSION VERSION_GREATER "4")
+        QT5_WRAP_CPP(vv_SRCS ${tool}.h)
+        QT5_WRAP_UI(vv_UI_CXX qt_ui/${tool}.ui)
+      else()
+        QT4_WRAP_CPP(vv_SRCS ${tool}.h)
+        QT4_WRAP_UI(vv_UI_CXX qt_ui/${tool}.ui)
+      endif()
+  endforeach(tool)
+
+  #Special case for Main Window with QVTKWidget according VTK version
+  foreach(tool ${vv_TOOLS_VTK7} ${vv_COMMON_WITH_UI_VTK7})
+      set(vv_SRCS ${vv_SRCS} ${tool}.cxx)
+      if(VTK_VERSION VERSION_GREATER "8.0.0")
+        if(vv_QT_VERSION VERSION_GREATER "4")
+          QT5_WRAP_CPP(vv_SRCS ${tool}.h)
+          QT5_WRAP_UI(vv_UI_CXX qt_ui/${tool}.ui)
+        else()
+          QT4_WRAP_CPP(vv_SRCS ${tool}.h)
+          QT4_WRAP_UI(vv_UI_CXX qt_ui/${tool}.ui)
+        endif()
+      else()
+        if(vv_QT_VERSION VERSION_GREATER "4")
+          QT5_WRAP_CPP(vv_SRCS ${tool}.h)
+          QT5_WRAP_UI(vv_UI_CXX qt_ui/${tool}VTK7.ui)
+        else()
+          QT4_WRAP_CPP(vv_SRCS ${tool}.h)
+          QT4_WRAP_UI(vv_UI_CXX qt_ui/${tool}VTK7.ui)
+        endif()
+      endif()
   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)
+      if(vv_QT_VERSION VERSION_GREATER "4")
+        QT5_WRAP_CPP(vv_SRCS ${tool}.h)
+      else()
+        QT4_WRAP_CPP(vv_SRCS ${tool}.h)
+      endif()
   endforeach(tool)
   
   # if Windows and Qt was built as a static lib then don't set QT_DLL flag
   set(QT_STATIC 0)
   if(WIN32)
-    if(EXISTS ${QT_LIBRARY_DIR}/QtCore.prl)
-      file(READ ${QT_LIBRARY_DIR}/QtCore.prl QT_CORE_PRL)
-      if(${QT_CORE_PRL} MATCHES "static")
-        set(QT_STATIC 1)
-      endif(${QT_CORE_PRL} MATCHES "static")
-    endif(EXISTS ${QT_LIBRARY_DIR}/QtCore.prl)
+    if(vv_QT_VERSION VERSION_GREATER "4")
+      if(EXISTS ${Qt5Widgets_LIBRARIES}/QtCore.prl)
+        file(READ ${Qt5Widgets_LIBRARIES}/QtCore.prl QT_CORE_PRL)
+        if(${QT_CORE_PRL} MATCHES "static")
+          set(QT_STATIC 1)
+        endif(${QT_CORE_PRL} MATCHES "static")
+      endif(EXISTS ${Qt5Widgets_LIBRARIES}/QtCore.prl)
+    else()
+      if(EXISTS ${QT_LIBRARY_DIR}/QtCore.prl)
+        file(READ ${QT_LIBRARY_DIR}/QtCore.prl QT_CORE_PRL)
+        if(${QT_CORE_PRL} MATCHES "static")
+          set(QT_STATIC 1)
+        endif(${QT_CORE_PRL} MATCHES "static")
+      endif(EXISTS ${QT_LIBRARY_DIR}/QtCore.prl)
+    endif()
   endif(WIN32)
   if(NOT QT_STATIC)
     add_definitions(-DQT_DLL)
   endif(NOT QT_STATIC)
-  
+
   add_definitions(-DQT_THREAD_SUPPORT)
-  
-  include_directories(
-    ${QT_INCLUDES}
-    ${QT_INCLUDE_DIR}
-    ${QT_QTGUI_INCLUDE_DIR}
-    ${QT_QTCORE_INCLUDE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-  )
-endif()
+  if(vv_QT_VERSION VERSION_GREATER "4")
+    include_directories(
+      ${Qt5Widgets_INCLUDE_DIRS}
+      ${Qt5Gui_INCLUDE_DIRS}
+      ${Qt5Core_INCLUDE_DIRS}
+      ${Qt5Network_INCLUDE_DIRS}
+      ${Qt5Designer_INCLUDE_DIRS}
+      ${CMAKE_CURRENT_BINARY_DIR}
+      ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+  else()
+    include_directories(
+      ${QT_INCLUDES}
+      ${QT_INCLUDE_DIR}
+      ${QT_QTGUI_INCLUDE_DIR}
+      ${QT_QTCORE_INCLUDE_DIR}
+      ${CMAKE_CURRENT_BINARY_DIR}
+      ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+  endif()
 #=========================================================
 
 #=========================================================
@@ -283,14 +332,14 @@ include_directories(
 
 #=========================================================
 #Add each tool's dependencies
-foreach(tool ${vv_TOOLS})
+foreach(tool ${vv_TOOLS} ${vv_TOOLS_VTK7})
   set(toolLibs ${toolLibs} ${${tool}_LIBS})
 endforeach(tool)
 
 #=========================================================
 #Add Foundation Libraries (this should be after our libraries, since we depend
 #on them)
-if(vv_QT_VERSION VERSION_GREATER "4")
+if(VTK_VERSION VERSION_GREATER "6.2.0")
 set(foundationLibraries clitkCommon ${ITK_LIBRARIES} ${VTK_LIBRARIES})
 else()
 set(foundationLibraries clitkCommon ${ITK_LIBRARIES} QVTK vtkHybrid)
@@ -298,12 +347,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)
 #=========================================================
 
 #-----------------------------------------------------------------------------
@@ -327,9 +374,9 @@ endif()
 if(vv_QT_VERSION VERSION_GREATER "4")
 set(vvExternalLibs clitkSegmentationGgoLib ${toolLibs} ${foundationLibraries} ${vvCxImage} Qt5::Widgets Qt5::Network Qt5::Designer ${APPLE_FRAMEWORKS})
 else()
-set(vvExternalLibs clitkSegmentationGgoLib ${toolLibs} ${foundationLibraries} ${vvCxImage} ${QT_LIBRARIES} ${QT_QTNETWORK_LIBRARY} ${APPLE_FRAMEWORKS})
+set(vvExternalLibs clitkSegmentationGgoLib ${toolLibs} ${foundationLibraries} ${vvCxImage} ${QT_LIBRARIES} ${APPLE_FRAMEWORKS})
 endif()
-# QtNetwork is required by vvRegisterForm
+# QtNetwork is required by vvRegisterForm ${QT_QTNETWORK_LIBRARY}
 
 #-----------------------------------------------------------------------------
 # For retina displays, see
@@ -351,7 +398,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)
 
 #=========================================================