ENH: Move Discrete Gaussian, Hessian ImageFunction's out of Review

Mature at this point. These need to go into the ITKImageIntensity module instead of ITKImageFunction because of their dependency on itk::RescaleIntensityImageFilter.
KitwareMedical · Dec 11, 2024 · e6aea7b · e6aea7b
1 parent dc6a290
commit e6aea7b
Show file tree

Hide file tree

Showing 14 changed files with 101 additions and 100 deletions.
diff --git a/...DiscreteGaussianDerivativeImageFunction.h → ...DiscreteGaussianDerivativeImageFunction.h b/...DiscreteGaussianDerivativeImageFunction.h → ...DiscreteGaussianDerivativeImageFunction.h
@@ -41,7 +41,7 @@ namespace itk
  *
  * \sa NeighborhoodOperator
  * \sa ImageFunction
- * \ingroup ITKReview
+ * \ingroup ITKImageIntensity
  */
 template <typename TInputImage, typename TOutput = double>
 class ITK_TEMPLATE_EXPORT DiscreteGaussianDerivativeImageFunction : public ImageFunction<TInputImage, TOutput, TOutput>

diff --git a/...screteGaussianDerivativeImageFunction.hxx → ...screteGaussianDerivativeImageFunction.hxx b/...screteGaussianDerivativeImageFunction.hxx → ...screteGaussianDerivativeImageFunction.hxx
diff --git a/...eGradientMagnitudeGaussianImageFunction.h → ...eGradientMagnitudeGaussianImageFunction.h b/...eGradientMagnitudeGaussianImageFunction.h → ...eGradientMagnitudeGaussianImageFunction.h
@@ -41,7 +41,7 @@ namespace itk
  *
  * \sa NeighborhoodOperator
  * \sa ImageFunction
- * \ingroup ITKReview
+ * \ingroup ITKImageIntensity
  */
 template <typename TInputImage, typename TOutput = double>
 class ITK_TEMPLATE_EXPORT DiscreteGradientMagnitudeGaussianImageFunction

diff --git a/...radientMagnitudeGaussianImageFunction.hxx → ...radientMagnitudeGaussianImageFunction.hxx b/...radientMagnitudeGaussianImageFunction.hxx → ...radientMagnitudeGaussianImageFunction.hxx
diff --git a/...itkDiscreteHessianGaussianImageFunction.h → ...itkDiscreteHessianGaussianImageFunction.h b/...itkDiscreteHessianGaussianImageFunction.h → ...itkDiscreteHessianGaussianImageFunction.h
@@ -40,7 +40,7 @@ namespace itk
  *
  * \sa NeighborhoodOperator
  * \sa ImageFunction
- * \ingroup ITKReview
+ * \ingroup ITKImageIntensity
  */
 template <typename TInputImage, typename TOutput = double>
 class ITK_TEMPLATE_EXPORT DiscreteHessianGaussianImageFunction

diff --git a/...kDiscreteHessianGaussianImageFunction.hxx → ...kDiscreteHessianGaussianImageFunction.hxx b/...kDiscreteHessianGaussianImageFunction.hxx → ...kDiscreteHessianGaussianImageFunction.hxx
diff --git a/...sianDerivativeImageFunctionTest01.png.cid → ...sianDerivativeImageFunctionTest01.png.cid b/...sianDerivativeImageFunctionTest01.png.cid → ...sianDerivativeImageFunctionTest01.png.cid
diff --git a/...nitudeGaussianImageFunctionTest01.png.cid → ...nitudeGaussianImageFunctionTest01.png.cid b/...nitudeGaussianImageFunctionTest01.png.cid → ...nitudeGaussianImageFunctionTest01.png.cid
diff --git a/...eHessianGaussianImageFunctionTest.mha.cid → ...eHessianGaussianImageFunctionTest.mha.cid b/...eHessianGaussianImageFunctionTest.mha.cid → ...eHessianGaussianImageFunctionTest.mha.cid
diff --git a/Modules/Filtering/ImageIntensity/test/CMakeLists.txt b/Modules/Filtering/ImageIntensity/test/CMakeLists.txt
@@ -2,6 +2,9 @@ itk_module_test()
 set(ITKImageIntensityTests
     itkBoundedReciprocalImageFilterTest.cxx
     itkCosImageFilterAndAdaptorTest.cxx
+    itkDiscreteHessianGaussianImageFunctionTest.cxx
+    itkDiscreteGradientMagnitudeGaussianImageFunctionTest.cxx
+    itkDiscreteGaussianDerivativeImageFunctionTest.cxx
     itkExpImageFilterAndAdaptorTest.cxx
     itkVectorRescaleIntensityImageFilterTest.cxx
     itkTernaryMagnitudeSquaredImageFilterTest.cxx
@@ -710,6 +713,101 @@ itk_add_test(
   COMMAND
   ITKImageIntensityTestDriver
   itkRoundImageFilterTest)
+itk_add_test(
+  NAME
+  itkDiscreteHessianGaussianImageFunctionTest
+  COMMAND
+  ITKImageIntensityTestDriver
+  --compare
+  DATA{Baseline/itkDiscreteHessianGaussianImageFunctionTest.mha}
+  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteHessianGaussianImageFunctionTest.mha
+  itkDiscreteHessianGaussianImageFunctionTest
+  DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
+  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteHessianGaussianImageFunctionTest.mha
+  2.0
+  0.01
+  32)
+itk_add_test(
+  NAME
+  itkDiscreteGradientMagnitudeGaussianImageFunctionTest01
+  COMMAND
+  ITKImageIntensityTestDriver
+  --compare
+  DATA{Baseline/itkDiscreteGradientMagnitudeGaussianImageFunctionTest01.png}
+  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteGradientMagnitudeGaussianImageFunctionTest01.png
+  itkDiscreteGradientMagnitudeGaussianImageFunctionTest
+  DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
+  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteGradientMagnitudeGaussianImageFunctionTest01.png
+  2.0
+  0.01
+  32
+  0
+  1)
+itk_add_test(
+  NAME
+  itkDiscreteGradientMagnitudeGaussianImageFunctionTest02
+  COMMAND
+  ITKImageIntensityTestDriver
+  --compare-MD5
+  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteGradientMagnitudeGaussianImageFunctionTest02.png
+  de1904605e667018baaa3f73c5e5c220
+  itkDiscreteGradientMagnitudeGaussianImageFunctionTest
+  DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
+  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteGradientMagnitudeGaussianImageFunctionTest02.png
+  1.5
+  0.03
+  64
+  1
+  1)
+itk_add_test(
+  NAME
+  itkDiscreteGradientMagnitudeGaussianImageFunctionTestUseImageSpacingOff
+  COMMAND
+  ITKImageIntensityTestDriver
+  --compare-MD5
+  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteGradientMagnitudeGaussianImageFunctionTestUseImageSpacingOff.png
+  de1904605e667018baaa3f73c5e5c220
+  itkDiscreteGradientMagnitudeGaussianImageFunctionTest
+  DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
+  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteGradientMagnitudeGaussianImageFunctionTestUseImageSpacingOff.png
+  1.5
+  0.03
+  64
+  1
+  0)
+itk_add_test(
+  NAME
+  itkDiscreteGaussianDerivativeImageFunctionTest01
+  COMMAND
+  ITKImageIntensityTestDriver
+  --compare
+  DATA{Baseline/itkDiscreteGaussianDerivativeImageFunctionTest01.png}
+  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteGaussianDerivativeImageFunctionTest01.png
+  itkDiscreteGaussianDerivativeImageFunctionTest
+  DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
+  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteGaussianDerivativeImageFunctionTest01.png
+  1
+  2.0
+  0.01
+  32
+  0)
+itk_add_test(
+  NAME
+  itkDiscreteGaussianDerivativeImageFunctionTest02
+  COMMAND
+  ITKImageIntensityTestDriver
+  --compare-MD5
+  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteGaussianDerivativeImageFunctionTest02.png
+  488a4bf5daa08cadb3e8b1018a3fe5c0
+  itkDiscreteGaussianDerivativeImageFunctionTest
+  DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
+  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteGaussianDerivativeImageFunctionTest02.png
+  2
+  1.5
+  0.03
+  16
+  1)
+
 
 set(ITKImageIntensityGTests itkBitwiseOpsFunctorsTest.cxx itkArithmeticOpsFunctorsTest.cxx)
 

diff --git a/...teGaussianDerivativeImageFunctionTest.cxx → ...teGaussianDerivativeImageFunctionTest.cxx b/...teGaussianDerivativeImageFunctionTest.cxx → ...teGaussianDerivativeImageFunctionTest.cxx
diff --git a/...entMagnitudeGaussianImageFunctionTest.cxx → ...entMagnitudeGaussianImageFunctionTest.cxx b/...entMagnitudeGaussianImageFunctionTest.cxx → ...entMagnitudeGaussianImageFunctionTest.cxx
diff --git a/...creteHessianGaussianImageFunctionTest.cxx → ...creteHessianGaussianImageFunctionTest.cxx b/...creteHessianGaussianImageFunctionTest.cxx → ...creteHessianGaussianImageFunctionTest.cxx
diff --git a/Modules/Nonunit/Review/test/CMakeLists.txt b/Modules/Nonunit/Review/test/CMakeLists.txt
@@ -5,9 +5,6 @@ set(ITKReviewTests
     itkConformalFlatteningMeshFilterTest.cxx
     itkConformalFlatteningQuadEdgeMeshFilterTest.cxx
     itkDirectFourierReconstructionImageToImageFilterTest.cxx
-    itkDiscreteGaussianDerivativeImageFunctionTest.cxx
-    itkDiscreteGradientMagnitudeGaussianImageFunctionTest.cxx
-    itkDiscreteHessianGaussianImageFunctionTest.cxx
     itkFastApproximateRankImageFilterTest.cxx
     itkGridForwardWarpImageFilterTest.cxx
     itkImageFunctionTest.cxx
@@ -148,100 +145,6 @@ itk_add_test(
   64
   2
   0)
-itk_add_test(
-  NAME
-  itkDiscreteGaussianDerivativeImageFunctionTest01
-  COMMAND
-  ITKReviewTestDriver
-  --compare
-  DATA{${ITK_DATA_ROOT}/Baseline/Review/itkDiscreteGaussianDerivativeImageFunctionTest01.png}
-  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteGaussianDerivativeImageFunctionTest01.png
-  itkDiscreteGaussianDerivativeImageFunctionTest
-  DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
-  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteGaussianDerivativeImageFunctionTest01.png
-  1
-  2.0
-  0.01
-  32
-  0)
-itk_add_test(
-  NAME
-  itkDiscreteGaussianDerivativeImageFunctionTest02
-  COMMAND
-  ITKReviewTestDriver
-  --compare-MD5
-  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteGaussianDerivativeImageFunctionTest02.png
-  488a4bf5daa08cadb3e8b1018a3fe5c0
-  itkDiscreteGaussianDerivativeImageFunctionTest
-  DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
-  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteGaussianDerivativeImageFunctionTest02.png
-  2
-  1.5
-  0.03
-  16
-  1)
-itk_add_test(
-  NAME
-  itkDiscreteGradientMagnitudeGaussianImageFunctionTest01
-  COMMAND
-  ITKReviewTestDriver
-  --compare
-  DATA{${ITK_DATA_ROOT}/Baseline/Review/itkDiscreteGradientMagnitudeGaussianImageFunctionTest01.png}
-  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteGradientMagnitudeGaussianImageFunctionTest01.png
-  itkDiscreteGradientMagnitudeGaussianImageFunctionTest
-  DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
-  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteGradientMagnitudeGaussianImageFunctionTest01.png
-  2.0
-  0.01
-  32
-  0
-  1)
-itk_add_test(
-  NAME
-  itkDiscreteGradientMagnitudeGaussianImageFunctionTest02
-  COMMAND
-  ITKReviewTestDriver
-  --compare-MD5
-  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteGradientMagnitudeGaussianImageFunctionTest02.png
-  de1904605e667018baaa3f73c5e5c220
-  itkDiscreteGradientMagnitudeGaussianImageFunctionTest
-  DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
-  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteGradientMagnitudeGaussianImageFunctionTest02.png
-  1.5
-  0.03
-  64
-  1
-  1)
-itk_add_test(
-  NAME
-  itkDiscreteGradientMagnitudeGaussianImageFunctionTestUseImageSpacingOff
-  COMMAND
-  ITKReviewTestDriver
-  --compare-MD5
-  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteGradientMagnitudeGaussianImageFunctionTestUseImageSpacingOff.png
-  de1904605e667018baaa3f73c5e5c220
-  itkDiscreteGradientMagnitudeGaussianImageFunctionTest
-  DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
-  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteGradientMagnitudeGaussianImageFunctionTestUseImageSpacingOff.png
-  1.5
-  0.03
-  64
-  1
-  0)
-itk_add_test(
-  NAME
-  itkDiscreteHessianGaussianImageFunctionTest
-  COMMAND
-  ITKReviewTestDriver
-  --compare
-  DATA{${ITK_DATA_ROOT}/Baseline/Review/itkDiscreteHessianGaussianImageFunctionTest.mha}
-  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteHessianGaussianImageFunctionTest.mha
-  itkDiscreteHessianGaussianImageFunctionTest
-  DATA{${ITK_DATA_ROOT}/Input/cthead1.png}
-  ${ITK_TEST_OUTPUT_DIR}/itkDiscreteHessianGaussianImageFunctionTest.mha
-  2.0
-  0.01
-  32)
 itk_add_test(
   NAME
   itkFastApproximateRankImageFilterTest3