ENH: Move itk::PhasedArray3DSpecialCoordinatesImage to ITK core

Remove itk::PhasedArray3DSpecialCoordinatesImage wrapping from: InsightSoftwareConsortium/ITK#4101 Closes KitwareMedical#234.
dzenanz · Jul 14, 2023 · 9f172a4 · 9f172a4
1 parent 637c0e7
commit 9f172a4
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 346 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
@@ -8,7 +8,6 @@ endif()
 
 itk_wrap_module(Ultrasound)
 set(WRAPPER_SUBMODULE_ORDER
-  itkSpecialCoordinatesImage
   itkCurvilinearArraySpecialCoordinatesImage
   itkCurvilinearArraySpecialCoordinatesImageFilters
   itkSliceSeriesSpecialCoordinatesImage

diff --git a/wrapping/itkPhasedArray3DSpecialCoordinatesImage.wrap b/wrapping/itkPhasedArray3DSpecialCoordinatesImage.wrap
diff --git a/wrapping/itkPhasedArray3DSpecialCoordinatesImageFilters.wrap b/wrapping/itkPhasedArray3DSpecialCoordinatesImageFilters.wrap
diff --git a/wrapping/itkSpecialCoordinatesImage.wrap b/wrapping/itkSpecialCoordinatesImage.wrap
diff --git a/wrapping/test/CMakeLists.txt b/wrapping/test/CMakeLists.txt
@@ -73,58 +73,6 @@ itk_python_add_test(NAME PythonSliceSeriesResampleTest
     -o ${ITK_TEST_OUTPUT_DIR}/itkSliceSeriesSpecialCoordinatesImageTestPython.mha
   )
 
-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

diff --git a/wrapping/test/PythonPhasedArray3DResample.py b/wrapping/test/PythonPhasedArray3DResample.py