X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FCMakeLists.txt;h=107fdefd4f91412de42156ebb29fe3c7c228d8ab;hb=HEAD;hp=47589dde17d438207e462073bd16b1982ef18e4b;hpb=c234e07e4ef90bb8b08c75ca4f1b3a76055e7859;p=clitk.git diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt index 47589dd..107fdef 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 @@ -110,7 +125,6 @@ set(vv_SRCS #========================================================= # Qt related commands - if(vv_QT_VERSION VERSION_GREATER "4") find_package(Qt5Widgets REQUIRED) find_package(Qt5Network REQUIRED) @@ -176,12 +190,34 @@ 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 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") @@ -199,6 +235,28 @@ endif() 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_LESS "8.2.0") + 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() + else() + 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() + endif() + endforeach(tool) # Add the common source files foreach(tool ${vv_COMMON}) @@ -274,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) @@ -289,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) #========================================================= #----------------------------------------------------------------------------- @@ -318,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 @@ -342,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) #=========================================================