Skip to content

use CoordinateType #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thewtex merged 5 commits into from
Mar 10, 2025
Merged

use CoordinateType #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
64303d3
ENH: remove .orig backup file.
hjmjohnson Jan 27, 2025
9e52fd9
STYLE: CoordRepType -> CoordinateType code readability
hjmjohnson Jan 26, 2025
80517a3
ENH: Update to v5.4.2 ITK version for build.
hjmjohnson Jan 27, 2025
62bb100
ENH: update for clang-format master.
hjmjohnson Jan 27, 2025
384a590
ENH: Update to support the clang-format-linter CI
hjmjohnson Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-test-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ on: [push,pull_request]

jobs:
cxx-build-workflow:
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/[email protected].0
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/[email protected].2

python-build-workflow:
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/[email protected].0
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/[email protected].2
with:
test-notebooks: false
secrets:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/clang-format-linter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
with:
fetch-depth: 1
- uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@master
with:
itk-branch: master
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
*~
.orig
10 changes: 5 additions & 5 deletions include/itkCellAreaTriangleCellSubdivisionCriterion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class CellAreaTriangleCellSubdivisionCriterion : public QuadEdgeMeshSubdivisionC
using CellsContainerIterator = typename Superclass::CellsContainerIterator;
using CellsContainerConstIterator = typename Superclass::CellsContainerConstIterator;
using PointType = typename Superclass::PointType;
using CoordRepType = typename Superclass::CoordRepType;
using CoordinateType = typename Superclass::CoordinateType;
using PointIdentifier = typename Superclass::PointIdentifier;
using CellIdentifier = typename Superclass::CellIdentifier;
using CellType = typename Superclass::CellType;
Expand All @@ -67,15 +67,15 @@ class CellAreaTriangleCellSubdivisionCriterion : public QuadEdgeMeshSubdivisionC
void
Compute(MeshType * mesh, SubdivisionCellContainer & cellIds) override;

itkGetConstMacro(MaximumArea, CoordRepType);
itkSetMacro(MaximumArea, CoordRepType);
itkGetConstMacro(MaximumArea, CoordinateType);
itkSetMacro(MaximumArea, CoordinateType);

protected:
CellAreaTriangleCellSubdivisionCriterion() { m_MaximumArea = NumericTraits<CoordRepType>::max(); }
CellAreaTriangleCellSubdivisionCriterion() { m_MaximumArea = NumericTraits<CoordinateType>::max(); }
~CellAreaTriangleCellSubdivisionCriterion() override = default;

private:
CoordRepType m_MaximumArea;
CoordinateType m_MaximumArea;
};

} // namespace itk
Expand Down
2 changes: 1 addition & 1 deletion include/itkCellAreaTriangleCellSubdivisionCriterion.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ CellAreaTriangleCellSubdivisionCriterion<TTriangleCellSubdivisionFilter>::Comput
++nn;
}

CoordRepType area = TriangleHelper<PointType>::ComputeArea(pointArray[0], pointArray[1], pointArray[2]);
CoordinateType area = TriangleHelper<PointType>::ComputeArea(pointArray[0], pointArray[1], pointArray[2]);
if (area > m_MaximumArea)
{
cellIds.push_back(static_cast<typename SubdivisionCellContainer::value_type>(cter->Index()));
Expand Down
10 changes: 5 additions & 5 deletions include/itkEdgeLengthTriangleEdgeCellSubdivisionCriterion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class EdgeLengthTriangleEdgeCellSubdivisionCriterion : public QuadEdgeMeshSubdiv
using CellsContainerIterator = typename Superclass::CellsContainerIterator;
using CellsContainerConstIterator = typename Superclass::CellsContainerConstIterator;
using PointType = typename Superclass::PointType;
using CoordRepType = typename Superclass::CoordRepType;
using CoordinateType = typename Superclass::CoordinateType;
using PointIdentifier = typename Superclass::PointIdentifier;
using CellIdentifier = typename Superclass::CellIdentifier;
using CellType = typename Superclass::CellType;
Expand All @@ -66,15 +66,15 @@ class EdgeLengthTriangleEdgeCellSubdivisionCriterion : public QuadEdgeMeshSubdiv
void
Compute(MeshType * mesh, SubdivisionCellContainer & edgeList) override;

itkGetConstMacro(MaximumLength, CoordRepType);
itkSetMacro(MaximumLength, CoordRepType);
itkGetConstMacro(MaximumLength, CoordinateType);
itkSetMacro(MaximumLength, CoordinateType);

protected:
EdgeLengthTriangleEdgeCellSubdivisionCriterion() { m_MaximumLength = NumericTraits<CoordRepType>::max(); }
EdgeLengthTriangleEdgeCellSubdivisionCriterion() { m_MaximumLength = NumericTraits<CoordinateType>::max(); }
~EdgeLengthTriangleEdgeCellSubdivisionCriterion() override = default;

private:
CoordRepType m_MaximumLength;
CoordinateType m_MaximumLength;
};

} // namespace itk
Expand Down
88 changes: 0 additions & 88 deletions include/itkIterativeTriangleCellSubdivisionQuadEdgeMeshFilter.hxx.orig
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion include/itkLinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class LinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter
using InputCellsContainerIterator = typename Superclass::InputCellsContainerIterator;
using InputCellsContainerConstIterator = typename Superclass::InputCellsContainerConstIterator;
using InputPointType = typename Superclass::InputPointType;
using InputCoordType = typename Superclass::InputCoordRepType;
using InputCoordType = typename Superclass::InputCoordinateType;
using InputPointIdentifier = typename Superclass::InputPointIdentifier;
using InputCellIdentifier = typename Superclass::InputCellIdentifier;
using InputCellType = typename Superclass::InputCellType;
Expand Down
2 changes: 1 addition & 1 deletion include/itkLoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class LoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter
using InputCellsContainerIterator = typename Superclass::InputCellsContainerIterator;
using InputCellsContainerConstIterator = typename Superclass::InputCellsContainerConstIterator;
using InputPointType = typename Superclass::InputPointType;
using InputCoordType = typename Superclass::InputCoordRepType;
using InputCoordType = typename Superclass::InputCoordinateType;
using InputPointIdentifier = typename Superclass::InputPointIdentifier;
using InputCellIdentifier = typename Superclass::InputCellIdentifier;
using InputCellType = typename Superclass::InputCellType;
Expand Down
2 changes: 1 addition & 1 deletion include/itkModifiedButterflyTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class ModifiedButterflyTriangleEdgeCellSubdivisionQuadEdgeMeshFilter
using InputCellsContainerIterator = typename Superclass::InputCellsContainerIterator;
using InputCellsContainerConstIterator = typename Superclass::InputCellsContainerConstIterator;
using InputPointType = typename Superclass::InputPointType;
using InputCoordType = typename Superclass::InputCoordRepType;
using InputCoordType = typename Superclass::InputCoordinateType;
using InputPointIdentifier = typename Superclass::InputPointIdentifier;
using InputCellIdentifier = typename Superclass::InputCellIdentifier;
using InputCellType = typename Superclass::InputCellType;
Expand Down
2 changes: 1 addition & 1 deletion include/itkQuadEdgeMeshSubdivisionCriterion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class ITK_EXPORT QuadEdgeMeshSubdivisionCriterion : public Object
using CellsContainerIterator = typename MeshType::CellsContainerIterator;
using CellsContainerConstIterator = typename MeshType::CellsContainerConstIterator;
using PointType = typename MeshType::PointType;
using CoordRepType = typename MeshType::CoordRepType;
using CoordinateType = typename MeshType::CoordinateType;
using PointIdentifier = typename MeshType::PointIdentifier;
using CellIdentifier = typename MeshType::CellIdentifier;
using CellType = typename MeshType::CellType;
Expand Down
4 changes: 2 additions & 2 deletions include/itkSubdivisionQuadEdgeMeshFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class SubdivisionQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEdgeMeshFilter<TI
using InputCellsContainerIterator = typename InputMeshType::CellsContainerIterator;
using InputCellsContainerConstIterator = typename InputMeshType::CellsContainerConstIterator;
using InputPointType = typename InputMeshType::PointType;
using InputCoordType = typename InputMeshType::CoordRepType;
using InputCoordType = typename InputMeshType::CoordinateType;
using InputPointIdentifier = typename InputMeshType::PointIdentifier;
using InputCellIdentifier = typename InputMeshType::CellIdentifier;
using InputCellType = typename InputMeshType::CellType;
Expand All @@ -76,7 +76,7 @@ class SubdivisionQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEdgeMeshFilter<TI
using OutputCellsContainerIterator = typename OutputMeshType::CellsContainerIterator;
using OutputCellsContainerConstIterator = typename OutputMeshType::CellsContainerConstIterator;
using OutputPointType = typename OutputMeshType::PointType;
using OutputCoordType = typename OutputMeshType::CoordRepType;
using OutputCoordType = typename OutputMeshType::CoordinateType;
using OutputPointIdentifier = typename OutputMeshType::PointIdentifier;
using OutputCellIdentifier = typename OutputMeshType::CellIdentifier;
using OutputCellType = typename OutputMeshType::CellType;
Expand Down
4 changes: 2 additions & 2 deletions include/itkTriangleCellSubdivisionQuadEdgeMeshFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class TriangleCellSubdivisionQuadEdgeMeshFilter : public SubdivisionQuadEdgeMesh
using InputCellsContainerIterator = typename Superclass::InputCellsContainerIterator;
using InputCellsContainerConstIterator = typename Superclass::InputCellsContainerConstIterator;
using InputPointType = typename Superclass::InputPointType;
using InputCoordType = typename Superclass::InputCoordRepType;
using InputCoordType = typename Superclass::InputCoordinateType;
using InputPointIdentifier = typename Superclass::InputPointIdentifier;
using InputCellIdentifier = typename Superclass::InputCellIdentifier;
using InputCellType = typename Superclass::InputCellType;
Expand All @@ -75,7 +75,7 @@ class TriangleCellSubdivisionQuadEdgeMeshFilter : public SubdivisionQuadEdgeMesh
using OutputCellsContainerIterator = typename Superclass::OutputCellsContainerIterator;
using OutputCellsContainerConstIterator = typename Superclass::OutputCellsContainerConstIterator;
using OutputPointType = typename Superclass::OutputPointType;
using OutputCoordType = typename Superclass::OutputCoordRepType;
using OutputCoordType = typename Superclass::OutputCoordinateType;
using OutputPointIdentifier = typename Superclass::OutputPointIdentifier;
using OutputCellIdentifier = typename Superclass::OutputCellIdentifier;
using OutputCellType = typename Superclass::OutputCellType;
Expand Down
4 changes: 2 additions & 2 deletions include/itkTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class TriangleEdgeCellSubdivisionQuadEdgeMeshFilter
using InputCellsContainerIterator = typename Superclass::InputCellsContainerIterator;
using InputCellsContainerConstIterator = typename Superclass::InputCellsContainerConstIterator;
using InputPointType = typename Superclass::InputPointType;
using InputCoordType = typename Superclass::InputCoordRepType;
using InputCoordType = typename Superclass::InputCoordinateType;
using InputPointIdentifier = typename Superclass::InputPointIdentifier;
using InputCellIdentifier = typename Superclass::InputCellIdentifier;
using InputCellType = typename Superclass::InputCellType;
Expand All @@ -70,7 +70,7 @@ class TriangleEdgeCellSubdivisionQuadEdgeMeshFilter
using OutputCellsContainerIterator = typename Superclass::OutputCellsContainerIterator;
using OutputCellsContainerConstIterator = typename Superclass::OutputCellsContainerConstIterator;
using OutputPointType = typename Superclass::OutputPointType;
using OutputCoordType = typename Superclass::OutputCoordRepType;
using OutputCoordType = typename Superclass::OutputCoordinateType;
using OutputPointIdentifier = typename Superclass::OutputPointIdentifier;
using OutputCellIdentifier = typename Superclass::OutputCellIdentifier;
using OutputCellType = typename Superclass::OutputCellType;
Expand Down
Loading