Skip to content

Commit

Permalink
ENH: FUTURE REMOVE ...CoordRepType in favor of ...CoordinateType
Browse files Browse the repository at this point in the history
Follow-up to pull request InsightSoftwareConsortium#4997
commit e667fa3
"ENH: Deprecate (FUTURE REMOVE) CoordRepType in favor of CoordinateType"
  • Loading branch information
N-Dekker committed Dec 3, 2024
1 parent 4187d82 commit 80dad29
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMeshToQuadEdgeMeshFilter : public MeshToMeshFi
using InputMeshPointer = typename InputMeshType::Pointer;
using InputMeshConstPointer = typename InputMeshType::ConstPointer;
using InputCoordinateType = typename InputMeshType::CoordinateType;
using InputCoordRepType = InputCoordinateType;
#ifndef ITK_FUTURE_LEGACY_REMOVE
using InputCoordRepType ITK_FUTURE_DEPRECATED(
"ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
#endif
using InputPointType = typename InputMeshType::PointType;
using InputPointIdentifier = typename InputMeshType::PointIdentifier;
using InputQEPrimal = typename InputMeshType::QEPrimal;
Expand Down Expand Up @@ -78,7 +81,10 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMeshToQuadEdgeMeshFilter : public MeshToMeshFi
using OutputMeshPointer = typename OutputMeshType::Pointer;
using OutputMeshConstPointer = typename OutputMeshType::ConstPointer;
using OutputCoordinateType = typename OutputMeshType::CoordinateType;
using OutputCoordRepType = OutputCoordinateType;
#ifndef ITK_FUTURE_LEGACY_REMOVE
using OutputCoordRepType ITK_FUTURE_DEPRECATED(
"ITK 6 discourages using `OutputCoordRepType`. Please use `OutputCoordinateType` instead!") = OutputCoordinateType;
#endif
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 @@ -64,7 +64,11 @@ class ITK_TEMPLATE_EXPORT BSplineTransformInitializer : public Object
using IndexType = typename ImageType::IndexType;
using ImagePointType = typename ImageType::PointType;
using ImagePointCoordinateType = typename ImagePointType::CoordinateType;
using ImagePointCoordRepType = ImagePointCoordinateType;
#ifndef ITK_FUTURE_LEGACY_REMOVE
using ImagePointCoordRepType ITK_FUTURE_DEPRECATED(
"ITK 6 discourages using `ImagePointCoordRepType`. Please use `ImagePointCoordinateType` instead!") =
ImagePointCoordinateType;
#endif

/** Types defined from transform traits. */
using TransformPointer = typename TransformType::Pointer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,10 @@ class ITK_TEMPLATE_EXPORT BorderQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEd
using InputMeshType = TInputMesh;
using InputMeshConstPointer = typename InputMeshType::ConstPointer;
using InputCoordinateType = typename InputMeshType::CoordinateType;
using InputCoordRepType = InputCoordinateType;
#ifndef ITK_FUTURE_LEGACY_REMOVE
using InputCoordRepType ITK_FUTURE_DEPRECATED(
"ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
#endif
using InputPointType = typename InputMeshType::PointType;
using InputTraits = typename InputMeshType::Traits;
using InputPointIdentifier = typename InputMeshType::PointIdentifier;
Expand All @@ -113,7 +116,10 @@ class ITK_TEMPLATE_EXPORT BorderQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEd
using OutputMeshType = TOutputMesh;
using OutputMeshPointer = typename OutputMeshType::Pointer;
using OutputCoordinateType = typename OutputMeshType::CoordinateType;
using OutputCoordRepType = OutputCoordinateType;
#ifndef ITK_FUTURE_LEGACY_REMOVE
using OutputCoordRepType ITK_FUTURE_DEPRECATED(
"ITK 6 discourages using `OutputCoordRepType`. Please use `OutputCoordinateType` instead!") = OutputCoordinateType;
#endif
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 @@ -50,7 +50,10 @@ class ITK_TEMPLATE_EXPORT DelaunayConformingQuadEdgeMeshFilter
using InputMeshType = TInputMesh;
using InputMeshPointer = typename InputMeshType::Pointer;
using InputCoordinateType = typename InputMeshType::CoordinateType;
using InputCoordRepType = InputCoordinateType;
#ifndef ITK_FUTURE_LEGACY_REMOVE
using InputCoordRepType ITK_FUTURE_DEPRECATED(
"ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
#endif
using InputPointType = typename InputMeshType::PointType;
using InputPointVectorType = typename InputPointType::VectorType;
using InputPointIdentifier = typename InputMeshType::PointIdentifier;
Expand All @@ -75,7 +78,10 @@ class ITK_TEMPLATE_EXPORT DelaunayConformingQuadEdgeMeshFilter
using OutputMeshType = TOutputMesh;
using OutputMeshPointer = typename OutputMeshType::Pointer;
using OutputCoordinateType = typename OutputMeshType::CoordinateType;
using OutputCoordRepType = OutputCoordinateType;
#ifndef ITK_FUTURE_LEGACY_REMOVE
using OutputCoordRepType ITK_FUTURE_DEPRECATED(
"ITK 6 discourages using `OutputCoordRepType`. Please use `OutputCoordinateType` instead!") = OutputCoordinateType;
#endif
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 @@ -70,7 +70,10 @@ class ITK_TEMPLATE_EXPORT ParameterizationQuadEdgeMeshFilter
using InputMeshPointer = typename InputMeshType::Pointer;
using InputMeshConstPointer = typename InputMeshType::ConstPointer;
using InputCoordinateType = typename InputMeshType::CoordinateType;
using InputCoordRepType = InputCoordinateType;
#ifndef ITK_FUTURE_LEGACY_REMOVE
using InputCoordRepType ITK_FUTURE_DEPRECATED(
"ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
#endif
using InputPointType = typename InputMeshType::PointType;
using InputPointVectorType = typename InputPointType::VectorType;
using InputPointIdentifier = typename InputMeshType::PointIdentifier;
Expand Down Expand Up @@ -100,7 +103,10 @@ class ITK_TEMPLATE_EXPORT ParameterizationQuadEdgeMeshFilter
using OutputMeshPointer = typename OutputMeshType::Pointer;
using OutputMeshConstPointer = typename OutputMeshType::ConstPointer;
using OutputCoordinateType = typename OutputMeshType::CoordinateType;
using OutputCoordRepType = OutputCoordinateType;
#ifndef ITK_FUTURE_LEGACY_REMOVE
using OutputCoordRepType ITK_FUTURE_DEPRECATED(
"ITK 6 discourages using `OutputCoordRepType`. Please use `OutputCoordinateType` instead!") = OutputCoordinateType;
#endif
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 @@ -35,7 +35,10 @@ class MatrixCoefficients
public:
using InputMeshType = TInputMesh;
using InputCoordinateType = typename InputMeshType::CoordinateType;
using InputCoordRepType = InputCoordinateType;
#ifndef ITK_FUTURE_LEGACY_REMOVE
using InputCoordRepType ITK_FUTURE_DEPRECATED(
"ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
#endif
using InputQEType = typename InputMeshType::QEType;

MatrixCoefficients() = default;
Expand All @@ -60,7 +63,10 @@ class ITK_TEMPLATE_EXPORT OnesMatrixCoefficients : public MatrixCoefficients<TIn

using InputMeshType = TInputMesh;
using InputCoordinateType = typename InputMeshType::CoordinateType;
using InputCoordRepType = InputCoordinateType;
#ifndef ITK_FUTURE_LEGACY_REMOVE
using InputCoordRepType ITK_FUTURE_DEPRECATED(
"ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
#endif
using InputQEType = typename InputMeshType::QEType;

OnesMatrixCoefficients() = default;
Expand Down Expand Up @@ -90,7 +96,10 @@ class ITK_TEMPLATE_EXPORT InverseEuclideanDistanceMatrixCoefficients : public Ma

using InputMeshType = TInputMesh;
using InputCoordinateType = typename InputMeshType::CoordinateType;
using InputCoordRepType = InputCoordinateType;
#ifndef ITK_FUTURE_LEGACY_REMOVE
using InputCoordRepType ITK_FUTURE_DEPRECATED(
"ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
#endif
using InputPointType = typename InputMeshType::PointType;
using InputPointIdentifier = typename InputMeshType::PointIdentifier;
using InputQEType = typename InputMeshType::QEType;
Expand Down Expand Up @@ -133,7 +142,10 @@ class ITK_TEMPLATE_EXPORT ConformalMatrixCoefficients : public MatrixCoefficient

using InputMeshType = TInputMesh;
using InputCoordinateType = typename InputMeshType::CoordinateType;
using InputCoordRepType = InputCoordinateType;
#ifndef ITK_FUTURE_LEGACY_REMOVE
using InputCoordRepType ITK_FUTURE_DEPRECATED(
"ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
#endif
using InputPointType = typename InputMeshType::PointType;
using InputPointIdentifier = typename InputMeshType::PointIdentifier;
using InputQEType = typename InputMeshType::QEType;
Expand Down Expand Up @@ -188,7 +200,10 @@ class ITK_TEMPLATE_EXPORT AuthalicMatrixCoefficients : public MatrixCoefficients

using InputMeshType = TInputMesh;
using InputCoordinateType = typename InputMeshType::CoordinateType;
using InputCoordRepType = InputCoordinateType;
#ifndef ITK_FUTURE_LEGACY_REMOVE
using InputCoordRepType ITK_FUTURE_DEPRECATED(
"ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
#endif
using InputPointType = typename InputMeshType::PointType;
using InputPointIdentifier = typename InputMeshType::PointIdentifier;
using InputQEType = typename InputMeshType::QEType;
Expand Down Expand Up @@ -245,7 +260,10 @@ class ITK_TEMPLATE_EXPORT IntrinsicMatrixCoefficients : public MatrixCoefficient

using InputMeshType = TInputMesh;
using InputCoordinateType = typename InputMeshType::CoordinateType;
using InputCoordRepType = InputCoordinateType;
#ifndef ITK_FUTURE_LEGACY_REMOVE
using InputCoordRepType ITK_FUTURE_DEPRECATED(
"ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
#endif
using InputQEType = typename InputMeshType::QEType;

InputCoordinateType m_Lambda;
Expand Down Expand Up @@ -281,7 +299,10 @@ class ITK_TEMPLATE_EXPORT HarmonicMatrixCoefficients : public MatrixCoefficients

using InputMeshType = TInputMesh;
using InputCoordinateType = typename InputMeshType::CoordinateType;
using InputCoordRepType = InputCoordinateType;
#ifndef ITK_FUTURE_LEGACY_REMOVE
using InputCoordRepType ITK_FUTURE_DEPRECATED(
"ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
#endif
using InputPointType = typename InputMeshType::PointType;
using InputVectorType = typename InputPointType::VectorType;
using InputPointIdentifier = typename InputMeshType::PointIdentifier;
Expand Down
5 changes: 4 additions & 1 deletion Modules/IO/MeshBase/include/itkMeshFileReader.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,10 @@ class ITK_TEMPLATE_EXPORT MeshFileReader : public MeshSource<TOutputMesh>
/** Define output mesh types */
using OutputMeshType = TOutputMesh;
using OutputCoordinateType = typename OutputMeshType::CoordinateType;
using OutputCoordRepType = OutputCoordinateType;
#ifndef ITK_FUTURE_LEGACY_REMOVE
using OutputCoordRepType ITK_FUTURE_DEPRECATED(
"ITK 6 discourages using `OutputCoordRepType`. Please use `OutputCoordinateType` instead!") = OutputCoordinateType;
#endif
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 @@ -181,7 +181,10 @@ class ITK_TEMPLATE_EXPORT MultiphaseFiniteDifferenceImageFilter : public InPlace
using InputImagePointer = typename InputImageType::Pointer;
using InputPointType = typename InputImageType::PointType;
using InputCoordinateType = typename InputPointType::CoordinateType;
using InputCoordRepType = InputCoordinateType;
#ifndef ITK_FUTURE_LEGACY_REMOVE
using InputCoordRepType ITK_FUTURE_DEPRECATED(
"ITK 6 discourages using `InputCoordRepType`. Please use `InputCoordinateType` instead!") = InputCoordinateType;
#endif
using InputIndexType = typename InputImageType::IndexType;
using InputIndexValueType = typename InputIndexType::IndexValueType;
using InputSizeType = typename InputImageType::SizeType;
Expand Down

0 comments on commit 80dad29

Please sign in to comment.