diff --git a/Modules/Core/Common/include/itkBoundingBox.h b/Modules/Core/Common/include/itkBoundingBox.h index a466cdb1d26..4519ebf7a0e 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 = TCoordRep; + using CoordinateType = TCoordRep; + 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 37b642cff90..148edd0929a 100644 --- a/Modules/Core/Common/include/itkCellInterface.h +++ b/Modules/Core/Common/include/itkCellInterface.h @@ -108,7 +108,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; @@ -524,7 +525,8 @@ class ITK_TEMPLATE_EXPORT CellTraitsInfo { public: static constexpr unsigned int PointDimension = VPointDimension; - using CoordRepType = TCoordRep; + using CoordinateType = TCoordRep; + 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 a322baeec21..04043eee1ba 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 /** ValueType can be used to declare a variable that is the same type * as a data element held in an Point. */ using ValueType = TCoordRep; - using CoordRepType = TCoordRep; + using CoordinateType = TCoordRep; + using CoordRepType = CoordinateType; using RealType = typename NumericTraits::RealType; diff --git a/Modules/Core/Common/include/itkPointSet.h b/Modules/Core/Common/include/itkPointSet.h index 9b8f6d75e94..5fc164ef5d8 100644 --- a/Modules/Core/Common/include/itkPointSet.h +++ b/Modules/Core/Common/include/itkPointSet.h @@ -101,7 +101,8 @@ class ITK_TEMPLATE_EXPORT PointSet : public DataObject using PixelType = typename MeshTraits::PixelType; /** Convenient type alias obtained from TMeshTraits template parameter. */ - using CoordRepType = typename MeshTraits::CoordRepType; + using CoordinateType = typename MeshTraits::CoordRepType; + using CoordRepType = CoordinateType; using PointIdentifier = typename MeshTraits::PointIdentifier; using PointType = typename MeshTraits::PointType; using PointsContainer = typename MeshTraits::PointsContainer; diff --git a/Modules/Core/Common/include/itkTriangleHelper.h b/Modules/Core/Common/include/itkTriangleHelper.h index 14a884ecb64..56d8d915901 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 df6e2d49473..270cf925281 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 baedaded0e1..bc91827745a 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; 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 3799be21acc..79bfb84045a 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 d95e5a3b66a..def20948ed7 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 f2130307e21..5db4cc2f3ee 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/Filtering/QuadEdgeMeshFiltering/include/itkBorderQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkBorderQuadEdgeMeshFilter.h index f20d1d26d3c..7e4dfa53007 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkBorderQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkBorderQuadEdgeMeshFilter.h @@ -92,7 +92,8 @@ class ITK_TEMPLATE_EXPORT BorderQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEd using InputMeshType = TInputMesh; using InputMeshConstPointer = typename InputMeshType::ConstPointer; - using InputCoordRepType = typename InputMeshType::CoordRepType; + using InputCoordinateType = typename InputMeshType::CoordRepType; + using InputCoordRepType = InputCoordinateType; using InputPointType = typename InputMeshType::PointType; using InputTraits = typename InputMeshType::Traits; using InputPointIdentifier = typename InputMeshType::PointIdentifier; @@ -111,7 +112,8 @@ class ITK_TEMPLATE_EXPORT BorderQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEd using OutputMeshType = TOutputMesh; using OutputMeshPointer = typename OutputMeshType::Pointer; - using OutputCoordRepType = typename OutputMeshType::CoordRepType; + using OutputCoordinateType = typename OutputMeshType::CoordRepType; + using OutputCoordRepType = OutputCoordinateType; using OutputPointType = typename OutputMeshType::PointType; using OutputTraits = typename OutputMeshType::Traits; using OutputPointIdentifier = typename OutputMeshType::PointIdentifier; diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDelaunayConformingQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDelaunayConformingQuadEdgeMeshFilter.h index 5a77532e1f8..ff0d929acca 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDelaunayConformingQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDelaunayConformingQuadEdgeMeshFilter.h @@ -49,7 +49,8 @@ class ITK_TEMPLATE_EXPORT DelaunayConformingQuadEdgeMeshFilter /** Input types. */ using InputMeshType = TInputMesh; using InputMeshPointer = typename InputMeshType::Pointer; - using InputCoordRepType = typename InputMeshType::CoordRepType; + using InputCoordinateType = typename InputMeshType::CoordRepType; + using InputCoordRepType = InputCoordinateType; using InputPointType = typename InputMeshType::PointType; using InputPointVectorType = typename InputPointType::VectorType; using InputPointIdentifier = typename InputMeshType::PointIdentifier; @@ -73,7 +74,8 @@ class ITK_TEMPLATE_EXPORT DelaunayConformingQuadEdgeMeshFilter /** Output types. */ using OutputMeshType = TOutputMesh; using OutputMeshPointer = typename OutputMeshType::Pointer; - using OutputCoordRepType = typename OutputMeshType::CoordRepType; + using OutputCoordinateType = typename OutputMeshType::CoordRepType; + using OutputCoordRepType = OutputCoordinateType; using OutputPointType = typename OutputMeshType::PointType; using OutputPointIdentifier = typename OutputMeshType::PointIdentifier; using OutputCellType = typename OutputMeshType::CellType; diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkParameterizationQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkParameterizationQuadEdgeMeshFilter.h index d9d43c06113..2737291028e 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkParameterizationQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkParameterizationQuadEdgeMeshFilter.h @@ -69,7 +69,8 @@ class ITK_TEMPLATE_EXPORT ParameterizationQuadEdgeMeshFilter using InputMeshType = TInputMesh; using InputMeshPointer = typename InputMeshType::Pointer; using InputMeshConstPointer = typename InputMeshType::ConstPointer; - using InputCoordRepType = typename InputMeshType::CoordRepType; + using InputCoordinateType = typename InputMeshType::CoordRepType; + using InputCoordRepType = InputCoordinateType; using InputPointType = typename InputMeshType::PointType; using InputPointVectorType = typename InputPointType::VectorType; using InputPointIdentifier = typename InputMeshType::PointIdentifier; @@ -98,7 +99,8 @@ class ITK_TEMPLATE_EXPORT ParameterizationQuadEdgeMeshFilter using OutputMeshType = TOutputMesh; using OutputMeshPointer = typename OutputMeshType::Pointer; using OutputMeshConstPointer = typename OutputMeshType::ConstPointer; - using OutputCoordRepType = typename OutputMeshType::CoordRepType; + using OutputCoordinateType = typename OutputMeshType::CoordRepType; + using OutputCoordRepType = OutputCoordinateType; using OutputPointType = typename OutputMeshType::PointType; using OutputPointIdentifier = typename OutputMeshType::PointIdentifier; using OutputQEType = typename OutputMeshType::QEType; diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkQuadEdgeMeshParamMatrixCoefficients.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkQuadEdgeMeshParamMatrixCoefficients.h index 780a71f2d9a..cbd9c1ae8fe 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkQuadEdgeMeshParamMatrixCoefficients.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkQuadEdgeMeshParamMatrixCoefficients.h @@ -34,7 +34,8 @@ class MatrixCoefficients { public: using InputMeshType = TInputMesh; - using InputCoordRepType = typename InputMeshType::CoordRepType; + using InputCoordinateType = typename InputMeshType::CoordRepType; + using InputCoordRepType = InputCoordinateType; using InputQEType = typename InputMeshType::QEType; MatrixCoefficients() = default; @@ -58,7 +59,8 @@ class ITK_TEMPLATE_EXPORT OnesMatrixCoefficients : public MatrixCoefficients; using InputMeshType = TInputMesh; - using InputCoordRepType = typename InputMeshType::CoordRepType; + using InputCoordinateType = typename InputMeshType::CoordRepType; + using InputCoordRepType = InputCoordinateType; using InputQEType = typename InputMeshType::QEType; OnesMatrixCoefficients() = default; @@ -87,7 +89,8 @@ class ITK_TEMPLATE_EXPORT InverseEuclideanDistanceMatrixCoefficients : public Ma using Superclass = MatrixCoefficients; using InputMeshType = TInputMesh; - using InputCoordRepType = typename InputMeshType::CoordRepType; + using InputCoordinateType = typename InputMeshType::CoordRepType; + using InputCoordRepType = InputCoordinateType; using InputPointType = typename InputMeshType::PointType; using InputPointIdentifier = typename InputMeshType::PointIdentifier; using InputQEType = typename InputMeshType::QEType; @@ -129,7 +132,8 @@ class ITK_TEMPLATE_EXPORT ConformalMatrixCoefficients : public MatrixCoefficient using Superclass = MatrixCoefficients; using InputMeshType = TInputMesh; - using InputCoordRepType = typename InputMeshType::CoordRepType; + using InputCoordinateType = typename InputMeshType::CoordRepType; + using InputCoordRepType = InputCoordinateType; using InputPointType = typename InputMeshType::PointType; using InputPointIdentifier = typename InputMeshType::PointIdentifier; using InputQEType = typename InputMeshType::QEType; @@ -183,7 +187,8 @@ class ITK_TEMPLATE_EXPORT AuthalicMatrixCoefficients : public MatrixCoefficients using Superclass = MatrixCoefficients; using InputMeshType = TInputMesh; - using InputCoordRepType = typename InputMeshType::CoordRepType; + using InputCoordinateType = typename InputMeshType::CoordRepType; + using InputCoordRepType = InputCoordinateType; using InputPointType = typename InputMeshType::PointType; using InputPointIdentifier = typename InputMeshType::PointIdentifier; using InputQEType = typename InputMeshType::QEType; @@ -239,7 +244,8 @@ class ITK_TEMPLATE_EXPORT IntrinsicMatrixCoefficients : public MatrixCoefficient using Superclass = MatrixCoefficients; using InputMeshType = TInputMesh; - using InputCoordRepType = typename InputMeshType::CoordRepType; + using InputCoordinateType = typename InputMeshType::CoordRepType; + using InputCoordRepType = InputCoordinateType; using InputQEType = typename InputMeshType::QEType; InputCoordRepType m_Lambda; @@ -274,7 +280,8 @@ class ITK_TEMPLATE_EXPORT HarmonicMatrixCoefficients : public MatrixCoefficients using Superclass = MatrixCoefficients; using InputMeshType = TInputMesh; - using InputCoordRepType = typename InputMeshType::CoordRepType; + using InputCoordinateType = typename InputMeshType::CoordRepType; + using InputCoordRepType = InputCoordinateType; using InputPointType = typename InputMeshType::PointType; using InputVectorType = typename InputPointType::VectorType; using InputPointIdentifier = typename InputMeshType::PointIdentifier; diff --git a/Modules/IO/MeshBase/include/itkMeshFileReader.h b/Modules/IO/MeshBase/include/itkMeshFileReader.h index 3f2b0dc31d0..247e68ace19 100644 --- a/Modules/IO/MeshBase/include/itkMeshFileReader.h +++ b/Modules/IO/MeshBase/include/itkMeshFileReader.h @@ -97,7 +97,8 @@ class ITK_TEMPLATE_EXPORT MeshFileReader : public MeshSource /** Define output mesh types */ using OutputMeshType = TOutputMesh; - using OutputCoordRepType = typename OutputMeshType::CoordRepType; + using OutputCoordinateType = typename OutputMeshType::CoordRepType; + using OutputCoordRepType = OutputCoordinateType; using OutputPointPixelType = typename OutputMeshType::PixelType; using OutputCellPixelType = typename OutputMeshType::CellPixelType; using OutputPointType = typename OutputMeshType::PointType; diff --git a/Modules/Nonunit/Review/include/itkConformalFlatteningMeshFilter.h b/Modules/Nonunit/Review/include/itkConformalFlatteningMeshFilter.h index 14a8b061346..2a9c728fe46 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/Nonunit/Review/include/itkMultiphaseFiniteDifferenceImageFilter.h b/Modules/Nonunit/Review/include/itkMultiphaseFiniteDifferenceImageFilter.h index 4337c95f518..ed1d7ca0ba9 100644 --- a/Modules/Nonunit/Review/include/itkMultiphaseFiniteDifferenceImageFilter.h +++ b/Modules/Nonunit/Review/include/itkMultiphaseFiniteDifferenceImageFilter.h @@ -180,7 +180,8 @@ class ITK_TEMPLATE_EXPORT MultiphaseFiniteDifferenceImageFilter : public InPlace using InputImageType = TInputImage; using InputImagePointer = typename InputImageType::Pointer; using InputPointType = typename InputImageType::PointType; - using InputCoordRepType = typename InputPointType::CoordRepType; + using InputCoordinateType = typename InputPointType::CoordRepType; + using InputCoordRepType = InputCoordinateType; using InputIndexType = typename InputImageType::IndexType; using InputIndexValueType = typename InputIndexType::IndexValueType; using InputSizeType = typename InputImageType::SizeType; diff --git a/Modules/Registration/Common/include/itkMeanSquareRegistrationFunction.h b/Modules/Registration/Common/include/itkMeanSquareRegistrationFunction.h index 29470f778cc..a9ce07c6317 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 694ebd69164..0a95e1bdf6b 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 2d8b0f2269b..bc72cab2700 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 57cf8f4f633..26682f701f7 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 7df2fddd3cb..852a803b2d7 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 9fd2e3c8234..449fc2fd2d4 100644 --- a/Modules/Registration/Metricsv4/include/itkManifoldParzenWindowsPointSetFunction.h +++ b/Modules/Registration/Metricsv4/include/itkManifoldParzenWindowsPointSetFunction.h @@ -71,7 +71,8 @@ class ITK_TEMPLATE_EXPORT ManifoldParzenWindowsPointSetFunction : public PointSe /** Other type alias */ using RealType = TOutput; using OutputType = TOutput; - using CoordRepType = TCoordRep; + using CoordinateType = TCoordRep; + 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 f8214236c91..a67a2d43939 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 12c6df73b6d..4e15af551b6 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 acd0472970f..abc607005b4 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 a7b21175142..722265eec98 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 925754ef78b..f3f5c9e8748 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 1f29b19626c..2d3f2478019 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 = TCoordRep; + using CoordinateType = TCoordRep; + 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 014b665ea64..562959f6e86 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 e00c7a57d6d..08b2a4941ad 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