BUG: Resolve Python module load warnings

Resolves wrapping warnings previously seen at `itk-ultrasound` module
load time resulting from wrappings for `itk::AttenuationImageFilter` and
`itk::Spectra1DSupportWindowToMaskImageFilter`.

Resolves #200.

Author: tbirdso

wrapping/CMakeLists.txt

@@ -9,20 +9,22 @@ endif()
 itk_wrap_module(Ultrasound)
 set(WRAPPER_SUBMODULE_ORDER
   itkCurvilinearArraySpecialCoordinatesImage
+  itkImageUltrasound # Extra itk::Image wrappings for SupportWindow filters
   itkCurvilinearArraySpecialCoordinatesImageFilters
   itkAttenuationImageFilter
   itkBlockMatchingMetricImageFilter
   itkBlockMatchingNormalizedCrossCorrelationMetricImageFilter
   itkBlockMatchingNormalizedCrossCorrelationFFTMetricImageFilter
   itkBlockMatchingNormalizedCrossCorrelationNeighborhoodIteratorMetricImageFilter
   itkSpectra1DSupportWindowImageFilter
+  itkSpectra1DSupportWindowToMaskImageFilter
   itkFrequencyDomain1DFilterFunction
   itkFrequencyDomain1DImageFilter
   itkRegionFromReferenceImageFilter
   itkAnalyticSignalImageFilter
   itkBModeImageFilter
   itkSpeckleReducingAnisotropicDiffusionImageFilter
-  itkImageToImageFilter # Extra wrappings for Spectra1D filters
+  itkImageToImageFilterUltrasound # Extra wrappings for Spectra1D filters
   itkSpectra1DAveragingImageFilter
   itkSpectra1DNormalizeImageFilter
 )

wrapping/itkAttenuationImageFilter.wrap

@@ -2,10 +2,8 @@ itk_wrap_include("itkVectorImage.h")
 itk_wrap_class("itk::AttenuationImageFilter" POINTER)
   foreach(d ${ITK_WRAP_IMAGE_DIMS})
     foreach(rt ${WRAP_ITK_REAL})
-      foreach(vt ${WRAP_ITK_REAL})
-      itk_wrap_template("VI${ITKM_${rt}}${d}I${ITKM_${rt}}${d}IUC${d}"
+      itk_wrap_template("VI${ITKM_${rt}}${d}I${ITKM_${rt}}${d}"
         "itk::VectorImage<${ITKT_${rt}}, ${d}>, itk::Image<${ITKT_${rt}}, ${d}>")
-      endforeach()
     endforeach()
   endforeach()
 itk_end_wrap_class()

wrapping/itkImageToImageFilter.wrap …ing/itkImageToImageFilterUltrasound.wrapwrapping/itkImageToImageFilter.wrap renamed to wrapping/itkImageToImageFilterUltrasound.wrap wrapping/itkImageToImageFilter.wrap renamed to wrapping/itkImageToImageFilterUltrasound.wrap

@@ -0,0 +1,25 @@
+# Wrap underlying `itk::Image` type for list-of-indices pixel types
+# required in itk::Spectra1DSupportWindowImageFilter and
+# itk::Spectra1DSupportWindowToMaskImageFilter
+
+itk_wrap_include("list")
+itk_wrap_include("itkIndex.h")
+set(TEMPLATE_LIST_INDEX "")
+foreach(d ${ITK_WRAP_IMAGE_DIMS})
+  set(TEMPLATE_LIST_INDEX "${TEMPLATE_LIST_INDEX}
+%template(listIndex${d}) std::list< itk::Index< ${d} > >;
+")
+  ADD_PYTHON_CONFIG_TEMPLATE("list" "std::list" "listIndex${d}" "itk::Index< ${d} >")
+endforeach()
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/stdlistitkIndex.i.in
+  ${CMAKE_CURRENT_BINARY_DIR}/stdlistitkIndex.i
+  @ONLY
+  )
+set(WRAPPER_SWIG_LIBRARY_FILES ${WRAPPER_SWIG_LIBRARY_FILES}
+  "${CMAKE_CURRENT_BINARY_DIR}/stdlistitkIndex.i")
+
+itk_wrap_class("itk::Image" POINTER)
+  foreach(d ${ITK_WRAP_IMAGE_DIMS})
+    itk_wrap_template("listitkIndex${d}${d}" "std::list< itk::Index< ${d} > >, ${d}")
+  endforeach(d)
+itk_end_wrap_class()

wrapping/itkImageUltrasound.wrap

@@ -1,24 +1,3 @@
-itk_wrap_include("list")
-set(TEMPLATE_LIST_INDEX "")
-foreach(d ${ITK_WRAP_IMAGE_DIMS})
-  set(TEMPLATE_LIST_INDEX "${TEMPLATE_LIST_INDEX}
-%template(listIndex${d}) std::list< itk::Index< ${d} > >;
-")
-  ADD_PYTHON_CONFIG_TEMPLATE("list" "std::list" "listIndex${d}" "itk::Index< ${d} >")
-endforeach()
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/stdlistitkIndex.i.in
-  ${CMAKE_CURRENT_BINARY_DIR}/stdlistitkIndex.i
-  @ONLY
-  )
-set(WRAPPER_SWIG_LIBRARY_FILES ${WRAPPER_SWIG_LIBRARY_FILES}
-  "${CMAKE_CURRENT_BINARY_DIR}/stdlistitkIndex.i")
-
-itk_wrap_class("itk::Image" POINTER)
-  foreach(d ${ITK_WRAP_IMAGE_DIMS})
-    itk_wrap_template("listitkIndex${d}${d}" "std::list< itk::Index< ${d} > >, ${d}")
-  endforeach(d)
-itk_end_wrap_class()
-
 itk_wrap_class("itk::Spectra1DSupportWindowImageFilter" POINTER_WITH_2_SUPERCLASSES)
   itk_wrap_image_filter("${WRAP_ITK_INT}" 1)
 itk_end_wrap_class()

wrapping/itkSpectra1DSupportWindowImageFilter.wrap

@@ -1,4 +1,6 @@
 itk_wrap_include("list")
+itk_wrap_include("itkIndex.h")
+itk_wrap_include("itkImage.h")
 
 itk_wrap_class("itk::Spectra1DSupportWindowToMaskImageFilter" POINTER_WITH_2_SUPERCLASSES)
   foreach(d ${ITK_WRAP_IMAGE_DIMS})