Skip to content

Commit

Permalink
ENH: Add ...CoordinateType aliases as alternative to ...CoordRepType
Browse files Browse the repository at this point in the history
Redid pull request InsightSoftwareConsortium#5006
commit fbe9b04 on release-5.4.
  • Loading branch information
N-Dekker authored and hjmjohnson committed Dec 5, 2024
1 parent bdfd0c2 commit be27beb
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMeshToQuadEdgeMeshFilter : public MeshToMeshFi
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 InputPointIdentifier = typename InputMeshType::PointIdentifier;
using InputQEPrimal = typename InputMeshType::QEPrimal;
Expand All @@ -76,7 +77,8 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMeshToQuadEdgeMeshFilter : public MeshToMeshFi
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 OutputQEPrimal = typename OutputMeshType::QEPrimal;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ class ITK_TEMPLATE_EXPORT BSplineTransformInitializer : public Object
using ImagePointer = typename ImageType::ConstPointer;
using IndexType = typename ImageType::IndexType;
using ImagePointType = typename ImageType::PointType;
using ImagePointCoordRepType = typename ImagePointType::CoordRepType;
using ImagePointCoordinateType = typename ImagePointType::CoordRepType;
using ImagePointCoordRepType = ImagePointCoordinateType;

/** Types defined from transform traits. */
using TransformPointer = typename TransformType::Pointer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -58,7 +59,8 @@ class ITK_TEMPLATE_EXPORT OnesMatrixCoefficients : public MatrixCoefficients<TIn
using Superclass = MatrixCoefficients<TInputMesh>;

using InputMeshType = TInputMesh;
using InputCoordRepType = typename InputMeshType::CoordRepType;
using InputCoordinateType = typename InputMeshType::CoordRepType;
using InputCoordRepType = InputCoordinateType;
using InputQEType = typename InputMeshType::QEType;

OnesMatrixCoefficients() = default;
Expand Down Expand Up @@ -87,7 +89,8 @@ class ITK_TEMPLATE_EXPORT InverseEuclideanDistanceMatrixCoefficients : public Ma
using Superclass = MatrixCoefficients<TInputMesh>;

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;
Expand Down Expand Up @@ -129,7 +132,8 @@ class ITK_TEMPLATE_EXPORT ConformalMatrixCoefficients : public MatrixCoefficient
using Superclass = MatrixCoefficients<TInputMesh>;

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;
Expand Down Expand Up @@ -183,7 +187,8 @@ class ITK_TEMPLATE_EXPORT AuthalicMatrixCoefficients : public MatrixCoefficients
using Superclass = MatrixCoefficients<TInputMesh>;

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;
Expand Down Expand Up @@ -239,7 +244,8 @@ class ITK_TEMPLATE_EXPORT IntrinsicMatrixCoefficients : public MatrixCoefficient
using Superclass = MatrixCoefficients<TInputMesh>;

using InputMeshType = TInputMesh;
using InputCoordRepType = typename InputMeshType::CoordRepType;
using InputCoordinateType = typename InputMeshType::CoordRepType;
using InputCoordRepType = InputCoordinateType;
using InputQEType = typename InputMeshType::QEType;

InputCoordRepType m_Lambda;
Expand Down Expand Up @@ -274,7 +280,8 @@ class ITK_TEMPLATE_EXPORT HarmonicMatrixCoefficients : public MatrixCoefficients
using Superclass = MatrixCoefficients<TInputMesh>;

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;
Expand Down
3 changes: 2 additions & 1 deletion Modules/IO/MeshBase/include/itkMeshFileReader.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ class ITK_TEMPLATE_EXPORT MeshFileReader : public MeshSource<TOutputMesh>

/** 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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit be27beb

Please sign in to comment.