Merge pull request InsightSoftwareConsortium#4675 from thewtex/symmet…

…ric-eigen-analysis-output BUG: Wrap SymmetricEigenAnalysisImageFilter with CovariantVector Image output
Slicer · May 17, 2024 · 311b706 · 311b706
2 parents f63625e + 6e96da5
commit 311b706
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/Modules/Core/Common/wrapping/itkImageToImageFilterB.wrap b/Modules/Core/Common/wrapping/itkImageToImageFilterB.wrap
@@ -1,3 +1,4 @@
+itk_wrap_include("itkSymmetricSecondRankTensor.h")
 itk_wrap_include("itkPhasedArray3DSpecialCoordinatesImage.h")
 itk_wrap_class("itk::ImageToImageFilter" POINTER)
 
@@ -115,4 +116,11 @@ foreach(t3 ${WRAP_ITK_COMPLEX_REAL})
     "itk::PhasedArray3DSpecialCoordinatesImage<  ${ITKT_${t3}} >, itk::PhasedArray3DSpecialCoordinatesImage<  ${ITKT_${t3}} >"
   )
 endforeach()
+
+# SymmetricSecondRankTensor
+# SymmetricEigenAnalysisImageFilter
+foreach(d ${ITK_WRAP_IMAGE_DIMS})
+  itk_wrap_template("${ITKM_ISSRT${ITKM_D}${d}${d}}I${ITKM_CV${ITKM_D}${d}}${d}" "${ITKT_ISSRT${ITKM_D}${d}${d}}, itk::Image< ${ITKT_CV${ITKM_D}${d}}, ${d} >")
+endforeach()
+
 itk_end_wrap_class()
diff --git a/Modules/Core/Common/wrapping/itkInPlaceImageFilterB.wrap b/Modules/Core/Common/wrapping/itkInPlaceImageFilterB.wrap
@@ -1,4 +1,5 @@
 itk_wrap_include("itkPhasedArray3DSpecialCoordinatesImage.h")
+itk_wrap_include("itkSymmetricSecondRankTensor.h")
 itk_wrap_class("itk::InPlaceImageFilter" POINTER)
 # VectorImage <-> scalar
 unique(to_types "UC;${WRAP_ITK_SCALAR}")
@@ -49,4 +50,10 @@ foreach(t ${WRAP_ITK_SCALAR})
   endforeach()
 endforeach()
 
+# SymmetricSecondRankTensor
+# SymmetricEigenAnalysisImageFilter
+foreach(d ${ITK_WRAP_IMAGE_DIMS})
+  itk_wrap_template("${ITKM_ISSRT${ITKM_D}${d}${d}}I${ITKM_CV${ITKM_D}${d}}${d}" "${ITKT_ISSRT${ITKM_D}${d}${d}}, itk::Image< ${ITKT_CV${ITKM_D}${d}}, ${d} >")
+endforeach()
+
 itk_end_wrap_class()
diff --git a/Modules/Filtering/ImageIntensity/include/itkSymmetricEigenAnalysisImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkSymmetricEigenAnalysisImageFilter.h
@@ -209,7 +209,7 @@ extern ITKImageIntensity_EXPORT std::ostream &
  *
  * \ingroup ITKImageIntensity
  */
-template <typename TInputImage, typename TOutputImage = TInputImage>
+template <typename TInputImage, typename TOutputImage>
 class SymmetricEigenAnalysisImageFilter
   : public UnaryFunctorImageFilter<
       TInputImage,

diff --git a/Modules/Filtering/ImageIntensity/wrapping/itkSymmetricEigenAnalysisImageFilter.wrap b/Modules/Filtering/ImageIntensity/wrapping/itkSymmetricEigenAnalysisImageFilter.wrap
@@ -4,8 +4,8 @@ itk_wrap_include("itkSymmetricSecondRankTensor.h")
 
 itk_wrap_simple_class("itk::SymmetricEigenAnalysisEnums")
 
-itk_wrap_class("itk::SymmetricEigenAnalysisImageFilter" POINTER_WITH_2_SUPERCLASSES)
+itk_wrap_class("itk::SymmetricEigenAnalysisImageFilter" POINTER_WITH_SUPERCLASS)
 foreach(d ${ITK_WRAP_IMAGE_DIMS})
-  itk_wrap_template("${ITKM_ISSRT${ITKM_D}${d}${d}}" "${ITKT_ISSRT${ITKM_D}${d}${d}}")
+  itk_wrap_template("${ITKM_ISSRT${ITKM_D}${d}${d}}I${ITKM_CV${ITKM_D}${d}}${d}" "${ITKT_ISSRT${ITKM_D}${d}${d}}, itk::Image< ${ITKT_CV${ITKM_D}${d}}, ${d} >")
 endforeach()
 itk_end_wrap_class()