X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=vv%2FCMakeLists.txt;h=d74b2bbf44368236c019af964bf3eb6c2b60a475;hb=2691ab3b136c618dd64f634507133e91e1a9c468;hp=dd94292ec3b53d034179d5c4267b26f2ffbf0bb1;hpb=0bc523c0d2c4d7ea87d7aaa4720a6f1ea03fbe2a;p=clitk.git

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index dd94292..d74b2bb 100644
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -42,6 +42,7 @@ endif(COMMAND cmake_policy)
 LINK_LIBRARIES (
   #ITKIO
   clitkCommon
+  clitkDicomRTStruct
   #clitkGGO
   clitkFilters
   ${QT_QTCORE_LIBRARY}
@@ -70,15 +71,12 @@ SET(vv_SRCS
   vvQProgressDialogITKCommand.cxx
   vvQDicomSeriesSelector.cxx
   QTreePushButton.cxx
-  vvResamplerDialog.cxx
   vvSegmentationDialog.cxx
   vvSurfaceViewerDialog.cxx
+  vvMainWindowBase.cxx
   vvMainWindow.cxx
   vvDeformationDialog.cxx
-  vvInit.cxx
   vvImageWarp.cxx
-  nkitkXDRImageIOFactory.cxx  
-  nkitkXDRImageIOReader.cxx  
   vvDeformableRegistration.cxx
   vtkVOXImageWriter.cxx
   vvInteractorStyleNavigator.cxx
@@ -99,18 +97,30 @@ SET(vv_SRCS
   vvMeshActor.cxx
   vvMeshReader.cxx
   vvStructSelector.cxx
-  vvCropDialog.cxx
   vvMidPosition.cxx
   vvImageMapToWLColors.cxx
   vvIntensityValueSlider.cxx
   vvToolManager.cxx
   vvToolCreatorBase.cxx
+  vvToolWidgetBase.cxx
+  vvToolMedianFilter.cxx
+#  vvToolFoo.cxx
+#  vvToolFooWithWidgetBase.cxx
+  vvToolCropImage.cxx
   vvToolBinarize.cxx
+  vvToolSimpleInputSelectorWidget.cxx
   vvToolInputSelectorWidget.cxx
   vvImageContour.cxx
+  vvToolImageArithm.cxx
+  vvToolConvert.cxx
+  # vvToolStructureSetManager.cxx
+#   vvStructureSetActor.cxx
+#   vvROIActor.cxx
+  vvToolResample.cxx
   )
 
 QT4_WRAP_CPP(vv_SRCS 
+  vvMainWindowBase.h 
   vvMainWindow.h 
   QTreePushButton.h 
   vvInfoPanel.h 
@@ -121,17 +131,27 @@ QT4_WRAP_CPP(vv_SRCS
   vvHelpDialog.h  
   vvProgressDialog.h 
   vvQDicomSeriesSelector.h 
-  vvResamplerDialog.h
   vvSegmentationDialog.h
   vvSurfaceViewerDialog.h
   vvDeformationDialog.h
   vvSlicerManager.h
   vvStructSelector.h
-  vvCropDialog.h
   vvIntensityValueSlider.h
   vvToolCreatorBase.h
+#  vvToolFoo.h
+#  vvToolFooWithWidgetBase.h
+  vvToolMedianFilter.h
   vvToolBinarize.h
+  vvToolSimpleInputSelectorWidget.h
   vvToolInputSelectorWidget.h
+  vvToolWidgetBase.h
+  vvToolCropImage.h
+  vvToolImageArithm.h
+  vvToolConvert.h
+  # vvToolStructureSetManager.h
+ #  vvStructureSetActor.h
+#   vvROIActor.h
+  vvToolResample.h
   )
 
 QT4_WRAP_UI(vv_UI_CXX 
@@ -146,14 +166,20 @@ QT4_WRAP_UI(vv_UI_CXX
   qt_ui/vvDicomSeriesSelector.ui 
   qt_ui/vvSegmentationDialog.ui
   qt_ui/vvSurfaceViewerDialog.ui
-  qt_ui/vvResamplerDialog.ui
   qt_ui/vvDeformationDialog.ui
   qt_ui/vvStructSelector.ui
-  qt_ui/vvCropDialog.ui
   qt_ui/vvDummyWindow.ui #For testing
   qt_ui/vvIntensityValueSlider.ui
-  qt_ui/vvToolBinarize.ui
+  qt_ui/vvToolSimpleInputSelectorWidget.ui
   qt_ui/vvToolInputSelectorWidget.ui
+  qt_ui/vvToolWidgetBase.ui
+  qt_ui/vvToolMedianFilter.ui
+#  qt_ui/vvToolFoo.ui
+  qt_ui/vvToolCropImage.ui
+  qt_ui/vvToolBinarize.ui
+  qt_ui/vvToolImageArithm.ui
+  # qt_ui/vvToolStructureSetManager.ui
+  qt_ui/vvToolResample.ui
   )
 
 SET(vvUI_RCCS vvIcons.qrc)
@@ -161,10 +187,11 @@ QT4_ADD_RESOURCES(vv_SRCS ${vvUI_RCCS})
 
 #=========================================================
 #support for parallel deformable registration with OpenMP
+IF(NOT __APPLE__)
 IF(CMAKE_COMPILER_IS_GNUCC)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp -march=native")
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
-
+ENDIF(NOT __APPLE__)
 #=========================================================
 
 IF (CLITK_VV_USE_BDCM)
@@ -256,14 +283,12 @@ IF(WIN32)
   INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkIO.dll DESTINATION bin)
   INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkverdict.dll DESTINATION bin)
   INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/QVTK.dll DESTINATION bin)
-  INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/QVTKWidgetPlugin.dll DESTINATION bin)
   INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkDICOMParser.dll DESTINATION bin)
   INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkexoIIc.dll DESTINATION bin)
   INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkexpat.dll DESTINATION bin)
   INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkmetaio.dll DESTINATION bin)
   INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkftgl.dll DESTINATION bin)
   INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkfreetype.dll DESTINATION bin)
-  INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkGenericFiltering.dll DESTINATION bin)
   INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkHybrid.dll DESTINATION bin)
   INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkInfovis.dll DESTINATION bin)
   INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkjpeg.dll DESTINATION bin)
@@ -272,7 +297,6 @@ IF(WIN32)
   INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkpng.dll DESTINATION bin)
   INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtktiff.dll DESTINATION bin)
   INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkViews.dll DESTINATION bin)
-  INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkVolumeRendering.dll DESTINATION bin)
   INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkWidgets.dll DESTINATION bin)
   INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkzlib.dll DESTINATION bin)
   INSTALL (FILES ${VTK_DIR}/bin/${CMAKE_BUILD_TYPE}/vtkQtChart.dll DESTINATION bin)
@@ -294,7 +318,7 @@ SET(CPACK_PACKAGE_VENDOR "Creatis, CLB/RIO Team")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReadMe.txt")
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/License.txt")
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
-SET(CPACK_PACKAGE_VERSION_MINOR "0")
+SET(CPACK_PACKAGE_VERSION_MINOR "1")
 SET(CPACK_PACKAGE_VERSION_PATCH "0")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "vv ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
 IF(WIN32 AND NOT UNIX)