Skip to content

Commit 87d1e59

Browse files
hjmjohnsonhjmjohnson
committed
STYLE: CoordRepType -> CoordinateType code readability
For the sake of code readability, a new 'CoordinateType' alias is added for each nested 'CoordRepType' alias. The old 'CoordRepType' aliases will still be available with ITK 6.0, but it is recommended to use 'CoordinateType' instead. The 'CoordRepType' aliases will be removed when 'ITK_FUTURE_LEGACY_REMOVE' is enabled. Similarly, 'InputCoordinateType', 'OutputCoordinateType', and 'ImagePointCoordinateType' replace 'InputCoordRepType', 'OutputCoordRepType', and 'ImagePointCoordRepType', respectively.
1 parent 9753e13 commit 87d1e59

10 files changed

+21
-21
lines changed

‎include/itkCellAreaTriangleCellSubdivisionCriterion.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class CellAreaTriangleCellSubdivisionCriterion : public QuadEdgeMeshSubdivisionC
5252
using CellsContainerIterator = typename Superclass::CellsContainerIterator;
5353
using CellsContainerConstIterator = typename Superclass::CellsContainerConstIterator;
5454
using PointType = typename Superclass::PointType;
55-
using CoordRepType = typename Superclass::CoordRepType;
55+
using CoordinateType = typename Superclass::CoordinateType;
5656
using PointIdentifier = typename Superclass::PointIdentifier;
5757
using CellIdentifier = typename Superclass::CellIdentifier;
5858
using CellType = typename Superclass::CellType;
@@ -67,15 +67,15 @@ class CellAreaTriangleCellSubdivisionCriterion : public QuadEdgeMeshSubdivisionC
6767
void
6868
Compute(MeshType * mesh, SubdivisionCellContainer & cellIds) override;
6969

70-
itkGetConstMacro(MaximumArea, CoordRepType);
71-
itkSetMacro(MaximumArea, CoordRepType);
70+
itkGetConstMacro(MaximumArea, CoordinateType);
71+
itkSetMacro(MaximumArea, CoordinateType);
7272

7373
protected:
74-
CellAreaTriangleCellSubdivisionCriterion() { m_MaximumArea = NumericTraits<CoordRepType>::max(); }
74+
CellAreaTriangleCellSubdivisionCriterion() { m_MaximumArea = NumericTraits<CoordinateType>::max(); }
7575
~CellAreaTriangleCellSubdivisionCriterion() override = default;
7676

7777
private:
78-
CoordRepType m_MaximumArea;
78+
CoordinateType m_MaximumArea;
7979
};
8080

8181
} // namespace itk

‎include/itkCellAreaTriangleCellSubdivisionCriterion.hxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ CellAreaTriangleCellSubdivisionCriterion<TTriangleCellSubdivisionFilter>::Comput
5454
++nn;
5555
}
5656

57-
CoordRepType area = TriangleHelper<PointType>::ComputeArea(pointArray[0], pointArray[1], pointArray[2]);
57+
CoordinateType area = TriangleHelper<PointType>::ComputeArea(pointArray[0], pointArray[1], pointArray[2]);
5858
if (area > m_MaximumArea)
5959
{
6060
cellIds.push_back(static_cast<typename SubdivisionCellContainer::value_type>(cter->Index()));

‎include/itkEdgeLengthTriangleEdgeCellSubdivisionCriterion.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class EdgeLengthTriangleEdgeCellSubdivisionCriterion : public QuadEdgeMeshSubdiv
5151
using CellsContainerIterator = typename Superclass::CellsContainerIterator;
5252
using CellsContainerConstIterator = typename Superclass::CellsContainerConstIterator;
5353
using PointType = typename Superclass::PointType;
54-
using CoordRepType = typename Superclass::CoordRepType;
54+
using CoordinateType = typename Superclass::CoordinateType;
5555
using PointIdentifier = typename Superclass::PointIdentifier;
5656
using CellIdentifier = typename Superclass::CellIdentifier;
5757
using CellType = typename Superclass::CellType;
@@ -66,15 +66,15 @@ class EdgeLengthTriangleEdgeCellSubdivisionCriterion : public QuadEdgeMeshSubdiv
6666
void
6767
Compute(MeshType * mesh, SubdivisionCellContainer & edgeList) override;
6868

69-
itkGetConstMacro(MaximumLength, CoordRepType);
70-
itkSetMacro(MaximumLength, CoordRepType);
69+
itkGetConstMacro(MaximumLength, CoordinateType);
70+
itkSetMacro(MaximumLength, CoordinateType);
7171

7272
protected:
73-
EdgeLengthTriangleEdgeCellSubdivisionCriterion() { m_MaximumLength = NumericTraits<CoordRepType>::max(); }
73+
EdgeLengthTriangleEdgeCellSubdivisionCriterion() { m_MaximumLength = NumericTraits<CoordinateType>::max(); }
7474
~EdgeLengthTriangleEdgeCellSubdivisionCriterion() override = default;
7575

7676
private:
77-
CoordRepType m_MaximumLength;
77+
CoordinateType m_MaximumLength;
7878
};
7979

8080
} // namespace itk

‎include/itkLinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class LinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter
5353
using InputCellsContainerIterator = typename Superclass::InputCellsContainerIterator;
5454
using InputCellsContainerConstIterator = typename Superclass::InputCellsContainerConstIterator;
5555
using InputPointType = typename Superclass::InputPointType;
56-
using InputCoordType = typename Superclass::InputCoordRepType;
56+
using InputCoordType = typename Superclass::InputCoordinateType;
5757
using InputPointIdentifier = typename Superclass::InputPointIdentifier;
5858
using InputCellIdentifier = typename Superclass::InputCellIdentifier;
5959
using InputCellType = typename Superclass::InputCellType;

‎include/itkLoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class LoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter
5353
using InputCellsContainerIterator = typename Superclass::InputCellsContainerIterator;
5454
using InputCellsContainerConstIterator = typename Superclass::InputCellsContainerConstIterator;
5555
using InputPointType = typename Superclass::InputPointType;
56-
using InputCoordType = typename Superclass::InputCoordRepType;
56+
using InputCoordType = typename Superclass::InputCoordinateType;
5757
using InputPointIdentifier = typename Superclass::InputPointIdentifier;
5858
using InputCellIdentifier = typename Superclass::InputCellIdentifier;
5959
using InputCellType = typename Superclass::InputCellType;

‎include/itkModifiedButterflyTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class ModifiedButterflyTriangleEdgeCellSubdivisionQuadEdgeMeshFilter
5353
using InputCellsContainerIterator = typename Superclass::InputCellsContainerIterator;
5454
using InputCellsContainerConstIterator = typename Superclass::InputCellsContainerConstIterator;
5555
using InputPointType = typename Superclass::InputPointType;
56-
using InputCoordType = typename Superclass::InputCoordRepType;
56+
using InputCoordType = typename Superclass::InputCoordinateType;
5757
using InputPointIdentifier = typename Superclass::InputPointIdentifier;
5858
using InputCellIdentifier = typename Superclass::InputCellIdentifier;
5959
using InputCellType = typename Superclass::InputCellType;

‎include/itkQuadEdgeMeshSubdivisionCriterion.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class ITK_EXPORT QuadEdgeMeshSubdivisionCriterion : public Object
4848
using CellsContainerIterator = typename MeshType::CellsContainerIterator;
4949
using CellsContainerConstIterator = typename MeshType::CellsContainerConstIterator;
5050
using PointType = typename MeshType::PointType;
51-
using CoordRepType = typename MeshType::CoordRepType;
51+
using CoordinateType = typename MeshType::CoordinateType;
5252
using PointIdentifier = typename MeshType::PointIdentifier;
5353
using CellIdentifier = typename MeshType::CellIdentifier;
5454
using CellType = typename MeshType::CellType;

‎include/itkSubdivisionQuadEdgeMeshFilter.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class SubdivisionQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEdgeMeshFilter<TI
5959
using InputCellsContainerIterator = typename InputMeshType::CellsContainerIterator;
6060
using InputCellsContainerConstIterator = typename InputMeshType::CellsContainerConstIterator;
6161
using InputPointType = typename InputMeshType::PointType;
62-
using InputCoordType = typename InputMeshType::CoordRepType;
62+
using InputCoordType = typename InputMeshType::CoordinateType;
6363
using InputPointIdentifier = typename InputMeshType::PointIdentifier;
6464
using InputCellIdentifier = typename InputMeshType::CellIdentifier;
6565
using InputCellType = typename InputMeshType::CellType;
@@ -76,7 +76,7 @@ class SubdivisionQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEdgeMeshFilter<TI
7676
using OutputCellsContainerIterator = typename OutputMeshType::CellsContainerIterator;
7777
using OutputCellsContainerConstIterator = typename OutputMeshType::CellsContainerConstIterator;
7878
using OutputPointType = typename OutputMeshType::PointType;
79-
using OutputCoordType = typename OutputMeshType::CoordRepType;
79+
using OutputCoordType = typename OutputMeshType::CoordinateType;
8080
using OutputPointIdentifier = typename OutputMeshType::PointIdentifier;
8181
using OutputCellIdentifier = typename OutputMeshType::CellIdentifier;
8282
using OutputCellType = typename OutputMeshType::CellType;

‎include/itkTriangleCellSubdivisionQuadEdgeMeshFilter.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class TriangleCellSubdivisionQuadEdgeMeshFilter : public SubdivisionQuadEdgeMesh
5858
using InputCellsContainerIterator = typename Superclass::InputCellsContainerIterator;
5959
using InputCellsContainerConstIterator = typename Superclass::InputCellsContainerConstIterator;
6060
using InputPointType = typename Superclass::InputPointType;
61-
using InputCoordType = typename Superclass::InputCoordRepType;
61+
using InputCoordType = typename Superclass::InputCoordinateType;
6262
using InputPointIdentifier = typename Superclass::InputPointIdentifier;
6363
using InputCellIdentifier = typename Superclass::InputCellIdentifier;
6464
using InputCellType = typename Superclass::InputCellType;
@@ -75,7 +75,7 @@ class TriangleCellSubdivisionQuadEdgeMeshFilter : public SubdivisionQuadEdgeMesh
7575
using OutputCellsContainerIterator = typename Superclass::OutputCellsContainerIterator;
7676
using OutputCellsContainerConstIterator = typename Superclass::OutputCellsContainerConstIterator;
7777
using OutputPointType = typename Superclass::OutputPointType;
78-
using OutputCoordType = typename Superclass::OutputCoordRepType;
78+
using OutputCoordType = typename Superclass::OutputCoordinateType;
7979
using OutputPointIdentifier = typename Superclass::OutputPointIdentifier;
8080
using OutputCellIdentifier = typename Superclass::OutputCellIdentifier;
8181
using OutputCellType = typename Superclass::OutputCellType;

‎include/itkTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class TriangleEdgeCellSubdivisionQuadEdgeMeshFilter
5353
using InputCellsContainerIterator = typename Superclass::InputCellsContainerIterator;
5454
using InputCellsContainerConstIterator = typename Superclass::InputCellsContainerConstIterator;
5555
using InputPointType = typename Superclass::InputPointType;
56-
using InputCoordType = typename Superclass::InputCoordRepType;
56+
using InputCoordType = typename Superclass::InputCoordinateType;
5757
using InputPointIdentifier = typename Superclass::InputPointIdentifier;
5858
using InputCellIdentifier = typename Superclass::InputCellIdentifier;
5959
using InputCellType = typename Superclass::InputCellType;
@@ -70,7 +70,7 @@ class TriangleEdgeCellSubdivisionQuadEdgeMeshFilter
7070
using OutputCellsContainerIterator = typename Superclass::OutputCellsContainerIterator;
7171
using OutputCellsContainerConstIterator = typename Superclass::OutputCellsContainerConstIterator;
7272
using OutputPointType = typename Superclass::OutputPointType;
73-
using OutputCoordType = typename Superclass::OutputCoordRepType;
73+
using OutputCoordType = typename Superclass::OutputCoordinateType;
7474
using OutputPointIdentifier = typename Superclass::OutputPointIdentifier;
7575
using OutputCellIdentifier = typename Superclass::OutputCellIdentifier;
7676
using OutputCellType = typename Superclass::OutputCellType;

0 commit comments

Comments
 (0)