From bd4620ddc6592963df03d6da03659507b16b74af Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Wed, 27 Nov 2024 16:47:52 +0100 Subject: [PATCH] ENH: Added nested CoordinateType aliases as alternative to CoordRepType "CoordinateType" appears more readable than "CoordRepType". Using Notepad++, Replace in Files, doing: Find what: ( [ ]+)using CoordRepType = (\w+); Replace with: $1using CoordinateType = $2;\r\n$1using CoordRepType = CoordinateType; Filters: itk*.h Directory: D:\src\ITK\Modules [v] Match case (*) Regular expression - Follow-up to pull request https://github.com/InsightSoftwareConsortium/ITK/pull/4995 commit c1d9ff5b6de719aa256330b281fb79250ccf1859 "STYLE: Rename `TCoordRep` template parameters to `TCoordinate`" --- Modules/Core/Common/include/itkBoundingBox.h | 3 ++- Modules/Core/Common/include/itkCellInterface.h | 6 ++++-- Modules/Core/Common/include/itkContinuousIndex.h | 3 ++- Modules/Core/Common/include/itkDefaultDynamicMeshTraits.h | 3 ++- Modules/Core/Common/include/itkDefaultStaticMeshTraits.h | 3 ++- Modules/Core/Common/include/itkPoint.h | 3 ++- Modules/Core/Common/include/itkPointSetBase.h | 3 ++- Modules/Core/Common/include/itkTriangleHelper.h | 3 ++- Modules/Core/ImageFunction/include/itkImageFunction.h | 3 ++- .../include/itkVectorInterpolateImageFunction.h | 3 ++- Modules/Core/Mesh/include/itkInteriorExteriorMeshFilter.h | 3 ++- Modules/Core/Mesh/include/itkMesh.h | 3 ++- .../Mesh/include/itkParametricSpaceToImageSpaceMeshFilter.h | 3 ++- Modules/Core/Mesh/include/itkTransformMeshFilter.h | 3 ++- Modules/Core/Mesh/include/itkWarpMeshFilter.h | 3 ++- .../Core/QuadEdgeMesh/include/itkQuadEdgeCellTraitsInfo.h | 3 ++- ...itkQuadEdgeMeshEulerOperatorCreateCenterVertexFunction.h | 3 ++- .../include/itkQuadEdgeMeshEulerOperatorsTestHelper.h | 3 ++- .../QuadEdgeMesh/include/itkQuadEdgeMeshExtendedTraits.h | 3 ++- .../QuadEdgeMesh/include/itkQuadEdgeMeshFrontIterator.h | 3 ++- Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshTraits.h | 3 ++- .../ImageGrid/include/itkBSplineControlPointImageFunction.h | 3 ++- Modules/Filtering/ImageGrid/include/itkExpandImageFilter.h | 3 ++- Modules/Filtering/ImageGrid/include/itkWarpImageFilter.h | 3 ++- .../Filtering/ImageGrid/include/itkWarpVectorImageFilter.h | 3 ++- .../ImageIntensity/include/itkVectorExpandImageFilter.h | 3 ++- .../Review/include/itkConformalFlatteningMeshFilter.h | 3 ++- .../Common/include/itkMeanSquareRegistrationFunction.h | 3 ++- Modules/Registration/FEM/include/itkFEMRegistrationFilter.h | 3 ++- .../Registration/FEM/include/itkMIRegistrationFunction.h | 3 ++- .../Registration/FEM/include/itkNCCRegistrationFunction.h | 3 ++- .../include/itkGPUDemonsRegistrationFunction.h | 3 ++- .../include/itkManifoldParzenWindowsPointSetFunction.h | 3 ++- .../Registration/Metricsv4/include/itkPointSetFunction.h | 3 ++- .../include/itkPointSetToPointSetMetricWithIndexv4.h | 3 ++- .../Metricsv4/include/itkPointSetToPointSetMetricv4.h | 3 ++- .../PDEDeformable/include/itkDemonsRegistrationFunction.h | 3 ++- .../include/itkESMDemonsRegistrationFunction.h | 3 ++- .../itkFastSymmetricForcesDemonsRegistrationFunction.h | 3 ++- .../include/itkLevelSetMotionRegistrationFunction.h | 3 ++- .../include/itkSymmetricForcesDemonsRegistrationFunction.h | 3 ++- .../include/itkShapeSignedDistanceFunction.h | 3 ++- Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2D.h | 3 ++- .../Voronoi/include/itkVoronoiDiagram2DGenerator.h | 3 ++- 44 files changed, 90 insertions(+), 45 deletions(-) diff --git a/Modules/Core/Common/include/itkBoundingBox.h b/Modules/Core/Common/include/itkBoundingBox.h index ca989782da94..6e306381ba8e 100644 --- a/Modules/Core/Common/include/itkBoundingBox.h +++ b/Modules/Core/Common/include/itkBoundingBox.h @@ -89,7 +89,8 @@ class ITK_TEMPLATE_EXPORT BoundingBox : public Object /** Hold on to the type information specified by the template parameters. */ using PointIdentifier = TPointIdentifier; - using CoordRepType = TCoordinate; + using CoordinateType = TCoordinate; + using CoordRepType = CoordinateType; using PointsContainer = TPointsContainer; using PointsContainerPointer = typename PointsContainer::Pointer; using PointsContainerConstPointer = typename PointsContainer::ConstPointer; diff --git a/Modules/Core/Common/include/itkCellInterface.h b/Modules/Core/Common/include/itkCellInterface.h index 4531463f93f8..6d1a340a675f 100644 --- a/Modules/Core/Common/include/itkCellInterface.h +++ b/Modules/Core/Common/include/itkCellInterface.h @@ -109,7 +109,8 @@ class ITK_TEMPLATE_EXPORT CellInterface using CellTraits = TCellTraits; /** Save type information for this cell. */ - using CoordRepType = typename CellTraits::CoordRepType; + using CoordinateType = typename CellTraits::CoordRepType; + using CoordRepType = CoordinateType; using InterpolationWeightType = typename CellTraits::InterpolationWeightType; using PointIdentifier = typename CellTraits::PointIdentifier; using PointIdIterator = typename CellTraits::PointIdIterator; @@ -525,7 +526,8 @@ class ITK_TEMPLATE_EXPORT CellTraitsInfo { public: static constexpr unsigned int PointDimension = VPointDimension; - using CoordRepType = TCoordinate; + using CoordinateType = TCoordinate; + using CoordRepType = CoordinateType; using InterpolationWeightType = TInterpolationWeight; using PointIdentifier = TPointIdentifier; using CellIdentifier = TCellIdentifier; diff --git a/Modules/Core/Common/include/itkContinuousIndex.h b/Modules/Core/Common/include/itkContinuousIndex.h index 67293d00d806..9710c0cbe464 100644 --- a/Modules/Core/Common/include/itkContinuousIndex.h +++ b/Modules/Core/Common/include/itkContinuousIndex.h @@ -56,7 +56,8 @@ class ITK_TEMPLATE_EXPORT ContinuousIndex : public Point::RealType; diff --git a/Modules/Core/Common/include/itkPointSetBase.h b/Modules/Core/Common/include/itkPointSetBase.h index 4b3b118229fa..ddb869696d6d 100644 --- a/Modules/Core/Common/include/itkPointSetBase.h +++ b/Modules/Core/Common/include/itkPointSetBase.h @@ -71,7 +71,8 @@ class ITK_TEMPLATE_EXPORT PointSetBase : public DataObject /** Convenient type alias obtained from TPointsContainer template parameter. */ using PointType = typename TPointsContainer::Element; - using CoordRepType = typename PointType::CoordRepType; + using CoordinateType = typename PointType::CoordRepType; + using CoordRepType = CoordinateType; using PointIdentifier = typename TPointsContainer::ElementIdentifier; using PointsContainer = TPointsContainer; diff --git a/Modules/Core/Common/include/itkTriangleHelper.h b/Modules/Core/Common/include/itkTriangleHelper.h index 14a884ecb646..56d8d915901d 100644 --- a/Modules/Core/Common/include/itkTriangleHelper.h +++ b/Modules/Core/Common/include/itkTriangleHelper.h @@ -33,7 +33,8 @@ class ITK_TEMPLATE_EXPORT TriangleHelper public: using Self = TriangleHelper; using PointType = TPoint; - using CoordRepType = typename PointType::CoordRepType; + using CoordinateType = typename PointType::CoordRepType; + using CoordRepType = CoordinateType; using VectorType = typename PointType::VectorType; using CrossVectorType = CrossHelper; diff --git a/Modules/Core/ImageFunction/include/itkImageFunction.h b/Modules/Core/ImageFunction/include/itkImageFunction.h index d48dd683dc4a..5d8b7274bd50 100644 --- a/Modules/Core/ImageFunction/include/itkImageFunction.h +++ b/Modules/Core/ImageFunction/include/itkImageFunction.h @@ -84,7 +84,8 @@ class ITK_TEMPLATE_EXPORT ImageFunction : public FunctionBase; /** Type for representing coordinates. */ - using CoordRepType = typename TInputMesh::CoordRepType; + using CoordinateType = typename TInputMesh::CoordRepType; + using CoordRepType = CoordinateType; using InputMeshType = TInputMesh; using OutputMeshType = TOutputMesh; diff --git a/Modules/Core/Mesh/include/itkTransformMeshFilter.h b/Modules/Core/Mesh/include/itkTransformMeshFilter.h index baedaded0e13..bc91827745ac 100644 --- a/Modules/Core/Mesh/include/itkTransformMeshFilter.h +++ b/Modules/Core/Mesh/include/itkTransformMeshFilter.h @@ -56,7 +56,8 @@ class ITK_TEMPLATE_EXPORT TransformMeshFilter : public MeshToMeshFilter GeneratePointCoordinates(const unsigned int iN) { using PointType = typename TMesh::PointType; - using CoordRepType = typename PointType::CoordRepType; + using CoordinateType = typename PointType::CoordRepType; + using CoordRepType = CoordinateType; std::vector oPt(iN * iN); for (unsigned int i = 0; i < iN; ++i) diff --git a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshExtendedTraits.h b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshExtendedTraits.h index 8ea4795561cf..414b7338e9b0 100644 --- a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshExtendedTraits.h +++ b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshExtendedTraits.h @@ -70,7 +70,8 @@ class QuadEdgeMeshExtendedTraits public: using Self = QuadEdgeMeshExtendedTraits; /** Save the template parameters. */ - using CoordRepType = TCoordinate; + using CoordinateType = TCoordinate; + using CoordRepType = CoordinateType; using PixelType = TPixelType; using PrimalDataType = TPData; using DualDataType = TDData; diff --git a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshFrontIterator.h b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshFrontIterator.h index 7ddc9d965811..95d96b1dc45b 100644 --- a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshFrontIterator.h +++ b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshFrontIterator.h @@ -84,7 +84,8 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMeshFrontBaseIterator protected: // Mesh types - using CoordRepType = typename MeshType::CoordRepType; + using CoordinateType = typename MeshType::CoordRepType; + using CoordRepType = CoordinateType; // QE types using QEOriginType = typename QEType::OriginRefType; diff --git a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshTraits.h b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshTraits.h index c087c24e332b..61e83ab622f1 100644 --- a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshTraits.h +++ b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshTraits.h @@ -53,7 +53,8 @@ class QuadEdgeMeshTraits using Self = QuadEdgeMeshTraits; using PixelType = TPixel; using CellPixelType = TPixel; - using CoordRepType = TCoordinate; + using CoordinateType = TCoordinate; + using CoordRepType = CoordinateType; using InterpolationWeightType = TInterpolationWeight; static constexpr unsigned int PointDimension = VPointDimension; diff --git a/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.h b/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.h index 2f5bb06f46b6..45c18a176534 100644 --- a/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.h +++ b/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFunction.h @@ -78,7 +78,8 @@ class ITK_TEMPLATE_EXPORT BSplineControlPointImageFunction /** Image type alias support */ using ControlPointLatticeType = TInputImage; using InputImageType = TInputImage; - using CoordRepType = TCoordinate; + using CoordinateType = TCoordinate; + using CoordRepType = CoordinateType; using PixelType = typename InputImageType::PixelType; using RegionType = typename InputImageType::RegionType; using IndexType = typename InputImageType::IndexType; diff --git a/Modules/Filtering/ImageGrid/include/itkExpandImageFilter.h b/Modules/Filtering/ImageGrid/include/itkExpandImageFilter.h index d0c9ac55936c..af8d4460b2c0 100644 --- a/Modules/Filtering/ImageGrid/include/itkExpandImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkExpandImageFilter.h @@ -92,7 +92,8 @@ class ITK_TEMPLATE_EXPORT ExpandImageFilter : public ImageToImageFilter; using InterpolatorPointer = typename InterpolatorType::Pointer; using DefaultInterpolatorType = LinearInterpolateImageFunction; diff --git a/Modules/Filtering/ImageGrid/include/itkWarpImageFilter.h b/Modules/Filtering/ImageGrid/include/itkWarpImageFilter.h index 99130cd50b05..2eba8c714fa3 100644 --- a/Modules/Filtering/ImageGrid/include/itkWarpImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkWarpImageFilter.h @@ -128,7 +128,8 @@ class ITK_TEMPLATE_EXPORT WarpImageFilter : public ImageToImageFilter; using InterpolatorPointer = typename InterpolatorType::Pointer; using DefaultInterpolatorType = LinearInterpolateImageFunction; diff --git a/Modules/Filtering/ImageGrid/include/itkWarpVectorImageFilter.h b/Modules/Filtering/ImageGrid/include/itkWarpVectorImageFilter.h index d95e5a3b66ad..def20948ed75 100644 --- a/Modules/Filtering/ImageGrid/include/itkWarpVectorImageFilter.h +++ b/Modules/Filtering/ImageGrid/include/itkWarpVectorImageFilter.h @@ -131,7 +131,8 @@ class ITK_TEMPLATE_EXPORT WarpVectorImageFilter : public ImageToImageFilter; using InterpolatorPointer = typename InterpolatorType::Pointer; using DefaultInterpolatorType = VectorLinearInterpolateImageFunction; diff --git a/Modules/Filtering/ImageIntensity/include/itkVectorExpandImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkVectorExpandImageFilter.h index f2130307e21c..5db4cc2f3ee5 100644 --- a/Modules/Filtering/ImageIntensity/include/itkVectorExpandImageFilter.h +++ b/Modules/Filtering/ImageIntensity/include/itkVectorExpandImageFilter.h @@ -117,7 +117,8 @@ class ITK_TEMPLATE_EXPORT VectorExpandImageFilter : public ImageToImageFilter; /** Typedef support for the interpolation function */ - using CoordRepType = double; + using CoordinateType = double; + using CoordRepType = CoordinateType; using InterpolatorType = VectorInterpolateImageFunction; using InterpolatorPointer = typename InterpolatorType::Pointer; using DefaultInterpolatorType = VectorLinearInterpolateImageFunction; diff --git a/Modules/Nonunit/Review/include/itkConformalFlatteningMeshFilter.h b/Modules/Nonunit/Review/include/itkConformalFlatteningMeshFilter.h index fab26931ead6..68df5f7ebf44 100644 --- a/Modules/Nonunit/Review/include/itkConformalFlatteningMeshFilter.h +++ b/Modules/Nonunit/Review/include/itkConformalFlatteningMeshFilter.h @@ -67,7 +67,8 @@ class ITK_TEMPLATE_EXPORT ConformalFlatteningMeshFilter : public MeshToMeshFilte /** Type for representing coordinates. */ // using CoordRepType = typename TInputMesh::CoordRepType; - using CoordRepType = double; + using CoordinateType = double; + using CoordRepType = CoordinateType; /** Method for creation through the object factory. */ itkNewMacro(Self); diff --git a/Modules/Registration/Common/include/itkMeanSquareRegistrationFunction.h b/Modules/Registration/Common/include/itkMeanSquareRegistrationFunction.h index 29470f778ccf..a9ce07c6317b 100644 --- a/Modules/Registration/Common/include/itkMeanSquareRegistrationFunction.h +++ b/Modules/Registration/Common/include/itkMeanSquareRegistrationFunction.h @@ -95,7 +95,8 @@ class ITK_TEMPLATE_EXPORT MeanSquareRegistrationFunction using typename Superclass::TimeStepType; /** Interpolator type. */ - using CoordRepType = double; + using CoordinateType = double; + using CoordRepType = CoordinateType; using InterpolatorType = InterpolateImageFunction; using InterpolatorPointer = typename InterpolatorType::Pointer; using PointType = typename InterpolatorType::PointType; diff --git a/Modules/Registration/FEM/include/itkFEMRegistrationFilter.h b/Modules/Registration/FEM/include/itkFEMRegistrationFilter.h index 694ebd691643..0a95e1bdf6bd 100644 --- a/Modules/Registration/FEM/include/itkFEMRegistrationFilter.h +++ b/Modules/Registration/FEM/include/itkFEMRegistrationFilter.h @@ -190,7 +190,8 @@ class ITK_TEMPLATE_EXPORT FEMRegistrationFilter : public ImageToImageFilter; /** Typedef support for the interpolation function */ - using CoordRepType = double; + using CoordinateType = double; + using CoordRepType = CoordinateType; using InterpolatorType = VectorInterpolateImageFunction; using InterpolatorPointer = typename InterpolatorType::Pointer; diff --git a/Modules/Registration/FEM/include/itkMIRegistrationFunction.h b/Modules/Registration/FEM/include/itkMIRegistrationFunction.h index 2d8b0f2269bf..bc72cab27000 100644 --- a/Modules/Registration/FEM/include/itkMIRegistrationFunction.h +++ b/Modules/Registration/FEM/include/itkMIRegistrationFunction.h @@ -94,7 +94,8 @@ class ITK_TEMPLATE_EXPORT MIRegistrationFunction using typename Superclass::TimeStepType; /** Interpolator type. */ - using CoordRepType = double; + using CoordinateType = double; + using CoordRepType = CoordinateType; using InterpolatorType = InterpolateImageFunction; using InterpolatorPointer = typename InterpolatorType::Pointer; using PointType = typename InterpolatorType::PointType; diff --git a/Modules/Registration/FEM/include/itkNCCRegistrationFunction.h b/Modules/Registration/FEM/include/itkNCCRegistrationFunction.h index 57cf8f4f633c..26682f701f7a 100644 --- a/Modules/Registration/FEM/include/itkNCCRegistrationFunction.h +++ b/Modules/Registration/FEM/include/itkNCCRegistrationFunction.h @@ -95,7 +95,8 @@ class ITK_TEMPLATE_EXPORT NCCRegistrationFunction using typename Superclass::TimeStepType; /** Interpolator type. */ - using CoordRepType = double; + using CoordinateType = double; + using CoordRepType = CoordinateType; using InterpolatorType = InterpolateImageFunction; using InterpolatorPointer = typename InterpolatorType::Pointer; diff --git a/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h b/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h index 7df2fddd3cbe..852a803b2d77 100644 --- a/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h +++ b/Modules/Registration/GPUPDEDeformable/include/itkGPUDemonsRegistrationFunction.h @@ -98,7 +98,8 @@ class ITK_TEMPLATE_EXPORT GPUDemonsRegistrationFunction using typename Superclass::TimeStepType; /** Interpolator type. */ - using CoordRepType = double; + using CoordinateType = double; + using CoordRepType = CoordinateType; using InterpolatorType = InterpolateImageFunction; using InterpolatorPointer = typename InterpolatorType::Pointer; using PointType = typename InterpolatorType::PointType; diff --git a/Modules/Registration/Metricsv4/include/itkManifoldParzenWindowsPointSetFunction.h b/Modules/Registration/Metricsv4/include/itkManifoldParzenWindowsPointSetFunction.h index 6b1555d475d2..401792ece22d 100644 --- a/Modules/Registration/Metricsv4/include/itkManifoldParzenWindowsPointSetFunction.h +++ b/Modules/Registration/Metricsv4/include/itkManifoldParzenWindowsPointSetFunction.h @@ -72,7 +72,8 @@ class ITK_TEMPLATE_EXPORT ManifoldParzenWindowsPointSetFunction /** Other type alias */ using RealType = TOutput; using OutputType = TOutput; - using CoordRepType = TCoordinate; + using CoordinateType = TCoordinate; + using CoordRepType = CoordinateType; /** Typedef for points locator class to speed up finding neighboring points */ using PointsLocatorType = PointsLocator; diff --git a/Modules/Registration/Metricsv4/include/itkPointSetFunction.h b/Modules/Registration/Metricsv4/include/itkPointSetFunction.h index 4703c5cba5d0..28caa4ae1d50 100644 --- a/Modules/Registration/Metricsv4/include/itkPointSetFunction.h +++ b/Modules/Registration/Metricsv4/include/itkPointSetFunction.h @@ -84,7 +84,8 @@ class ITK_TEMPLATE_EXPORT PointSetFunction : public FunctionBase; using InterpolatorPointer = typename InterpolatorType::Pointer; using PointType = typename InterpolatorType::PointType; diff --git a/Modules/Registration/PDEDeformable/include/itkESMDemonsRegistrationFunction.h b/Modules/Registration/PDEDeformable/include/itkESMDemonsRegistrationFunction.h index 3e2a8d7f2552..83b57c3684e2 100644 --- a/Modules/Registration/PDEDeformable/include/itkESMDemonsRegistrationFunction.h +++ b/Modules/Registration/PDEDeformable/include/itkESMDemonsRegistrationFunction.h @@ -128,7 +128,8 @@ class ITK_TEMPLATE_EXPORT ESMDemonsRegistrationFunction using typename Superclass::TimeStepType; /** Interpolator type. */ - using CoordRepType = double; + using CoordinateType = double; + using CoordRepType = CoordinateType; using InterpolatorType = InterpolateImageFunction; using InterpolatorPointer = typename InterpolatorType::Pointer; using PointType = typename InterpolatorType::PointType; diff --git a/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFunction.h b/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFunction.h index acd0472970f6..abc607005b4c 100644 --- a/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFunction.h +++ b/Modules/Registration/PDEDeformable/include/itkFastSymmetricForcesDemonsRegistrationFunction.h @@ -88,7 +88,8 @@ class ITK_TEMPLATE_EXPORT FastSymmetricForcesDemonsRegistrationFunction using typename Superclass::TimeStepType; /** Interpolator type. */ - using CoordRepType = double; + using CoordinateType = double; + using CoordRepType = CoordinateType; using InterpolatorType = InterpolateImageFunction; using InterpolatorPointer = typename InterpolatorType::Pointer; using PointType = typename InterpolatorType::PointType; diff --git a/Modules/Registration/PDEDeformable/include/itkLevelSetMotionRegistrationFunction.h b/Modules/Registration/PDEDeformable/include/itkLevelSetMotionRegistrationFunction.h index a7b211751424..722265eec984 100644 --- a/Modules/Registration/PDEDeformable/include/itkLevelSetMotionRegistrationFunction.h +++ b/Modules/Registration/PDEDeformable/include/itkLevelSetMotionRegistrationFunction.h @@ -98,7 +98,8 @@ class ITK_TEMPLATE_EXPORT LevelSetMotionRegistrationFunction using typename Superclass::TimeStepType; /** Interpolator type. */ - using CoordRepType = double; + using CoordinateType = double; + using CoordRepType = CoordinateType; using InterpolatorType = InterpolateImageFunction; using InterpolatorPointer = typename InterpolatorType::Pointer; using PointType = typename InterpolatorType::PointType; diff --git a/Modules/Registration/PDEDeformable/include/itkSymmetricForcesDemonsRegistrationFunction.h b/Modules/Registration/PDEDeformable/include/itkSymmetricForcesDemonsRegistrationFunction.h index 925754ef78be..f3f5c9e8748d 100644 --- a/Modules/Registration/PDEDeformable/include/itkSymmetricForcesDemonsRegistrationFunction.h +++ b/Modules/Registration/PDEDeformable/include/itkSymmetricForcesDemonsRegistrationFunction.h @@ -103,7 +103,8 @@ class ITK_TEMPLATE_EXPORT SymmetricForcesDemonsRegistrationFunction using typename Superclass::TimeStepType; /** Interpolator type. */ - using CoordRepType = double; + using CoordinateType = double; + using CoordRepType = CoordinateType; using InterpolatorType = InterpolateImageFunction; using InterpolatorPointer = typename InterpolatorType::Pointer; using PointType = typename InterpolatorType::PointType; diff --git a/Modules/Segmentation/SignedDistanceFunction/include/itkShapeSignedDistanceFunction.h b/Modules/Segmentation/SignedDistanceFunction/include/itkShapeSignedDistanceFunction.h index fa2ad2d7348d..68dac7c72c23 100644 --- a/Modules/Segmentation/SignedDistanceFunction/include/itkShapeSignedDistanceFunction.h +++ b/Modules/Segmentation/SignedDistanceFunction/include/itkShapeSignedDistanceFunction.h @@ -76,7 +76,8 @@ class ITK_TEMPLATE_EXPORT ShapeSignedDistanceFunction static constexpr unsigned int SpaceDimension = VSpaceDimension; /** CoordRep type alias support */ - using CoordRepType = TCoordinate; + using CoordinateType = TCoordinate; + using CoordRepType = CoordinateType; /** Point type alias support */ using PointType = InputType; diff --git a/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2D.h b/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2D.h index 014b665ea64f..562959f6e867 100644 --- a/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2D.h +++ b/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2D.h @@ -75,7 +75,8 @@ class ITK_TEMPLATE_EXPORT VoronoiDiagram2D /** Typedefs from itkMesh */ using PixelType = typename MeshTraits::PixelType; - using CoordRepType = typename MeshTraits::CoordRepType; + using CoordinateType = typename MeshTraits::CoordRepType; + using CoordRepType = CoordinateType; using InterpolationWeightType = typename MeshTraits::InterpolationWeightType; using PointIdentifier = typename MeshTraits::PointIdentifier; using CellIdentifier = typename MeshTraits::CellIdentifier; diff --git a/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2DGenerator.h b/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2DGenerator.h index e00c7a57d6d8..08b2a4941add 100644 --- a/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2DGenerator.h +++ b/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2DGenerator.h @@ -72,7 +72,8 @@ class ITK_TEMPLATE_EXPORT VoronoiDiagram2DGenerator : public MeshSource