ENH: Reorganizes the WrapITK Libraries to comply with the modular ITK

Change-Id: I9733315c0e0deb3f335f82da88d455ee0164f54d
ComplexSystemsModeling · Jun 21, 2011 · 6c1ac81 · 6c1ac81
1 parent ebd5f4d
commit 6c1ac81
Show file tree

Hide file tree

Showing 716 changed files with 861 additions and 360 deletions.
diff --git a/Wrapping/WrapITK/Languages/Java/CMakeLists.txt b/Wrapping/WrapITK/Languages/Java/CMakeLists.txt
@@ -138,7 +138,7 @@ macro(END_WRAP_LIBRARY_JAVA)
   WRAP_ITK_INSTALL(/Configuration/Typedefs/java
     "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}/java/${WRAPPER_LIBRARY_NAME}_ext.i")
 
-  set(interface_file "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}/${WRAPPER_LIBRARY_NAME}.i")
+  set(interface_file "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}/${WRAPPER_LIBRARY_NAME}Module.i")
 
   # create java wrapping binaries
   set(lib ${WRAPPER_LIBRARY_NAME}Java)

diff --git a/Wrapping/WrapITK/Languages/Python/CMakeLists.txt b/Wrapping/WrapITK/Languages/Python/CMakeLists.txt
@@ -361,7 +361,7 @@ macro(END_WRAP_LIBRARY_PYTHON)
 
 
   # set some var reused later
-  set(interface_file "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}/${WRAPPER_LIBRARY_NAME}.i")
+  set(interface_file "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}/${WRAPPER_LIBRARY_NAME}Module.i")
   set(lib ${WRAPPER_LIBRARY_NAME}Python)
   set(python_file "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${lib}.py")
   set(cpp_file "${CMAKE_CURRENT_BINARY_DIR}/${WRAPPER_LIBRARY_NAME}Python.cpp")
@@ -448,13 +448,13 @@ macro(END_WRAP_MODULE_PYTHON group_name)
 
   set(base_name ${group_name})
 
-  if("${group_name}" STREQUAL "itkVectorContainer")
+ if("${group_name}" STREQUAL "itkVectorContainer")
     # add a template definition for the superclass which is not in ITK
     set(text )
     foreach(d ${WRAP_ITK_DIMS})
       foreach(t ${WRAP_ITK_SCALAR})
-        set(text "${text}%template(vectoritkLevelSetNode${t}${d}) std::vector< itkLevelSetNode${t}${d} >;\n")
-        ADD_PYTHON_CONFIG_TEMPLATE("vector" "std::vector" "vectoritkLevelSetNode${t}${d}" "${ITKT_LSN${t}${d}}")
+        #set(text "${text}%template(vectoritkLevelSetNode${t}${d}) std::vector< itkLevelSetNode${t}${d} >;\n")
+        #ADD_PYTHON_CONFIG_TEMPLATE("vector" "std::vector" "vectoritkLevelSetNode${t}${d}" "${ITKT_LSN${t}${d}}")
       endforeach(t)
 
       set(text "${text}%template(vectoritkVectorD${d}) std::vector< itkVectorD${d} >;\n")
@@ -494,6 +494,11 @@ macro(END_WRAP_MODULE_PYTHON group_name)
     # add a template definition for the superclass which is not in ITK
     set(text )
     foreach(d ${WRAP_ITK_DIMS})
+      foreach(t ${WRAP_ITK_SCALAR})
+        set(text "${text}%template(vectoritkLevelSetNode${t}${d}) std::vector< itkLevelSetNode${t}${d} >;\n")
+        ADD_PYTHON_CONFIG_TEMPLATE("vector" "std::vector" "vectoritkLevelSetNode${t}${d}" "${ITKT_LSN${t}${d}}")
+      endforeach(t)
+
       set(text "${text}%template(mapULitkQuadEdgeMeshPointF${d}) std::map< unsigned long, itkQuadEdgeMeshPointF${d}, std::less< unsigned long > >;\n")
       ADD_PYTHON_CONFIG_TEMPLATE("map" "std::map" "mapULitkQuadEdgeMeshPointF${d}" "unsigned long, itk::QuadEdgeMeshPoint< float, ${d} >")
 

diff --git a/Wrapping/WrapITK/Languages/Python/PyUtils/CMakeLists.txt b/Wrapping/WrapITK/Languages/Python/PyUtils/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 WRAP_LIBRARY("ITKPyUtils" Python)
 
-  set(WRAPPER_LIBRARY_DEPENDS Base)
+  set(WRAPPER_LIBRARY_DEPENDS ITKCommon)
   set(WRAPPER_LIBRARY_LINK_LIBRARIES ${ITK_LIBRARIES} ${PYTHON_LIBRARY} )
 
   set(WRAPPER_LIBRARY_CXX_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/itkPyCommand.cxx")

diff --git a/Wrapping/WrapITK/Languages/Ruby/CMakeLists.txt b/Wrapping/WrapITK/Languages/Ruby/CMakeLists.txt
@@ -83,7 +83,7 @@ macro(END_WRAP_LIBRARY_RUBY)
 
 
   # set some var reused later
-  set(interface_file "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}/${WRAPPER_LIBRARY_NAME}.i")
+  set(interface_file "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}/${WRAPPER_LIBRARY_NAME}Module.i")
   set(lib ${WRAPPER_LIBRARY_NAME}Ruby)
   set(cpp_file "${CMAKE_CURRENT_BINARY_DIR}/${WRAPPER_LIBRARY_NAME}Ruby.cpp")
 

diff --git a/Wrapping/WrapITK/Languages/SwigInterface/CMakeLists.txt b/Wrapping/WrapITK/Languages/SwigInterface/CMakeLists.txt
@@ -121,7 +121,7 @@ macro(END_WRAP_LIBRARY_SWIG_INTERFACE)
     set(idx_file "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}/${module}.idx")
     set(idx_files ${idx_files} ${idx_file})
     set(includes_file "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}/${WRAPPER_LIBRARY_NAME}.includes")
-    set(module_interface_file "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}/${WRAPPER_LIBRARY_NAME}.i")
+    set(module_interface_file "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}/${WRAPPER_LIBRARY_NAME}Module.i")
     # prepare the options
     set(opts )
     foreach(dep ${WRAPPER_LIBRARY_DEPENDS})
@@ -184,7 +184,7 @@ macro(END_WRAP_LIBRARY_SWIG_INTERFACE)
      @ONLY IMMEDIATE )
   WRAP_ITK_INSTALL("/Configuration/Typedefs" "${mdx_file}")
 
-  set(module_interface_file "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}/${WRAPPER_LIBRARY_NAME}.i")
+  set(module_interface_file "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}/${WRAPPER_LIBRARY_NAME}Module.i")
   set(module_interface_ext_file "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}/${WRAPPER_LIBRARY_NAME}_ext.i")
   set(deps_imports )
   set(deps_includes )

diff --git a/Wrapping/WrapITK/Languages/Tcl/CMakeLists.txt b/Wrapping/WrapITK/Languages/Tcl/CMakeLists.txt
@@ -78,7 +78,7 @@ macro(END_WRAP_LIBRARY_TCL)
 
 
   # set some var reused later
-  set(interface_file "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}/${WRAPPER_LIBRARY_NAME}.i")
+  set(interface_file "${WRAPPER_MASTER_INDEX_OUTPUT_DIR}/${WRAPPER_LIBRARY_NAME}Module.i")
   set(lib ${WRAPPER_LIBRARY_NAME}Tcl)
   set(cpp_file "${CMAKE_CURRENT_BINARY_DIR}/${WRAPPER_LIBRARY_NAME}Tcl.cpp")
 

diff --git a/Wrapping/WrapITK/Libraries/CMakeLists.txt b/Wrapping/WrapITK/Libraries/CMakeLists.txt
@@ -1,11 +1,8 @@
 
-set(WRAP_ITK_LIBRARIES
-  VXLNumerics
-  Base
-)
+set(WRAP_ITK_LIBRARIES ITKCommon)
 
 # set Iterators library to OFF by default
-# it is currently usable only when applying patches to ITK, and will only
+# it is currently usable only when applying patches to , and will only
 # take place and time to build
 # TODO: remove this line when iterators will be usable without patch
 option(WRAP_Iterators "Build Iterators library." OFF)
@@ -18,39 +15,88 @@ else(USE_FFTWD OR USE_FFTWF)
 endif(USE_FFTWD OR USE_FFTWF)
 
 set(optional_libraries
-  Numerics
-  Transforms
-  SpatialObject
-  BinaryMorphology
-  Calculators
-  Compose
-  Interpolators  # is required by DeformableTransforms
-  Mesh  # is required by DeformableTransforms
-  DeformableTransforms
-  Denoising
-  DistanceMap
-  EdgesAndContours
-  FFT
-  FFTW
-  Filtering
-  IntensityFilters
-  IO
-  Iterators
-  LevelSet
-  Morphology
-  #Patented
-  PixelMath
-  Resize  # required by Registration
-  Registration
-  Review
-  SegmentationAndThreshold
-  SegmentationValidation
-  SimpleFilters
-  UnaryPixelMath
+ITKStatistics
+ITKTransform
+ITKImageFunction
+ITKImageFilterBase
+ITKImageGrid
+ITKFiniteDifference
+ITKCurvatureFlow
+ITKAnisotropicSmoothing
+ITKMesh
+ITKIOBase
+ITKSpatialObjects
+ITKImageCompose
+ITKImageStatistics
+ITKPath
+ITKImageIntensity
+ITKSmoothing
+ITKImageGradient
+ITKImageFeature
+ITKThresholding
+ITKConnectedComponents
+ITKIOPNG
+ITKMathematicalMorphology
+ITKNarrowBand
+ITKDistanceMap
+ITKSignedDistanceFunction
+ITKOptimizers
+ITKImageCompare
+ITKQuadEdgeMesh
+ITKFastMarching
+ITKLevelSets
+ITKAntiAlias
+ITKPolynomials
+ITKBiasCorrection
+ITKBioCell
+ITKIORAW
+ITKBlox
+ITKClassifiers
+ITKDeformableMesh
+ITKDeformationField
+ITKDiffusionTensorImage
+ITKEigen
+ITKRegistrationCommon
+ITKFEM
+ITKPDEDeformableRegistration
+ITKFEMRegistration
+ITKFFT
+ITKImageLabel
+ITKIOBioRad
+ITKIOBMP
+ITKIOGDCM
+ITKIOIPL
+ITKIOGE
+ITKIOGIPL
+ITKIOJPEG
+ITKIOTIFF
+ITKIOLSM
+ITKIOMeta
+ITKIONIFTI
+ITKIONRRD
+ITKIOSiemens
+ITKIOXML
+ITKIOSpatialObjects
+ITKIOStimulate
+ITKIOVTK
+ITKKLMRegionGrowing
+ITKLabelVoting
+ITKMarkovRandomFieldsClassifiers
+ITKNeuralNetworks
+ITKQuadEdgeMeshFiltering
+ITKRegionGrowing
+ITKSpatialFunction
+ITKVoronoi
+ITKVTK
+ITKWatersheds
+ITKDeprecated
+ITKIOHDF5
+ITKReview
+ITKTestKernel
 )
 
 foreach(library ${optional_libraries})
-  option(WRAP_${library} "Build ${library} library." ON)
+  option(WRAP_${library} "Build ${library} library." OFF)
   mark_as_advanced(WRAP_${library})
   if(WRAP_${library})
     set(WRAP_ITK_LIBRARIES ${WRAP_ITK_LIBRARIES} ${library})

diff --git a/Wrapping/WrapITK/Libraries/Calculators/CMakeLists.txt b/Wrapping/WrapITK/Libraries/Calculators/CMakeLists.txt
diff --git a/Wrapping/WrapITK/Libraries/Compose/CMakeLists.txt b/Wrapping/WrapITK/Libraries/Compose/CMakeLists.txt
diff --git a/Wrapping/WrapITK/Libraries/DeformableTransforms/CMakeLists.txt b/Wrapping/WrapITK/Libraries/DeformableTransforms/CMakeLists.txt
diff --git a/Wrapping/WrapITK/Libraries/DistanceMap/CMakeLists.txt b/Wrapping/WrapITK/Libraries/DistanceMap/CMakeLists.txt
diff --git a/Wrapping/WrapITK/Libraries/FFT/CMakeLists.txt b/Wrapping/WrapITK/Libraries/FFT/CMakeLists.txt
diff --git a/Wrapping/WrapITK/Libraries/IO/CMakeLists.txt b/Wrapping/WrapITK/Libraries/IO/CMakeLists.txt
diff --git a/Wrapping/WrapITK/Libraries/ITKAnisotropicSmoothing/CMakeLists.txt b/Wrapping/WrapITK/Libraries/ITKAnisotropicSmoothing/CMakeLists.txt
@@ -0,0 +1,12 @@
+WRAP_LIBRARY(ITKAnisotropicSmoothing)
+
+set(WRAPPER_LIBRARY_GROUPS
+)
+
+set(WRAPPER_LIBRARY_DEPENDS ITKCommon  ITKStatistics ITKTransform ITKImageFunction ITKImageFilterBase ITKImageGrid ITKFiniteDifference ITKCurvatureFlow)
+
+set(WRAPPER_LIBRARY_LINK_LIBRARIES ${ITK_LIBRARIES})
+
+AUTO_INCLUDE_MODULES()
+
+END_WRAP_LIBRARY()
diff --git a/...g/itkAnisotropicDiffusionImageFilter.wrap → ...g/itkAnisotropicDiffusionImageFilter.wrap b/...g/itkAnisotropicDiffusionImageFilter.wrap → ...g/itkAnisotropicDiffusionImageFilter.wrap
diff --git a/...atureAnisotropicDiffusionImageFilter.wrap → ...atureAnisotropicDiffusionImageFilter.wrap b/...atureAnisotropicDiffusionImageFilter.wrap → ...atureAnisotropicDiffusionImageFilter.wrap
diff --git a/...dientAnisotropicDiffusionImageFilter.wrap → ...dientAnisotropicDiffusionImageFilter.wrap b/...dientAnisotropicDiffusionImageFilter.wrap → ...dientAnisotropicDiffusionImageFilter.wrap
diff --git a/...atureAnisotropicDiffusionImageFilter.wrap → ...atureAnisotropicDiffusionImageFilter.wrap b/...atureAnisotropicDiffusionImageFilter.wrap → ...atureAnisotropicDiffusionImageFilter.wrap
diff --git a/...dientAnisotropicDiffusionImageFilter.wrap → ...dientAnisotropicDiffusionImageFilter.wrap b/...dientAnisotropicDiffusionImageFilter.wrap → ...dientAnisotropicDiffusionImageFilter.wrap
diff --git a/Wrapping/WrapITK/Libraries/ITKAntiAlias/CMakeLists.txt b/Wrapping/WrapITK/Libraries/ITKAntiAlias/CMakeLists.txt
@@ -0,0 +1,12 @@
+WRAP_LIBRARY(ITKAntiAlias)
+
+set(WRAPPER_LIBRARY_GROUPS
+)
+
+set(WRAPPER_LIBRARY_DEPENDS ITKCommon  ITKStatistics ITKTransform ITKImageFunction ITKImageFilterBase ITKImageGrid ITKFiniteDifference ITKCurvatureFlow ITKAnisotropicSmoothing ITKMesh ITKIO-Base ITKSpatialObjects ITKImageCompose ITKImageStatistics ITKPath ITKImageIntensity ITKSmoothing ITKImageGradient ITKImageFeature ITKThresholding ITKConnectedComponents ITKIO-PNG ITKMathematicalMorphology ITKNarrowBand ITKDistanceMap ITKSignedDistanceFunction ITKOptimizers ITKImageCompare ITKQuadEdgeMesh ITKFastMarching ITKLevelSets)
+
+set(WRAPPER_LIBRARY_LINK_LIBRARIES ${ITK_LIBRARIES})
+
+AUTO_INCLUDE_MODULES()
+
+END_WRAP_LIBRARY()
diff --git a/...velSet/itkAntiAliasBinaryImageFilter.wrap → ...iAlias/itkAntiAliasBinaryImageFilter.wrap b/...velSet/itkAntiAliasBinaryImageFilter.wrap → ...iAlias/itkAntiAliasBinaryImageFilter.wrap
diff --git a/...g/WrapITK/Libraries/Resize/CMakeLists.txt → ...ITK/Libraries/ITKBridgeVTK/CMakeLists.txt b/...g/WrapITK/Libraries/Resize/CMakeLists.txt → ...ITK/Libraries/ITKBridgeVTK/CMakeLists.txt
@@ -1,12 +1,12 @@
-WRAP_LIBRARY(Resize)
+WRAP_LIBRARY(ITKAnisotropicSmoothing)
 
 set(WRAPPER_LIBRARY_GROUPS
-  itkExtractImageFilter
 )
 
-set(WRAPPER_LIBRARY_DEPENDS VXLNumerics Base)
+set(WRAPPER_LIBRARY_DEPENDS ITKCommon)
 
 set(WRAPPER_LIBRARY_LINK_LIBRARIES ${ITK_LIBRARIES})
 
 AUTO_INCLUDE_MODULES()
+
 END_WRAP_LIBRARY()
diff --git a/...ries/SimpleFilters/itkVTKImageExport.wrap → ...aries/ITKBridgeVTK/itkVTKImageExport.wrap b/...ries/SimpleFilters/itkVTKImageExport.wrap → ...aries/ITKBridgeVTK/itkVTKImageExport.wrap
diff --git a/...ries/SimpleFilters/itkVTKImageImport.wrap → ...aries/ITKBridgeVTK/itkVTKImageImport.wrap b/...ries/SimpleFilters/itkVTKImageImport.wrap → ...aries/ITKBridgeVTK/itkVTKImageImport.wrap
diff --git a/Wrapping/WrapITK/Libraries/ITKClassifiers/CMakeLists.txt b/Wrapping/WrapITK/Libraries/ITKClassifiers/CMakeLists.txt
@@ -0,0 +1,12 @@
+WRAP_LIBRARY(ITKClassifiers)
+
+set(WRAPPER_LIBRARY_GROUPS
+)
+
+set(WRAPPER_LIBRARY_DEPENDS ITKCommon  ITKStatistics ITKTransform ITKImageFunction ITKImageFilterBase ITKImageGrid ITKFiniteDifference ITKCurvatureFlow ITKAnisotropicSmoothing ITKMesh ITKIO-Base ITKSpatialObjects ITKImageCompose ITKImageStatistics ITKPath ITKImageIntensity ITKSmoothing ITKImageGradient ITKImageFeature ITKThresholding ITKConnectedComponents ITKIO-PNG ITKMathematicalMorphology ITKNarrowBand ITKDistanceMap ITKSignedDistanceFunction ITKOptimizers ITKImageCompare ITKQuadEdgeMesh ITKFastMarching ITKLevelSets ITKAntiAlias ITKPolynomials ITKBiasCorrection ITKBioCell ITKIO-RAW ITKBlox)
+
+set(WRAPPER_LIBRARY_LINK_LIBRARIES ${ITK_LIBRARIES})
+
+AUTO_INCLUDE_MODULES()
+
+END_WRAP_LIBRARY()
diff --git a/...old/itkBayesianClassifierImageFilter.wrap → ...ers/itkBayesianClassifierImageFilter.wrap b/...old/itkBayesianClassifierImageFilter.wrap → ...ers/itkBayesianClassifierImageFilter.wrap
diff --git a/...nClassifierInitializationImageFilter.wrap → ...nClassifierInitializationImageFilter.wrap b/...nClassifierInitializationImageFilter.wrap → ...nClassifierInitializationImageFilter.wrap
diff --git a/...hold/itkScalarImageKmeansImageFilter.wrap → ...iers/itkScalarImageKmeansImageFilter.wrap b/...hold/itkScalarImageKmeansImageFilter.wrap → ...iers/itkScalarImageKmeansImageFilter.wrap