ENH: Add float wrappings for itkSymmetricSecondRankTensor

InsightSoftwareConsortium · Aug 11, 2021 · 5378dae · 5378dae
1 parent 4c320b1
commit 5378dae
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/Modules/Core/Common/wrapping/itkImageSource.wrap b/Modules/Core/Common/wrapping/itkImageSource.wrap
@@ -4,11 +4,14 @@ itk_wrap_class("itk::ImageSource" POINTER)
   itk_wrap_image_filter("${image_types}" 1)
 
   UNIQUE(to_types "${WRAP_ITK_SCALAR};UC")
+  UNIQUE(ssrt_types "${WRAP_ITK_REAL};D")
   foreach(d ${ITK_WRAP_IMAGE_DIMS})
     foreach(type ${to_types})
       itk_wrap_template("${ITKM_VI${type}${d}}"  "${ITKT_VI${type}${d}}")
     endforeach()
-    itk_wrap_template("${ITKM_ISSRT${ITKM_D}${d}${d}}"  "${ITKT_ISSRT${ITKM_D}${d}${d}}")
+    foreach(t ${ssrt_types})
+      itk_wrap_template("${ITKM_ISSRT${ITKM_${t}}${d}${d}}"  "${ITKT_ISSRT${ITKM_${t}}${d}${d}}")
+    endforeach()
   endforeach()
 
   list(FIND WRAP_ITK_COV_VECTOR_REAL "CVD" index)

diff --git a/Modules/Core/Common/wrapping/itkImageToImageFilterB.wrap b/Modules/Core/Common/wrapping/itkImageToImageFilterB.wrap
@@ -31,14 +31,20 @@ itk_wrap_class("itk::ImageToImageFilter" POINTER)
   itk_wrap_image_filter_combinations("${WRAP_ITK_SCALAR}" "${WRAP_ITK_COMPLEX_REAL}")
   itk_wrap_image_filter_combinations("${WRAP_ITK_COMPLEX_REAL}" "${WRAP_ITK_SCALAR}")
 
+  UNIQUE(real_types "${WRAP_ITK_REAL};D")
   foreach(d ${ITK_WRAP_IMAGE_DIMS})
-    foreach(t ${WRAP_ITK_SCALAR})
-      # scalar <-> SymmetricSecondRankTensor
-      itk_wrap_template("${ITKM_I${t}${d}}${ITKM_ISSRT${ITKM_D}${d}${d}}" "${ITKT_I${t}${d}}, ${ITKT_ISSRT${ITKM_D}${d}${d}}")
-      itk_wrap_template("${ITKM_ISSRT${ITKM_D}${d}${d}}${ITKM_I${t}${d}}" "${ITKT_ISSRT${ITKM_D}${d}${d}}, ${ITKT_I${t}${d}}")
+    foreach(t2 ${real_types})
+      foreach(t ${WRAP_ITK_SCALAR})
+        # scalar <-> SymmetricSecondRankTensor
+        itk_wrap_template("${ITKM_I${t}${d}}${ITKM_ISSRT${ITKM_${t2}}${d}${d}}" "${ITKT_I${t}${d}}, ${ITKT_ISSRT${ITKM_${t2}}${d}${d}}")
+        itk_wrap_template("${ITKM_ISSRT${ITKM_${t2}}${d}${d}}${ITKM_I${t}${d}}" "${ITKT_ISSRT${ITKM_${t2}}${d}${d}}, ${ITKT_I${t}${d}}")
+      endforeach()
+      # SymmetricSecondRankTensor -> SymmetricSecondRankTensor
+      foreach(t3 ${real_types})
+        itk_wrap_template("${ITKM_ISSRT${ITKM_${t2}}${d}${d}}${ITKM_ISSRT${ITKM_${t3}}${d}${d}}"
+                          "${ITKT_ISSRT${ITKM_${t2}}${d}${d}}, ${ITKT_ISSRT${ITKM_${t3}}${d}${d}}")
+      endforeach()
     endforeach()
-    # SymmetricSecondRankTensor -> SymmetricSecondRankTensor
-    itk_wrap_template("${ITKM_ISSRT${ITKM_D}${d}${d}}${ITKM_ISSRT${ITKM_D}${d}${d}}" "${ITKT_ISSRT${ITKM_D}${d}${d}}, ${ITKT_ISSRT${ITKM_D}${d}${d}}")
   endforeach()
 
   # Wrap dim=3 -> dim=2, dim=3 -> dim=2, etc.

diff --git a/Modules/Filtering/ImageSources/wrapping/itkGenerateImageSource.wrap b/Modules/Filtering/ImageSources/wrapping/itkGenerateImageSource.wrap
@@ -9,4 +9,12 @@ itk_wrap_class("itk::GenerateImageSource" POINTER)
     endforeach()
   endforeach()
 
+  # SymmetricSecondRankTensor Images
+  UNIQUE(ssrt_types "${WRAP_ITK_REAL};D")
+  foreach(d ${ITK_WRAP_IMAGE_DIMS})
+    foreach(t ${ssrt_types})
+      itk_wrap_template("${ITKM_ISSRT${ITKM_${t}}${d}${d}}"  "${ITKT_ISSRT${ITKM_${t}}${d}${d}}")
+    endforeach()
+  endforeach()
+
 itk_end_wrap_class()
diff --git a/Wrapping/WrapITKTypes.cmake b/Wrapping/WrapITKTypes.cmake
@@ -245,6 +245,9 @@ WRAP_TYPE("itk::Image" "I" "itkImage.h")
 
     # SymmetricSecondRankTensor types required by level set filters
     ADD_TEMPLATE("${ITKM_SSRT${ITKM_D}${d}}${d}"  "${ITKT_SSRT${ITKM_D}${d}}, ${d}")
+    if(ITK_WRAP_float)
+      ADD_TEMPLATE("${ITKM_SSRT${ITKM_F}${d}}${d}"  "${ITKT_SSRT${ITKM_F}${d}}, ${d}")
+    endif()
 
   endforeach()