From 57480cdbcf0ca6365526a91062e7ea01d34fc783 Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Tue, 25 Aug 2026 19:57:22 +0200 Subject: [PATCH] STYLE: Replace UI with IT as index type for LevelSetNode VectorContainer `itk.IT` ("IdentifierType") is the most commonly supported index type for VectorContainer. Adjusted Node Container types in C++ to use the default index type of `itk::VectorContainer` (which is equal to `IdentifierType`), instead of `unsigned int`. Adjusted ITKFastMarchingBase.wrap accordingly. Follow-up to pull request https://github.com/InsightSoftwareConsortium/ITK/pull/6800 commit 0939d4c24b38e10ff5d65b3578df8447f6df897b "STYLE: Replace UL with IT as index type in itkPyVectorContainerTest.py" --- Modules/Filtering/FastMarching/include/itkLevelSet.h | 2 +- .../Filtering/FastMarching/wrapping/ITKFastMarchingBase.wrap | 2 +- .../FastMarching/wrapping/test/FastMarchingImageFilterTest.py | 2 +- .../LevelSets/include/itkShapePriorMAPCostFunctionBase.h | 2 +- .../wrapping/test/GeodesicActiveContourImageFilterTest.py | 2 +- .../wrapping/test/ShapePriorMAPCostFunctionInitializeTest.py | 2 +- .../test/ThresholdSegmentationLevelSetImageFilterTest.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Modules/Filtering/FastMarching/include/itkLevelSet.h b/Modules/Filtering/FastMarching/include/itkLevelSet.h index 9729f7873e8..a339b82e933 100644 --- a/Modules/Filtering/FastMarching/include/itkLevelSet.h +++ b/Modules/Filtering/FastMarching/include/itkLevelSet.h @@ -58,7 +58,7 @@ class LevelSetTypeDefault using NodeType = LevelSetNode; /** NodeContainer type alias support */ - using NodeContainer = VectorContainer; + using NodeContainer = VectorContainer; /** NodeContainerPointer type alias support */ using NodeContainerPointer = typename NodeContainer::Pointer; diff --git a/Modules/Filtering/FastMarching/wrapping/ITKFastMarchingBase.wrap b/Modules/Filtering/FastMarching/wrapping/ITKFastMarchingBase.wrap index cae473ef928..2aab2e4493d 100644 --- a/Modules/Filtering/FastMarching/wrapping/ITKFastMarchingBase.wrap +++ b/Modules/Filtering/FastMarching/wrapping/ITKFastMarchingBase.wrap @@ -4,7 +4,7 @@ itk_wrap_include("itkLevelSetNode.h") itk_wrap_class("itk::VectorContainer" POINTER) foreach(d ${ITK_WRAP_IMAGE_DIMS}) foreach(t ${WRAP_ITK_SCALAR}) - itk_wrap_template("${ITKM_UI}${ITKM_LSN${t}${d}}" "${ITKT_UI},${ITKT_LSN${t}${d}}") + itk_wrap_template("${ITKM_IT}${ITKM_LSN${t}${d}}" "${ITKT_IT},${ITKT_LSN${t}${d}}") itk_wrap_template("${ITKM_IT}NPI${d}${ITKM_${t}}" "${ITKT_IT}, itk::NodePair< itk::Index<${d}>, ${ITKT_${t}} >") endforeach() endforeach() diff --git a/Modules/Filtering/FastMarching/wrapping/test/FastMarchingImageFilterTest.py b/Modules/Filtering/FastMarching/wrapping/test/FastMarchingImageFilterTest.py index ecc67555543..05c8dc1bfcc 100644 --- a/Modules/Filtering/FastMarching/wrapping/test/FastMarchingImageFilterTest.py +++ b/Modules/Filtering/FastMarching/wrapping/test/FastMarchingImageFilterTest.py @@ -128,7 +128,7 @@ sigmoid.SetBeta(beta) NodeType = itk.LevelSetNode[InternalPixelType, Dimension] -NodeContainer = itk.VectorContainer[itk.UI, NodeType] +NodeContainer = itk.VectorContainer[itk.IT, NodeType] seeds = NodeContainer.New() seedPosition = [int(argv[3]), int(argv[4])] diff --git a/Modules/Segmentation/LevelSets/include/itkShapePriorMAPCostFunctionBase.h b/Modules/Segmentation/LevelSets/include/itkShapePriorMAPCostFunctionBase.h index 6891c80dd0d..1f81bf83252 100644 --- a/Modules/Segmentation/LevelSets/include/itkShapePriorMAPCostFunctionBase.h +++ b/Modules/Segmentation/LevelSets/include/itkShapePriorMAPCostFunctionBase.h @@ -81,7 +81,7 @@ class ITK_TEMPLATE_EXPORT ShapePriorMAPCostFunctionBase : public SingleValuedCos using NodeType = LevelSetNode; /** Type of container used to store the level set nodes. */ - using NodeContainerType = VectorContainer; + using NodeContainerType = VectorContainer; using NodeContainerPointer = typename NodeContainerType::ConstPointer; /** Type of the shape signed distance function. */ diff --git a/Modules/Segmentation/LevelSets/wrapping/test/GeodesicActiveContourImageFilterTest.py b/Modules/Segmentation/LevelSets/wrapping/test/GeodesicActiveContourImageFilterTest.py index a937549c0e3..bd74ad26e8a 100644 --- a/Modules/Segmentation/LevelSets/wrapping/test/GeodesicActiveContourImageFilterTest.py +++ b/Modules/Segmentation/LevelSets/wrapping/test/GeodesicActiveContourImageFilterTest.py @@ -103,7 +103,7 @@ def main(): node.SetIndex(seedPosition) seeds = itk.VectorContainer[ - itk.UI, itk.LevelSetNode[InternalPixelType, Dimension] + itk.IT, itk.LevelSetNode[InternalPixelType, Dimension] ].New() seeds.Initialize() seeds.InsertElement(0, node) diff --git a/Modules/Segmentation/LevelSets/wrapping/test/ShapePriorMAPCostFunctionInitializeTest.py b/Modules/Segmentation/LevelSets/wrapping/test/ShapePriorMAPCostFunctionInitializeTest.py index f3c4fa6ad7a..113fe5539c0 100644 --- a/Modules/Segmentation/LevelSets/wrapping/test/ShapePriorMAPCostFunctionInitializeTest.py +++ b/Modules/Segmentation/LevelSets/wrapping/test/ShapePriorMAPCostFunctionInitializeTest.py @@ -111,7 +111,7 @@ def check(condition, description): # fills them in from the fast-marching output and the sigmoid # edge-potential map. NodeType = itk.LevelSetNode[InternalPixelType, Dimension] -NodeContainerType = itk.VectorContainer[itk.UI, NodeType] +NodeContainerType = itk.VectorContainer[itk.IT, NodeType] active_region = NodeContainerType.New() cost_function.SetActiveRegion(active_region) diff --git a/Modules/Segmentation/LevelSets/wrapping/test/ThresholdSegmentationLevelSetImageFilterTest.py b/Modules/Segmentation/LevelSets/wrapping/test/ThresholdSegmentationLevelSetImageFilterTest.py index dfd14c314d9..e9c8229d49e 100644 --- a/Modules/Segmentation/LevelSets/wrapping/test/ThresholdSegmentationLevelSetImageFilterTest.py +++ b/Modules/Segmentation/LevelSets/wrapping/test/ThresholdSegmentationLevelSetImageFilterTest.py @@ -101,7 +101,7 @@ writer.SetInput(thresholder.GetOutput()) NodeType = itk.LevelSetNode[InternalPixelType, Dimension] -NodeContainer = itk.VectorContainer[itk.UI, NodeType] +NodeContainer = itk.VectorContainer[itk.IT, NodeType] seeds = NodeContainer.New() seedPosition = [int(argv[3]), int(argv[4])]