Skip to content

Commit 2b7153c

Browse files
committed
ENH: Move itk::PhasedArray3DSpecialCoordinatesImage to ITK core
Remove itk::PhasedArray3DSpecialCoordinatesImage wrapping from: InsightSoftwareConsortium/ITK#4101 Closes KitwareMedical#234.
1 parent f6a0343 commit 2b7153c

11 files changed

+1
-346
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
keywords='ITK InsightToolkit ultrasound imaging',
4242
url=r'https://www.insight-journal.org/browse/publication/722',
4343
install_requires=[
44-
r'itk>=5.3.0',
44+
r'itk>=5.4.0',
4545
r'itk-meshtopolydata>=0.10.0',
4646
r'itk-bsplinegradient>=0.2.10',
4747
r'itk-higherorderaccurategradient>=1.2.0',

test/Baseline/ScanConvertPhasedArray3DITKNearestNeighborTestOutput.mha.sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/Baseline/ScanConvertPhasedArray3DITKWindowedSincTestOutput.mha.sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/Baseline/ScanConvertPhasedArray3DTestOutput.mha.sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/Input/ScanConvertPhasedArray3DTestInput.mha.sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.

wrapping/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ endif()
88

99
itk_wrap_module(Ultrasound)
1010
set(WRAPPER_SUBMODULE_ORDER
11-
itkSpecialCoordinatesImage
1211
itkCurvilinearArraySpecialCoordinatesImage
1312
itkCurvilinearArraySpecialCoordinatesImageFilters
1413
itkSliceSeriesSpecialCoordinatesImage

wrapping/itkPhasedArray3DSpecialCoordinatesImage.wrap

Lines changed: 0 additions & 50 deletions
This file was deleted.

wrapping/itkPhasedArray3DSpecialCoordinatesImageFilters.wrap

Lines changed: 0 additions & 150 deletions
This file was deleted.

wrapping/itkSpecialCoordinatesImage.wrap

Lines changed: 0 additions & 13 deletions
This file was deleted.

wrapping/test/CMakeLists.txt

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -73,58 +73,6 @@ itk_python_add_test(NAME PythonSliceSeriesResampleTest
7373
-o ${ITK_TEST_OUTPUT_DIR}/itkSliceSeriesSpecialCoordinatesImageTestPython.mha
7474
)
7575

76-
itk_python_expression_add_test(NAME PythonInstantiateGaussianInterpolateImageFunctionPA3DSCI
77-
EXPRESSION "iFunc = itk.GaussianInterpolateImageFunction[itk.PhasedArray3DSpecialCoordinatesImage[itk.F], itk.D].New()"
78-
)
79-
80-
itk_python_add_test(NAME PythonPhasedArray3DResampleNearestTest
81-
TEST_DRIVER_ARGS
82-
--compareIntensityTolerance 1
83-
--compare
84-
DATA{${test_baseline_dir}/ScanConvertPhasedArray3DITKNearestNeighborTestOutput.mha}
85-
${ITK_TEST_OUTPUT_DIR}/ScanConvertPhasedArray3DITKNearestNeighborTestOutput.mha
86-
COMMAND PythonPhasedArray3DResample.py
87-
-i DATA{${test_input_dir}/ScanConvertPhasedArray3DTestInput.mha}
88-
-o ${ITK_TEST_OUTPUT_DIR}/ScanConvertPhasedArray3DITKNearestNeighborTestOutput.mha
89-
--azimuth-angular-separation 0.0872665
90-
--elevation-angular-separation 0.0174533
91-
--radius-sample-size 0.2
92-
--first-sample-distance 8.0
93-
--interpolation-type nearest
94-
)
95-
96-
itk_python_add_test(NAME PythonPhasedArray3DResampleLinearTest
97-
TEST_DRIVER_ARGS
98-
--compareIntensityTolerance 1
99-
--compare
100-
DATA{${test_baseline_dir}/ScanConvertPhasedArray3DTestOutput.mha}
101-
${ITK_TEST_OUTPUT_DIR}/ScanConvertPhasedArray3DTestOutput.mha
102-
COMMAND PythonPhasedArray3DResample.py
103-
-i DATA{${test_input_dir}/ScanConvertPhasedArray3DTestInput.mha}
104-
-o ${ITK_TEST_OUTPUT_DIR}/ScanConvertPhasedArray3DTestOutput.mha
105-
--azimuth-angular-separation 0.0872665
106-
--elevation-angular-separation 0.0174533
107-
--radius-sample-size 0.2
108-
--first-sample-distance 8.0
109-
# --interpolation-type linear # linear is the default
110-
)
111-
112-
itk_python_add_test(NAME PythonPhasedArray3DResampleSincTest
113-
TEST_DRIVER_ARGS
114-
--compareIntensityTolerance 1
115-
--compare
116-
DATA{${test_baseline_dir}/ScanConvertPhasedArray3DITKWindowedSincTestOutput.mha}
117-
${ITK_TEST_OUTPUT_DIR}/ScanConvertPhasedArray3DITKWindowedSincTestOutput.mha
118-
COMMAND PythonPhasedArray3DResample.py
119-
-i DATA{${test_input_dir}/ScanConvertPhasedArray3DTestInput.mha}
120-
-o ${ITK_TEST_OUTPUT_DIR}/ScanConvertPhasedArray3DITKWindowedSincTestOutput.mha
121-
--azimuth-angular-separation 0.0872665
122-
--elevation-angular-separation 0.0174533
123-
--radius-sample-size 0.2
124-
--first-sample-distance 8.0
125-
--interpolation-type sinc
126-
)
127-
12876
itk_python_add_test(NAME PythonBackscatterImageFilterTest0
12977
TEST_DRIVER_ARGS
13078
--compareIntensityTolerance 0.01

0 commit comments

Comments
 (0)