diff --git a/Modules/Core/Common/test/itkConicShellInteriorExteriorSpatialFunctionTest.cxx b/Modules/Core/Common/test/itkConicShellInteriorExteriorSpatialFunctionTest.cxx index f7533b28865..c994cfcedf2 100644 --- a/Modules/Core/Common/test/itkConicShellInteriorExteriorSpatialFunctionTest.cxx +++ b/Modules/Core/Common/test/itkConicShellInteriorExteriorSpatialFunctionTest.cxx @@ -31,10 +31,10 @@ itkConicShellInteriorExteriorSpatialFunctionTest(int, char *[]) constexpr unsigned int PointDimension = 3; // Define the point coordinate representation type - using PointCoordRepType = float; + using PointCoordinateType = float; // Define the point type - using PointType = itk::Point; + using PointType = itk::Point; // Define the type for the conic spatial function using ConicShellInteriorExteriorSpatialFunctionType = diff --git a/Modules/Core/Common/test/itkFrustumSpatialFunctionTest.cxx b/Modules/Core/Common/test/itkFrustumSpatialFunctionTest.cxx index 067af08df4f..4f6fdd1e83a 100644 --- a/Modules/Core/Common/test/itkFrustumSpatialFunctionTest.cxx +++ b/Modules/Core/Common/test/itkFrustumSpatialFunctionTest.cxx @@ -29,10 +29,10 @@ itkFrustumSpatialFunctionTest(int, char *[]) constexpr unsigned int PointDimension = 3; // Define the point coordinate representation type - using PointCoordRepType = float; + using PointCoordinateType = float; // Define the point type - using PointType = itk::Point; + using PointType = itk::Point; // Define the type for the frustum spatial function using FrustumSpatialFunctionType = itk::FrustumSpatialFunction; diff --git a/Modules/Core/Common/test/itkTorusInteriorExteriorSpatialFunctionTest.cxx b/Modules/Core/Common/test/itkTorusInteriorExteriorSpatialFunctionTest.cxx index e35ed14a5a3..cfdf46e2660 100644 --- a/Modules/Core/Common/test/itkTorusInteriorExteriorSpatialFunctionTest.cxx +++ b/Modules/Core/Common/test/itkTorusInteriorExteriorSpatialFunctionTest.cxx @@ -28,10 +28,10 @@ itkTorusInteriorExteriorSpatialFunctionTest(int, char *[]) constexpr unsigned int PointDimension = 3; // Define the point coordinate representation type - using PointCoordRepType = float; + using PointCoordinateType = float; // Define the point type - using PointType = itk::Point; + using PointType = itk::Point; // Define the type for the torus spatial function using TorusInteriorExteriorSpatialFunctionType = itk::TorusInteriorExteriorSpatialFunction; diff --git a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshToQuadEdgeMeshFilter.h b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshToQuadEdgeMeshFilter.h index b0d9890995d..3a89efdf7e3 100644 --- a/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshToQuadEdgeMeshFilter.h +++ b/Modules/Core/QuadEdgeMesh/include/itkQuadEdgeMeshToQuadEdgeMeshFilter.h @@ -49,7 +49,11 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMeshToQuadEdgeMeshFilter : public MeshToMeshFi using InputMeshType = TInputMesh; using InputMeshPointer = typename InputMeshType::Pointer; using InputMeshConstPointer = typename InputMeshType::ConstPointer; - using InputCoordRepType = typename InputMeshType::CoordinateType; + using InputCoordinateType = typename InputMeshType::CoordinateType; +#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; @@ -76,7 +80,11 @@ class ITK_TEMPLATE_EXPORT QuadEdgeMeshToQuadEdgeMeshFilter : public MeshToMeshFi using OutputMeshType = TOutputMesh; using OutputMeshPointer = typename OutputMeshType::Pointer; using OutputMeshConstPointer = typename OutputMeshType::ConstPointer; - using OutputCoordRepType = typename OutputMeshType::CoordinateType; + using OutputCoordinateType = typename OutputMeshType::CoordinateType; +#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; diff --git a/Modules/Core/Transform/include/itkBSplineTransformInitializer.h b/Modules/Core/Transform/include/itkBSplineTransformInitializer.h index a48510ef82e..f0e8eb122d0 100644 --- a/Modules/Core/Transform/include/itkBSplineTransformInitializer.h +++ b/Modules/Core/Transform/include/itkBSplineTransformInitializer.h @@ -63,7 +63,12 @@ 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::CoordinateType; + using ImagePointCoordinateType = typename ImagePointType::CoordinateType; +#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; diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkBorderQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkBorderQuadEdgeMeshFilter.h index 6638e68dd63..2c02f9036e4 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkBorderQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkBorderQuadEdgeMeshFilter.h @@ -92,7 +92,11 @@ class ITK_TEMPLATE_EXPORT BorderQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEd using InputMeshType = TInputMesh; using InputMeshConstPointer = typename InputMeshType::ConstPointer; - using InputCoordRepType = typename InputMeshType::CoordinateType; + using InputCoordinateType = typename InputMeshType::CoordinateType; +#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; @@ -111,7 +115,11 @@ class ITK_TEMPLATE_EXPORT BorderQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEd using OutputMeshType = TOutputMesh; using OutputMeshPointer = typename OutputMeshType::Pointer; - using OutputCoordRepType = typename OutputMeshType::CoordinateType; + using OutputCoordinateType = typename OutputMeshType::CoordinateType; +#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; @@ -153,8 +161,8 @@ class ITK_TEMPLATE_EXPORT BorderQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEd itkSetEnumMacro(BorderPick, BorderPickEnum); itkGetConstMacro(BorderPick, BorderPickEnum); - itkSetMacro(Radius, InputCoordRepType); - itkGetConstMacro(Radius, InputCoordRepType); + itkSetMacro(Radius, InputCoordinateType); + itkGetConstMacro(Radius, InputCoordinateType); void ComputeTransform(); @@ -176,7 +184,7 @@ class ITK_TEMPLATE_EXPORT BorderQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEd BorderTransformEnum m_TransformType{}; BorderPickEnum m_BorderPick{}; - InputCoordRepType m_Radius{}; + InputCoordinateType m_Radius{}; InputVectorPointType m_Border{}; @@ -200,7 +208,7 @@ class ITK_TEMPLATE_EXPORT BorderQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEd InputPointType GetMeshBarycentre(); - InputCoordRepType + InputCoordinateType RadiusMaxSquare(); void diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkBorderQuadEdgeMeshFilter.hxx b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkBorderQuadEdgeMeshFilter.hxx index 1a43e2b45f3..1d9ee18a87d 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkBorderQuadEdgeMeshFilter.hxx +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkBorderQuadEdgeMeshFilter.hxx @@ -107,9 +107,9 @@ BorderQuadEdgeMeshFilter::ComputeLongestBorder() -> Inp itkGenericExceptionMacro("This filter requires at least one boundary"); } - InputCoordRepType max_length(0.0); - InputCoordRepType length(0.0); - auto oborder_it = list->begin(); + InputCoordinateType max_length(0.0); + InputCoordinateType length(0.0); + auto oborder_it = list->begin(); for (auto b_it = list->begin(); b_it != list->end(); ++b_it) { @@ -194,10 +194,10 @@ BorderQuadEdgeMeshFilter::DiskTransform() auto NbBoundaryPt = static_cast(this->m_BoundaryPtMap.size()); - InputCoordRepType r = this->RadiusMaxSquare(); + InputCoordinateType r = this->RadiusMaxSquare(); - InputCoordRepType two_r = 2.0 * r; - InputCoordRepType inv_two_r = 1.0 / two_r; + InputCoordinateType two_r = 2.0 * r; + InputCoordinateType inv_two_r = 1.0 / two_r; InputPointIdentifier id = this->m_BoundaryPtMap.begin()->first; InputPointType pt1 = input->GetPoint(id); @@ -205,10 +205,10 @@ BorderQuadEdgeMeshFilter::DiskTransform() id = (--m_BoundaryPtMap.end())->first; InputPointType pt2 = input->GetPoint(id); - InputCoordRepType dist = pt1.SquaredEuclideanDistanceTo(pt2); + InputCoordinateType dist = pt1.SquaredEuclideanDistanceTo(pt2); - std::vector tetas(NbBoundaryPt, 0.0); - tetas[0] = static_cast(std::acos((two_r - dist) * inv_two_r)); + std::vector tetas(NbBoundaryPt, 0.0); + tetas[0] = static_cast(std::acos((two_r - dist) * inv_two_r)); auto BoundaryPtIterator = this->m_BoundaryPtMap.begin(); @@ -231,7 +231,7 @@ BorderQuadEdgeMeshFilter::DiskTransform() ++BoundaryPtIterator; } - InputCoordRepType a = (2.0 * itk::Math::pi) / tetas[NbBoundaryPt - 1]; + InputCoordinateType a = (2.0 * itk::Math::pi) / tetas[NbBoundaryPt - 1]; if (this->m_Radius == 0.0) { @@ -244,8 +244,8 @@ BorderQuadEdgeMeshFilter::DiskTransform() id = BoundaryPtMapIterator->first; j = BoundaryPtMapIterator->second; - pt1[0] = this->m_Radius * static_cast(std::cos(a * tetas[j])); - pt1[1] = this->m_Radius * static_cast(std::sin(a * tetas[j])); + pt1[0] = this->m_Radius * static_cast(std::cos(a * tetas[j])); + pt1[1] = this->m_Radius * static_cast(std::sin(a * tetas[j])); pt1[2] = 0.0; this->m_Border[j] = pt1; @@ -255,19 +255,19 @@ BorderQuadEdgeMeshFilter::DiskTransform() // ---------------------------------------------------------------------------- template auto -BorderQuadEdgeMeshFilter::RadiusMaxSquare() -> InputCoordRepType +BorderQuadEdgeMeshFilter::RadiusMaxSquare() -> InputCoordinateType { InputMeshConstPointer input = this->GetInput(); InputPointType center = this->GetMeshBarycentre(); - InputCoordRepType oRmax(0.); - InputCoordRepType r; + InputCoordinateType oRmax(0.); + InputCoordinateType r; for (auto BoundaryPtIterator = this->m_BoundaryPtMap.begin(); BoundaryPtIterator != this->m_BoundaryPtMap.end(); ++BoundaryPtIterator) { - r = static_cast(center.SquaredEuclideanDistanceTo(input->GetPoint(BoundaryPtIterator->first))); + r = static_cast(center.SquaredEuclideanDistanceTo(input->GetPoint(BoundaryPtIterator->first))); if (r > oRmax) { @@ -306,7 +306,7 @@ BorderQuadEdgeMeshFilter::GetMeshBarycentre() -> InputP ++PointIterator; } - InputCoordRepType invNbOfPoints = 1.0 / static_cast(input->GetNumberOfPoints()); + InputCoordinateType invNbOfPoints = 1.0 / static_cast(input->GetNumberOfPoints()); for (i = 0; i < PointDimension; ++i) { @@ -355,10 +355,10 @@ BorderQuadEdgeMeshFilter::ArcLengthSquareTransform() auto NbBoundaryPt = static_cast(this->m_BoundaryPtMap.size()); - std::vector Length(NbBoundaryPt + 1, 0.0); + std::vector Length(NbBoundaryPt + 1, 0.0); - InputCoordRepType TotalLength(0.0); - InputCoordRepType distance; + InputCoordinateType TotalLength(0.0); + InputCoordinateType distance; InputPointIdentifier i(0); InputPointIdentifier org(0); @@ -384,8 +384,8 @@ BorderQuadEdgeMeshFilter::ArcLengthSquareTransform() this->m_Radius = 1000.; } - InputCoordRepType EdgeLength = 2.0 * this->m_Radius; - InputCoordRepType ratio = 4.0 * EdgeLength / TotalLength; + InputCoordinateType EdgeLength = 2.0 * this->m_Radius; + InputCoordinateType ratio = 4.0 * EdgeLength / TotalLength; for (i = 0; i < NbBoundaryPt + 1; ++i) { diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkCleanQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkCleanQuadEdgeMeshFilter.h index e7a3ea1aecc..f55de89508a 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkCleanQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkCleanQuadEdgeMeshFilter.h @@ -51,7 +51,7 @@ class ITK_TEMPLATE_EXPORT CleanQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEdg using InputMeshType = TInputMesh; using typename Superclass::InputMeshPointer; - using typename Superclass::InputCoordRepType; + using typename Superclass::InputCoordinateType; using typename Superclass::InputPointType; using typename Superclass::InputPointIdentifier; using typename Superclass::InputQEPrimal; @@ -74,7 +74,7 @@ class ITK_TEMPLATE_EXPORT CleanQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEdg using OutputMeshType = TOutputMesh; using typename Superclass::OutputMeshPointer; - using typename Superclass::OutputCoordRepType; + using typename Superclass::OutputCoordinateType; using typename Superclass::OutputPointType; using typename Superclass::OutputPointIdentifier; using typename Superclass::OutputQEPrimal; @@ -88,7 +88,7 @@ class ITK_TEMPLATE_EXPORT CleanQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEdg using OutputCellsContainerIterator = typename OutputMeshType::CellsContainerIterator; using BoundingBoxType = - BoundingBox; + BoundingBox; using BoundingBoxPointer = typename BoundingBoxType::Pointer; @@ -99,12 +99,12 @@ class ITK_TEMPLATE_EXPORT CleanQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEdg using DecimationPointer = typename DecimationType::Pointer; /** TODO */ - itkSetMacro(AbsoluteTolerance, InputCoordRepType); - itkGetConstMacro(AbsoluteTolerance, InputCoordRepType); + itkSetMacro(AbsoluteTolerance, InputCoordinateType); + itkGetConstMacro(AbsoluteTolerance, InputCoordinateType); /** TODO */ - itkSetClampMacro(RelativeTolerance, InputCoordRepType, 0.0, 1.0); - itkGetConstMacro(RelativeTolerance, InputCoordRepType); + itkSetClampMacro(RelativeTolerance, InputCoordinateType, 0.0, 1.0); + itkGetConstMacro(RelativeTolerance, InputCoordinateType); protected: CleanQuadEdgeMeshFilter(); @@ -115,7 +115,7 @@ class ITK_TEMPLATE_EXPORT CleanQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEdg GenerateData() override; virtual void - MergePoints(const InputCoordRepType absoluteToleranceSquared); + MergePoints(const InputCoordinateType absoluteToleranceSquared); virtual void CleanPoints(); @@ -124,8 +124,8 @@ class ITK_TEMPLATE_EXPORT CleanQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEdg PrintSelf(std::ostream & os, Indent indent) const override; private: - InputCoordRepType m_AbsoluteTolerance{}; - InputCoordRepType m_RelativeTolerance{}; + InputCoordinateType m_AbsoluteTolerance{}; + InputCoordinateType m_RelativeTolerance{}; BoundingBoxPointer m_BoundingBox{}; CriterionPointer m_Criterion{}; diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkCleanQuadEdgeMeshFilter.hxx b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkCleanQuadEdgeMeshFilter.hxx index 51f459ad851..1b733d5fa8e 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkCleanQuadEdgeMeshFilter.hxx +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkCleanQuadEdgeMeshFilter.hxx @@ -26,8 +26,8 @@ namespace itk template CleanQuadEdgeMeshFilter::CleanQuadEdgeMeshFilter() { - this->m_AbsoluteTolerance = InputCoordRepType{}; - this->m_RelativeTolerance = InputCoordRepType{}; + this->m_AbsoluteTolerance = InputCoordinateType{}; + this->m_RelativeTolerance = InputCoordinateType{}; this->m_BoundingBox = BoundingBoxType::New(); @@ -43,9 +43,9 @@ template void CleanQuadEdgeMeshFilter::GenerateData() { - InputCoordRepType zeroValue{}; + InputCoordinateType zeroValue{}; - InputCoordRepType absoluteToleranceSquared = this->m_AbsoluteTolerance * this->m_AbsoluteTolerance; + InputCoordinateType absoluteToleranceSquared = this->m_AbsoluteTolerance * this->m_AbsoluteTolerance; if ((Math::ExactlyEquals(this->m_AbsoluteTolerance, zeroValue)) && (Math::NotExactlyEquals(this->m_RelativeTolerance, zeroValue))) { @@ -63,7 +63,7 @@ CleanQuadEdgeMeshFilter::GenerateData() template void -CleanQuadEdgeMeshFilter::MergePoints(const InputCoordRepType absoluteToleranceSquared) +CleanQuadEdgeMeshFilter::MergePoints(const InputCoordinateType absoluteToleranceSquared) { OutputMeshPointer output = this->GetOutput(); diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDelaunayConformingQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDelaunayConformingQuadEdgeMeshFilter.h index 7433b147609..1c5818fa342 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDelaunayConformingQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkDelaunayConformingQuadEdgeMeshFilter.h @@ -49,7 +49,11 @@ class ITK_TEMPLATE_EXPORT DelaunayConformingQuadEdgeMeshFilter /** Input types. */ using InputMeshType = TInputMesh; using InputMeshPointer = typename InputMeshType::Pointer; - using InputCoordRepType = typename InputMeshType::CoordinateType; + using InputCoordinateType = typename InputMeshType::CoordinateType; +#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; @@ -73,7 +77,11 @@ class ITK_TEMPLATE_EXPORT DelaunayConformingQuadEdgeMeshFilter /** Output types. */ using OutputMeshType = TOutputMesh; using OutputMeshPointer = typename OutputMeshType::Pointer; - using OutputCoordRepType = typename OutputMeshType::CoordinateType; + using OutputCoordinateType = typename OutputMeshType::CoordinateType; +#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; @@ -166,10 +174,10 @@ class ITK_TEMPLATE_EXPORT DelaunayConformingQuadEdgeMeshFilter OutputVectorType v2A = ptA - pt2; OutputVectorType v2B = ptB - pt2; - OutputCoordRepType sq_norm1A = v1A * v1A; - OutputCoordRepType sq_norm1B = v1B * v1B; - OutputCoordRepType sq_norm2A = v2A * v2A; - OutputCoordRepType sq_norm2B = v2B * v2B; + OutputCoordinateType sq_norm1A = v1A * v1A; + OutputCoordinateType sq_norm1B = v1B * v1B; + OutputCoordinateType sq_norm2A = v2A * v2A; + OutputCoordinateType sq_norm2B = v2B * v2B; auto dotA = static_cast(v1A * v2A); auto dotB = static_cast(v1B * v2B); diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilter.h index 73df151a20f..910a599a5b2 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilter.h @@ -134,7 +134,7 @@ class ITK_TEMPLATE_EXPORT LaplacianDeformationQuadEdgeMeshFilter /** Output types. */ using OutputMeshType = TOutputMesh; - using typename Superclass::OutputCoordRepType; + using typename Superclass::OutputCoordinateType; using typename Superclass::OutputPointType; using typename Superclass::OutputPointIdentifier; using typename Superclass::OutputQEPrimal; @@ -219,13 +219,13 @@ class ITK_TEMPLATE_EXPORT LaplacianDeformationQuadEdgeMeshFilter } }; - using CoefficientMapType = std::unordered_map; + using CoefficientMapType = std::unordered_map; using CoefficientMapConstIterator = typename CoefficientMapType::const_iterator; - using AreaMapType = std::unordered_map; + using AreaMapType = std::unordered_map; using AreaMapConstIterator = typename AreaMapType::const_iterator; - using RowType = std::unordered_map; + using RowType = std::unordered_map; using RowIterator = typename RowType::iterator; using RowConstIterator = typename RowType::const_iterator; @@ -242,9 +242,9 @@ class ITK_TEMPLATE_EXPORT LaplacianDeformationQuadEdgeMeshFilter void PrintSelf(std::ostream & os, Indent indent) const override; - OutputCoordRepType + OutputCoordinateType ComputeMixedAreaForGivenVertex(OutputPointIdentifier iId); - OutputCoordRepType + OutputCoordinateType ComputeMixedArea(OutputQEPrimal * iQE1, OutputQEPrimal * iQE2); virtual void @@ -254,7 +254,7 @@ class ITK_TEMPLATE_EXPORT LaplacianDeformationQuadEdgeMeshFilter ComputeLaplacianMatrix(MatrixType & ioL); void - FillMatrixRow(OutputPointIdentifier iId, unsigned int iDegree, OutputCoordRepType iWeight, RowType & ioRow); + FillMatrixRow(OutputPointIdentifier iId, unsigned int iDegree, OutputCoordinateType iWeight, RowType & ioRow); /** * \brief Fill matrix iM and vectors Bx, m_By and m_Bz depending on if one @@ -289,14 +289,14 @@ class ITK_TEMPLATE_EXPORT LaplacianDeformationQuadEdgeMeshFilter struct Triple { Triple() = default; - Triple(OutputPointIdentifier iV, OutputCoordRepType iWeight, unsigned int iDegree) + Triple(OutputPointIdentifier iV, OutputCoordinateType iWeight, unsigned int iDegree) : m_Id(iV) , m_Weight(iWeight) , m_Degree(iDegree) {} OutputPointIdentifier m_Id; - OutputCoordRepType m_Weight; + OutputCoordinateType m_Weight; unsigned int m_Degree; }; }; diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilter.hxx b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilter.hxx index 2e203597876..916d7fa92c7 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilter.hxx +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilter.hxx @@ -43,14 +43,14 @@ LaplacianDeformationQuadEdgeMeshFilter:: template auto LaplacianDeformationQuadEdgeMeshFilter::ComputeMixedAreaForGivenVertex( - OutputPointIdentifier iId) -> OutputCoordRepType + OutputPointIdentifier iId) -> OutputCoordinateType { OutputMeshType * output = this->GetOutput(); OutputQEPrimal * qe = output->FindEdge(iId); OutputQEPrimal * qeIt = qe; OutputQEPrimal * qeIt2 = qe->GetOnext(); - OutputCoordRepType oW{}; + OutputCoordinateType oW{}; do { @@ -67,7 +67,7 @@ template auto LaplacianDeformationQuadEdgeMeshFilter::ComputeMixedArea(OutputQEPrimal * iQE1, OutputQEPrimal * iQE2) - -> OutputCoordRepType + -> OutputCoordinateType { if (iQE1->IsLeftSet()) { @@ -88,11 +88,11 @@ LaplacianDeformationQuadEdgeMeshFilter:: p[i] = points->GetElement(vId[i]); } - OutputCoordRepType area = TriangleType::ComputeMixedArea(p[0], p[1], p[2]); + OutputCoordinateType area = TriangleType::ComputeMixedArea(p[0], p[1], p[2]); if (area < itk::Math::eps) { - return OutputCoordRepType{}; + return OutputCoordinateType{}; } else { @@ -101,7 +101,7 @@ LaplacianDeformationQuadEdgeMeshFilter:: } else { - return OutputCoordRepType{}; + return OutputCoordinateType{}; } } @@ -186,7 +186,7 @@ void LaplacianDeformationQuadEdgeMeshFilter::FillMatrixRow( OutputPointIdentifier iId, unsigned int iDegree, - OutputCoordRepType iWeight, + OutputCoordinateType iWeight, RowType & ioRow) { OutputMeshType * output = this->GetOutput(); @@ -215,7 +215,7 @@ LaplacianDeformationQuadEdgeMeshFilter:: if (rIt == ioRow.end()) { - ioRow.insert(std::pair(vId, t.m_Weight)); + ioRow.insert(std::pair(vId, t.m_Weight)); } else { @@ -224,8 +224,8 @@ LaplacianDeformationQuadEdgeMeshFilter:: } else { - OutputCoordRepType ww{}; - OutputCoordRepType w{}; + OutputCoordinateType ww{}; + OutputCoordinateType w{}; qe = output->FindEdge(vId); if (qe) @@ -251,7 +251,7 @@ LaplacianDeformationQuadEdgeMeshFilter:: if (m_AreaComputationType != AreaEnum::NONE) { AreaMapConstIterator mixedIt = m_MixedAreaMap.find(vId); - OutputCoordRepType mixedArea = NumericTraits::OneValue(); + OutputCoordinateType mixedArea = NumericTraits::OneValue(); if (mixedIt != m_MixedAreaMap.end()) { diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilterWithHardConstraints.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilterWithHardConstraints.h index ce10ac15347..d6986bb6d03 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilterWithHardConstraints.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilterWithHardConstraints.h @@ -58,7 +58,7 @@ class ITK_TEMPLATE_EXPORT LaplacianDeformationQuadEdgeMeshFilterWithHardConstrai /** Output types. */ using OutputMeshType = TOutputMesh; using typename Superclass::OutputPointType; - using typename Superclass::OutputCoordRepType; + using typename Superclass::OutputCoordinateType; using typename Superclass::OutputPointIdentifier; static constexpr unsigned int OutputPointDimension = OutputMeshType::PointDimension; diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilterWithHardConstraints.hxx b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilterWithHardConstraints.hxx index 3bdf6e07733..3cc662777c8 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilterWithHardConstraints.hxx +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilterWithHardConstraints.hxx @@ -66,7 +66,7 @@ LaplacianDeformationQuadEdgeMeshFilterWithHardConstraints(it->second); RowType row; - this->FillMatrixRow(vId1, this->m_Order, NumericTraits::OneValue(), row); + this->FillMatrixRow(vId1, this->m_Order, NumericTraits::OneValue(), row); RowConstIterator rIt = row.begin(); const RowConstIterator rEnd = row.end(); @@ -74,7 +74,7 @@ LaplacianDeformationQuadEdgeMeshFilterWithHardConstraintsfirst; - const OutputCoordRepType weight = rIt->second; + const OutputCoordinateType weight = rIt->second; ConstraintMapConstIterator cIt = this->m_Constraints.find(vId2); if (cIt != this->m_Constraints.end()) @@ -147,13 +147,13 @@ LaplacianDeformationQuadEdgeMeshFilterWithHardConstraintsElementAt(vId); - auto dx = static_cast(X[internalId]); + auto dx = static_cast(X[internalId]); p[0] += dx; - auto dy = static_cast(Y[internalId]); + auto dy = static_cast(Y[internalId]); p[1] += dy; - auto dz = static_cast(Z[internalId]); + auto dz = static_cast(Z[internalId]); p[2] += dz; ++it; diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilterWithSoftConstraints.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilterWithSoftConstraints.h index c43749dd4dc..dc56066f9a0 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilterWithSoftConstraints.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilterWithSoftConstraints.h @@ -60,7 +60,7 @@ class ITK_TEMPLATE_EXPORT LaplacianDeformationQuadEdgeMeshFilterWithSoftConstrai /** Output types. */ using OutputMeshType = TOutputMesh; using typename Superclass::OutputPointType; - using typename Superclass::OutputCoordRepType; + using typename Superclass::OutputCoordinateType; using typename Superclass::OutputPointIdentifier; static constexpr unsigned int OutputPointDimension = OutputMeshType::PointDimension; @@ -73,11 +73,11 @@ class ITK_TEMPLATE_EXPORT LaplacianDeformationQuadEdgeMeshFilterWithSoftConstrai itkNewMacro(Self); itkOverrideGetNameOfClassMacro(LaplacianDeformationQuadEdgeMeshFilterWithSoftConstraints); - itkSetMacro(Lambda, OutputCoordRepType); - itkGetMacro(Lambda, OutputCoordRepType); + itkSetMacro(Lambda, OutputCoordinateType); + itkGetMacro(Lambda, OutputCoordinateType); void - SetLocalLambda(OutputPointIdentifier vId, OutputCoordRepType iL); + SetLocalLambda(OutputPointIdentifier vId, OutputCoordinateType iL); protected: LaplacianDeformationQuadEdgeMeshFilterWithSoftConstraints(); @@ -110,10 +110,10 @@ class ITK_TEMPLATE_EXPORT LaplacianDeformationQuadEdgeMeshFilterWithSoftConstrai void ComputeVertexIdMapping() override; - OutputCoordRepType m_Lambda{}; - OutputCoordRepType m_LambdaSquare{}; + OutputCoordinateType m_Lambda{}; + OutputCoordinateType m_LambdaSquare{}; - std::unordered_map m_LocalLambdaSquare{}; + std::unordered_map m_LocalLambdaSquare{}; }; } // end namespace itk diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilterWithSoftConstraints.hxx b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilterWithSoftConstraints.hxx index 13f281a5f3a..2d12609275d 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilterWithSoftConstraints.hxx +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkLaplacianDeformationQuadEdgeMeshFilterWithSoftConstraints.hxx @@ -54,7 +54,7 @@ template void LaplacianDeformationQuadEdgeMeshFilterWithSoftConstraints::SetLocalLambda( OutputPointIdentifier vId, - OutputCoordRepType iL) + OutputCoordinateType iL) { m_LocalLambdaSquare[vId] = iL * iL; } @@ -79,7 +79,7 @@ LaplacianDeformationQuadEdgeMeshFilterWithSoftConstraints(it->second); RowType row; - this->FillMatrixRow(vId1, this->m_Order, NumericTraits::OneValue(), row); + this->FillMatrixRow(vId1, this->m_Order, NumericTraits::OneValue(), row); RowConstIterator rIt = row.begin(); RowConstIterator rEnd = row.end(); @@ -87,7 +87,7 @@ LaplacianDeformationQuadEdgeMeshFilterWithSoftConstraintsfirst; - const OutputCoordRepType weight = rIt->second; + const OutputCoordinateType weight = rIt->second; const OutputPointType p = output->GetPoint(vId2); iBx[internalId1] += weight * p[0]; @@ -156,9 +156,9 @@ LaplacianDeformationQuadEdgeMeshFilterWithSoftConstraintsm_InternalMap[vId]; - OutputCoordRepType l2 = m_LambdaSquare; + OutputCoordinateType l2 = m_LambdaSquare; - typename std::unordered_map::const_iterator lambdaIt = + typename std::unordered_map::const_iterator lambdaIt = this->m_LocalLambdaSquare.find(vId); if (lambdaIt != this->m_LocalLambdaSquare.end()) { @@ -193,13 +193,13 @@ LaplacianDeformationQuadEdgeMeshFilterWithSoftConstraintsElementAt(vId); - auto x = static_cast(X[internalId]); + auto x = static_cast(X[internalId]); p[0] = x; - auto y = static_cast(Y[internalId]); + auto y = static_cast(Y[internalId]); p[1] = y; - auto z = static_cast(Z[internalId]); + auto z = static_cast(Z[internalId]); p[2] = z; ++it; diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkParameterizationQuadEdgeMeshFilter.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkParameterizationQuadEdgeMeshFilter.h index cc6263c67af..779df453d62 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkParameterizationQuadEdgeMeshFilter.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkParameterizationQuadEdgeMeshFilter.h @@ -69,7 +69,11 @@ class ITK_TEMPLATE_EXPORT ParameterizationQuadEdgeMeshFilter using InputMeshType = TInputMesh; using InputMeshPointer = typename InputMeshType::Pointer; using InputMeshConstPointer = typename InputMeshType::ConstPointer; - using InputCoordRepType = typename InputMeshType::CoordinateType; + using InputCoordinateType = typename InputMeshType::CoordinateType; +#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; @@ -98,7 +102,11 @@ class ITK_TEMPLATE_EXPORT ParameterizationQuadEdgeMeshFilter using OutputMeshType = TOutputMesh; using OutputMeshPointer = typename OutputMeshType::Pointer; using OutputMeshConstPointer = typename OutputMeshType::ConstPointer; - using OutputCoordRepType = typename OutputMeshType::CoordinateType; + using OutputCoordinateType = typename OutputMeshType::CoordinateType; +#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; diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkParameterizationQuadEdgeMeshFilter.hxx b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkParameterizationQuadEdgeMeshFilter.hxx index ac141f840cf..789f32aa028 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkParameterizationQuadEdgeMeshFilter.hxx +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkParameterizationQuadEdgeMeshFilter.hxx @@ -89,7 +89,7 @@ ParameterizationQuadEdgeMeshFilter::Fill InputMeshConstPointer input = this->GetInput(); OutputMeshPointer output = this->GetOutput(); - InputCoordRepType value; + InputCoordinateType value; InputMapPointIdentifierIterator it; diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkQuadEdgeMeshParamMatrixCoefficients.h b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkQuadEdgeMeshParamMatrixCoefficients.h index 8e16ecfedad..c276db145dc 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/include/itkQuadEdgeMeshParamMatrixCoefficients.h +++ b/Modules/Filtering/QuadEdgeMeshFiltering/include/itkQuadEdgeMeshParamMatrixCoefficients.h @@ -34,13 +34,17 @@ class MatrixCoefficients { public: using InputMeshType = TInputMesh; - using InputCoordRepType = typename InputMeshType::CoordinateType; + using InputCoordinateType = typename InputMeshType::CoordinateType; +#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; virtual ~MatrixCoefficients() = default; - virtual InputCoordRepType + virtual InputCoordinateType operator()(const InputMeshType * iMesh, InputQEType * iEdge) const = 0; }; @@ -58,7 +62,11 @@ class ITK_TEMPLATE_EXPORT OnesMatrixCoefficients : public MatrixCoefficients; using InputMeshType = TInputMesh; - using InputCoordRepType = typename InputMeshType::CoordinateType; + using InputCoordinateType = typename InputMeshType::CoordinateType; +#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; @@ -66,7 +74,7 @@ class ITK_TEMPLATE_EXPORT OnesMatrixCoefficients : public MatrixCoefficients; using InputMeshType = TInputMesh; - using InputCoordRepType = typename InputMeshType::CoordinateType; + using InputCoordinateType = typename InputMeshType::CoordinateType; +#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; @@ -100,7 +112,7 @@ class ITK_TEMPLATE_EXPORT InverseEuclideanDistanceMatrixCoefficients : public Ma * \param[in] iEdge * \return \f$ \frac{1}{\|\boldsymbol{p1} - \boldsymbol{p2} \|} \f$ */ - InputCoordRepType + InputCoordinateType operator()(const InputMeshType * iMesh, InputQEType * iEdge) const override { InputPointIdentifier id1 = iEdge->GetOrigin(); @@ -109,7 +121,7 @@ class ITK_TEMPLATE_EXPORT InverseEuclideanDistanceMatrixCoefficients : public Ma InputPointType pt1 = iMesh->GetPoint(id1); InputPointType pt2 = iMesh->GetPoint(id2); - InputCoordRepType oValue = 1.0 / pt1.EuclideanDistanceTo(pt2); + InputCoordinateType oValue = 1.0 / pt1.EuclideanDistanceTo(pt2); return oValue; } @@ -129,7 +141,11 @@ class ITK_TEMPLATE_EXPORT ConformalMatrixCoefficients : public MatrixCoefficient using Superclass = MatrixCoefficients; using InputMeshType = TInputMesh; - using InputCoordRepType = typename InputMeshType::CoordinateType; + using InputCoordinateType = typename InputMeshType::CoordinateType; +#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; @@ -141,7 +157,7 @@ class ITK_TEMPLATE_EXPORT ConformalMatrixCoefficients : public MatrixCoefficient * \param[in] iEdge * \return \f$ \cot \alpha_{ij} + \cot \beta_{ij} \f$ */ - InputCoordRepType + InputCoordinateType operator()(const InputMeshType * iMesh, InputQEType * iEdge) const override { InputPointIdentifier id1 = iEdge->GetOrigin(); @@ -149,7 +165,7 @@ class ITK_TEMPLATE_EXPORT ConformalMatrixCoefficients : public MatrixCoefficient InputPointType pt1 = iMesh->GetPoint(id1); InputPointType pt2 = iMesh->GetPoint(id2); - InputCoordRepType oValue(0.0); + InputCoordinateType oValue(0.0); if (iEdge->IsLeftSet()) { @@ -164,7 +180,7 @@ class ITK_TEMPLATE_EXPORT ConformalMatrixCoefficients : public MatrixCoefficient oValue += TriangleHelper::Cotangent(pt1, ptB, pt2); } - return std::max(InputCoordRepType{}, oValue); + return std::max(InputCoordinateType{}, oValue); } }; @@ -183,7 +199,11 @@ class ITK_TEMPLATE_EXPORT AuthalicMatrixCoefficients : public MatrixCoefficients using Superclass = MatrixCoefficients; using InputMeshType = TInputMesh; - using InputCoordRepType = typename InputMeshType::CoordinateType; + using InputCoordinateType = typename InputMeshType::CoordinateType; +#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; @@ -196,7 +216,7 @@ class ITK_TEMPLATE_EXPORT AuthalicMatrixCoefficients : public MatrixCoefficients * \return \f$ \frac{\cot \gamma_{ij} + \cot \delta_{ij}}{\|\boldsymbol{p1} - \boldsymbol{p2} \|^2} \f$ */ - InputCoordRepType + InputCoordinateType operator()(const InputMeshType * iMesh, InputQEType * iEdge) const override { InputPointIdentifier id1 = iEdge->GetOrigin(); @@ -205,7 +225,7 @@ class ITK_TEMPLATE_EXPORT AuthalicMatrixCoefficients : public MatrixCoefficients InputPointIdentifier id2 = iEdge->GetDestination(); InputPointType pt2 = iMesh->GetPoint(id2); - InputCoordRepType oValue{}; + InputCoordinateType oValue{}; if (iEdge->IsLeftSet()) { @@ -239,22 +259,26 @@ class ITK_TEMPLATE_EXPORT IntrinsicMatrixCoefficients : public MatrixCoefficient using Superclass = MatrixCoefficients; using InputMeshType = TInputMesh; - using InputCoordRepType = typename InputMeshType::CoordinateType; + using InputCoordinateType = typename InputMeshType::CoordinateType; +#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; - InputCoordRepType m_Lambda; + InputCoordinateType m_Lambda; - IntrinsicMatrixCoefficients(const InputCoordRepType & iLambda) + IntrinsicMatrixCoefficients(const InputCoordinateType & iLambda) : m_Lambda(iLambda) {} - InputCoordRepType + InputCoordinateType operator()(const InputMeshType * iMesh, InputQEType * iEdge) const { AuthalicMatrixCoefficients authalic; ConformalMatrixCoefficients conformal; - InputCoordRepType oValue = m_Lambda * conformal(iMesh, iEdge) + (1.0 - m_Lambda) * authalic(iMesh, iEdge); + InputCoordinateType oValue = m_Lambda * conformal(iMesh, iEdge) + (1.0 - m_Lambda) * authalic(iMesh, iEdge); return oValue; } @@ -274,7 +298,11 @@ class ITK_TEMPLATE_EXPORT HarmonicMatrixCoefficients : public MatrixCoefficients using Superclass = MatrixCoefficients; using InputMeshType = TInputMesh; - using InputCoordRepType = typename InputMeshType::CoordinateType; + using InputCoordinateType = typename InputMeshType::CoordinateType; +#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; @@ -284,7 +312,7 @@ class ITK_TEMPLATE_EXPORT HarmonicMatrixCoefficients : public MatrixCoefficients HarmonicMatrixCoefficients() = default; - InputCoordRepType + InputCoordinateType operator()(const InputMeshType * iMesh, InputQEType * iEdge) const override { InputPointIdentifier id1 = iEdge->GetOrigin(); @@ -302,19 +330,19 @@ class ITK_TEMPLATE_EXPORT HarmonicMatrixCoefficients : public MatrixCoefficients InputVectorType v1B = ptB - pt1; InputVectorType v12 = pt2 - pt1; - InputCoordRepType L1A = v1A * v1A; - InputCoordRepType L1B = v1B * v1B; - InputCoordRepType L12 = v12 * v12; + InputCoordinateType L1A = v1A * v1A; + InputCoordinateType L1B = v1B * v1B; + InputCoordinateType L12 = v12 * v12; - InputCoordRepType L2A = pt2.SquaredEuclideanDistanceTo(ptA); - InputCoordRepType L2B = pt2.SquaredEuclideanDistanceTo(ptB); + InputCoordinateType L2A = pt2.SquaredEuclideanDistanceTo(ptA); + InputCoordinateType L2B = pt2.SquaredEuclideanDistanceTo(ptB); CrossHelper cross; - InputCoordRepType AreaA = 0.5 * (cross(v1A, v12).GetNorm()); - InputCoordRepType AreaB = 0.5 * (cross(v1B, v12).GetNorm()); + InputCoordinateType AreaA = 0.5 * (cross(v1A, v12).GetNorm()); + InputCoordinateType AreaB = 0.5 * (cross(v1B, v12).GetNorm()); - InputCoordRepType oValue = (L1A + L2A - L12) / AreaA + (L1B + L2B - L12) / AreaB; + InputCoordinateType oValue = (L1A + L2A - L12) / AreaA + (L1B + L2B - L12) / AreaB; return oValue; } diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/test/itkCleanQuadEdgeMeshFilterTest.cxx b/Modules/Filtering/QuadEdgeMeshFiltering/test/itkCleanQuadEdgeMeshFilterTest.cxx index 9e7d83ea18b..84d0869f5c4 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/test/itkCleanQuadEdgeMeshFilterTest.cxx +++ b/Modules/Filtering/QuadEdgeMeshFiltering/test/itkCleanQuadEdgeMeshFilterTest.cxx @@ -66,7 +66,7 @@ itkCleanQuadEdgeMeshFilterTest(int argc, char * argv[]) filter->SetInput(mesh); - typename CleanFilterType::InputCoordRepType absTol{}; + typename CleanFilterType::InputCoordinateType absTol{}; filter->SetAbsoluteTolerance(absTol); ITK_TEST_SET_GET_VALUE(absTol, filter->GetAbsoluteTolerance()); diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/test/itkLaplacianDeformationQuadEdgeMeshFilterWithSoftConstraintsTest.cxx b/Modules/Filtering/QuadEdgeMeshFiltering/test/itkLaplacianDeformationQuadEdgeMeshFilterWithSoftConstraintsTest.cxx index 25135a1b94e..9c8ed0bace2 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/test/itkLaplacianDeformationQuadEdgeMeshFilterWithSoftConstraintsTest.cxx +++ b/Modules/Filtering/QuadEdgeMeshFiltering/test/itkLaplacianDeformationQuadEdgeMeshFilterWithSoftConstraintsTest.cxx @@ -57,7 +57,7 @@ itkLaplacianDeformationQuadEdgeMeshFilterWithSoftConstraintsTest(int argc, char filter->SetInput(reader->GetOutput()); filter->SetOrder(1); - typename FilterType::OutputCoordRepType lambda = 1.0; + typename FilterType::OutputCoordinateType lambda = 1.0; filter->SetLambda(lambda); ITK_TEST_SET_GET_VALUE(lambda, filter->GetLambda()); diff --git a/Modules/IO/MeshBase/include/itkMeshFileReader.h b/Modules/IO/MeshBase/include/itkMeshFileReader.h index b20174093f5..4b26ca7af9d 100644 --- a/Modules/IO/MeshBase/include/itkMeshFileReader.h +++ b/Modules/IO/MeshBase/include/itkMeshFileReader.h @@ -97,7 +97,11 @@ class ITK_TEMPLATE_EXPORT MeshFileReader : public MeshSource /** Define output mesh types */ using OutputMeshType = TOutputMesh; - using OutputCoordRepType = typename OutputMeshType::CoordinateType; + using OutputCoordinateType = typename OutputMeshType::CoordinateType; +#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; diff --git a/Modules/Nonunit/Review/include/itkMultiphaseFiniteDifferenceImageFilter.h b/Modules/Nonunit/Review/include/itkMultiphaseFiniteDifferenceImageFilter.h index b42be57357d..43fb46d82b2 100644 --- a/Modules/Nonunit/Review/include/itkMultiphaseFiniteDifferenceImageFilter.h +++ b/Modules/Nonunit/Review/include/itkMultiphaseFiniteDifferenceImageFilter.h @@ -180,7 +180,11 @@ class ITK_TEMPLATE_EXPORT MultiphaseFiniteDifferenceImageFilter : public InPlace using InputImageType = TInputImage; using InputImagePointer = typename InputImageType::Pointer; using InputPointType = typename InputImageType::PointType; - using InputCoordRepType = typename InputPointType::CoordinateType; + using InputCoordinateType = typename InputPointType::CoordinateType; +#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; diff --git a/Modules/Registration/FEM/include/itkFEMRegistrationFilter.hxx b/Modules/Registration/FEM/include/itkFEMRegistrationFilter.hxx index d9b75dd098e..ae8a864ca83 100644 --- a/Modules/Registration/FEM/include/itkFEMRegistrationFilter.hxx +++ b/Modules/Registration/FEM/include/itkFEMRegistrationFilter.hxx @@ -242,8 +242,8 @@ void FEMRegistrationFilter::WarpImage(const MovingImageType * ImageToWarp) { auto warper = WarperType::New(); - using WarperCoordRepType = typename WarperType::CoordinateType; - using InterpolatorType1 = itk::LinearInterpolateImageFunction; + using WarperCoordinateType = typename WarperType::CoordinateType; + using InterpolatorType1 = itk::LinearInterpolateImageFunction; auto interpolator = InterpolatorType1::New(); warper = WarperType::New(); @@ -811,8 +811,8 @@ FEMRegistrationFilter::EnforceDiffeomorph } auto warper = WarperType::New(); - using WarperCoordRepType = typename WarperType::CoordinateType; - using InterpolatorType1 = itk::LinearInterpolateImageFunction; + using WarperCoordinateType = typename WarperType::CoordinateType; + using InterpolatorType1 = itk::LinearInterpolateImageFunction; auto interpolator = InterpolatorType1::New(); // If using landmarks, warp them @@ -902,7 +902,7 @@ FEMRegistrationFilter::EnforceDiffeomorph index = totalFieldIter.GetIndex(); for (jj = 0; jj < ImageDimension; ++jj) { - inputIndex[jj] = (WarperCoordRepType)index[jj]; + inputIndex[jj] = (WarperCoordinateType)index[jj]; interpolatedValue[jj] = 0.0; }