ENH: Move itk::PhasedArray3DSpecialCoordinatesImage to ITK core

Remove itk::PhasedArray3DSpecialCoordinatesImage wrapping from: InsightSoftwareConsortium/ITK#4101
KitwareMedical · Jul 7, 2023 · 8c6fedd · 8c6fedd
1 parent 6f6fc8f
commit 8c6fedd
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 360 deletions.
diff --git a/setup.py b/setup.py
@@ -41,7 +41,7 @@
     keywords='ITK InsightToolkit ultrasound imaging',
     url=r'https://www.insight-journal.org/browse/publication/722',
     install_requires=[
-        r'itk>=5.3.0',
+        r'itk>=5.4.0',
         r'itk-meshtopolydata>=0.10.0',
         r'itk-bsplinegradient>=0.2.10',
         r'itk-higherorderaccurategradient>=1.2.0',

diff --git a/test/Baseline/ScanConvertPhasedArray3DITKNearestNeighborTestOutput.mha.sha512 b/test/Baseline/ScanConvertPhasedArray3DITKNearestNeighborTestOutput.mha.sha512
diff --git a/test/Baseline/ScanConvertPhasedArray3DITKWindowedSincTestOutput.mha.sha512 b/test/Baseline/ScanConvertPhasedArray3DITKWindowedSincTestOutput.mha.sha512
diff --git a/test/Baseline/ScanConvertPhasedArray3DTestOutput.mha.sha512 b/test/Baseline/ScanConvertPhasedArray3DTestOutput.mha.sha512
diff --git a/test/Input/ScanConvertPhasedArray3DTestInput.mha.sha512 b/test/Input/ScanConvertPhasedArray3DTestInput.mha.sha512
diff --git a/wrapping/CMakeLists.txt b/wrapping/CMakeLists.txt
@@ -9,16 +9,15 @@ endif()
 itk_wrap_module(Ultrasound)
 set(WRAPPER_SUBMODULE_ORDER
   itkCurvilinearArraySpecialCoordinatesImage
-  itkImageUltrasound # Extra itk::Image wrappings for SupportWindow filters
   itkCurvilinearArraySpecialCoordinatesImageFilters
-  itkPhasedArray3DSpecialCoordinatesImage # CASCI needs to come before
   itkAttenuationImageFilter
   itkBlockMatchingMetricImageFilter
   itkBlockMatchingNormalizedCrossCorrelationMetricImageFilter
   itkBlockMatchingNormalizedCrossCorrelationFFTMetricImageFilter
   itkBlockMatchingNormalizedCrossCorrelationNeighborhoodIteratorMetricImageFilter
+  itkImageUltrasound # must come before Spectra1DSupportWindow
   itkSpectra1DSupportWindowImageFilter
-  itkSpectra1DSupportWindowToMaskImageFilter
+  itkSpectra1DSupportWindowToMaskImageFilter  # must come after CASCI
   itkFrequencyDomain1DFilterFunction
   itkFrequencyDomain1DImageFilter
   itkRegionFromReferenceImageFilter

diff --git a/wrapping/itkCurvilinearArraySpecialCoordinatesImage.wrap b/wrapping/itkCurvilinearArraySpecialCoordinatesImage.wrap
@@ -1,19 +1,5 @@
-itk_wrap_include("list")
 itk_wrap_include("complex")
 
-# Wrap underlying class hierarchy
-itk_wrap_class("itk::SpecialCoordinatesImage" POINTER)
-  foreach(d ${ITK_WRAP_IMAGE_DIMS})
-    foreach(t ${WRAP_ITK_SCALAR})
-      itk_wrap_template("${ITKM_${t}}${d}" "${ITKT_${t}}, ${d}")
-    endforeach()
-    foreach(t3 ${WRAP_ITK_COMPLEX_REAL})
-      itk_wrap_template("${ITKM_${t3}}${d}" "${ITKT_${t3}}, ${d}")
-    endforeach()
-  endforeach()
-itk_end_wrap_class()
-
-
 # Explicitly override template method wrappings so that implicit
 # scalar type is always `double` for greatest precision.
 # Adds wrapping overrides to `itkCurvilinearArraySpecialCoordinatesImage_ext.i` configured with

diff --git a/wrapping/itkCurvilinearArraySpecialCoordinatesImageFilters.wrap b/wrapping/itkCurvilinearArraySpecialCoordinatesImageFilters.wrap
@@ -51,7 +51,7 @@ itk_wrap_class("itk::ImageToImageFilter" POINTER)
   endforeach()
 itk_end_wrap_class()
 
-itk_wrap_class("itk::ImageFileReader" POINTER_WITH_SUPERCLASS)
+itk_wrap_class("itk::ImageFileReader" POINTER)
   foreach(d ${ITK_WRAP_IMAGE_DIMS})
     foreach(t ${WRAP_ITK_SCALAR})
       itk_wrap_template("CASCI${ITKM_${t}}${d}"
@@ -93,16 +93,6 @@ itk_wrap_class("itk::RescaleIntensityImageFilter" POINTER_WITH_2_SUPERCLASSES)
   endforeach()
 itk_end_wrap_class()
 
-itk_wrap_include("itkSpectra1DSupportWindowToMaskImageFilter.h")
-itk_wrap_class("itk::Spectra1DSupportWindowToMaskImageFilter" POINTER_WITH_2_SUPERCLASSES)
-  foreach(d ${ITK_WRAP_IMAGE_DIMS})
-    foreach(t ${WRAP_ITK_INT})
-      itk_wrap_template("IlistitkIndex${d}${d}CASCI${ITKM_${t}}${d}"
-        "itk::Image< std::list< itk::Index< ${d} > >, ${d} >, itk::CurvilinearArraySpecialCoordinatesImage< ${ITKT_${t}}, ${d} >")
-    endforeach()
-  endforeach()
-itk_end_wrap_class()
-
 # The rest is needed for ResampleImageFilter and interpolator functions
 set(resample_filter_dimensions 2 3)
 set(resample_filter_pixel_types "F")

diff --git a/wrapping/itkImageUltrasound.wrap b/wrapping/itkImageUltrasound.wrap
@@ -4,6 +4,7 @@
 
 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}

diff --git a/wrapping/itkPhasedArray3DSpecialCoordinatesImage.wrap b/wrapping/itkPhasedArray3DSpecialCoordinatesImage.wrap
diff --git a/wrapping/itkPhasedArray3DSpecialCoordinatesImageFilters.wrap b/wrapping/itkPhasedArray3DSpecialCoordinatesImageFilters.wrap
diff --git a/wrapping/itkSpectra1DSupportWindowToMaskImageFilter.wrap b/wrapping/itkSpectra1DSupportWindowToMaskImageFilter.wrap
@@ -1,11 +1,19 @@
 itk_wrap_include("list")
 itk_wrap_include("itkIndex.h")
 itk_wrap_include("itkImage.h")
+itk_wrap_include("itkCurvilinearArraySpecialCoordinatesImage.h")
 
 itk_wrap_class("itk::Spectra1DSupportWindowToMaskImageFilter" POINTER_WITH_2_SUPERCLASSES)
   foreach(d ${ITK_WRAP_IMAGE_DIMS})
     foreach(t ${WRAP_ITK_INT})
       itk_wrap_template("IlistitkIndex${d}${d}${ITKM_I${t}${d}}" "itk::Image< std::list< itk::Index< ${d} > >, ${d} >, ${ITKT_I${t}${d}}")
     endforeach(t)
   endforeach(d)
+
+  foreach(d ${ITK_WRAP_IMAGE_DIMS})
+    foreach(t ${WRAP_ITK_INT})
+      itk_wrap_template("IlistitkIndex${d}${d}CASCI${ITKM_${t}}${d}"
+        "itk::Image< std::list< itk::Index< ${d} > >, ${d} >, itk::CurvilinearArraySpecialCoordinatesImage< ${ITKT_${t}}, ${d} >")
+    endforeach()
+  endforeach()
 itk_end_wrap_class()
diff --git a/wrapping/test/CMakeLists.txt b/wrapping/test/CMakeLists.txt
@@ -58,58 +58,6 @@ itk_python_add_test(NAME PythonCurvilinearResampleTest
     --first-sample-distance 26.4
   )
 
-itk_python_expression_add_test(NAME PythonInstantiateGaussianInterpolateImageFunctionPA3DSCI
-  EXPRESSION "iFunc = itk.GaussianInterpolateImageFunction[itk.PhasedArray3DSpecialCoordinatesImage[itk.F], itk.D].New()"
-  )
-
-itk_python_add_test(NAME PythonPhasedArray3DResampleNearestTest
-  TEST_DRIVER_ARGS
-  --compareIntensityTolerance 1
-  --compare
-    DATA{${test_baseline_dir}/ScanConvertPhasedArray3DITKNearestNeighborTestOutput.mha}
-    ${ITK_TEST_OUTPUT_DIR}/ScanConvertPhasedArray3DITKNearestNeighborTestOutput.mha
-  COMMAND PythonPhasedArray3DResample.py
-    -i DATA{${test_input_dir}/ScanConvertPhasedArray3DTestInput.mha}
-    -o ${ITK_TEST_OUTPUT_DIR}/ScanConvertPhasedArray3DITKNearestNeighborTestOutput.mha
-    --azimuth-angular-separation 0.0872665
-    --elevation-angular-separation 0.0174533
-    --radius-sample-size 0.2
-    --first-sample-distance 8.0
-    --interpolation-type nearest
-  )
-
-itk_python_add_test(NAME PythonPhasedArray3DResampleLinearTest
-  TEST_DRIVER_ARGS
-  --compareIntensityTolerance 1
-  --compare
-    DATA{${test_baseline_dir}/ScanConvertPhasedArray3DTestOutput.mha}
-    ${ITK_TEST_OUTPUT_DIR}/ScanConvertPhasedArray3DTestOutput.mha
-  COMMAND PythonPhasedArray3DResample.py
-    -i DATA{${test_input_dir}/ScanConvertPhasedArray3DTestInput.mha}
-    -o ${ITK_TEST_OUTPUT_DIR}/ScanConvertPhasedArray3DTestOutput.mha
-    --azimuth-angular-separation 0.0872665
-    --elevation-angular-separation 0.0174533
-    --radius-sample-size 0.2
-    --first-sample-distance 8.0
-    # --interpolation-type linear  # linear is the default
-  )
-
-itk_python_add_test(NAME PythonPhasedArray3DResampleSincTest
-  TEST_DRIVER_ARGS
-  --compareIntensityTolerance 1
-  --compare
-    DATA{${test_baseline_dir}/ScanConvertPhasedArray3DITKWindowedSincTestOutput.mha}
-    ${ITK_TEST_OUTPUT_DIR}/ScanConvertPhasedArray3DITKWindowedSincTestOutput.mha
-  COMMAND PythonPhasedArray3DResample.py
-    -i DATA{${test_input_dir}/ScanConvertPhasedArray3DTestInput.mha}
-    -o ${ITK_TEST_OUTPUT_DIR}/ScanConvertPhasedArray3DITKWindowedSincTestOutput.mha
-    --azimuth-angular-separation 0.0872665
-    --elevation-angular-separation 0.0174533
-    --radius-sample-size 0.2
-    --first-sample-distance 8.0
-    --interpolation-type sinc
-  )
-
 itk_python_add_test(NAME PythonBackscatterImageFilterTest0
   TEST_DRIVER_ARGS
   --compareIntensityTolerance 0.01