Skip to content

Commit d8736bf

Browse files
thewtexthewtex
authored
Merge pull request #44 from InsightSoftwareConsortium/use-CoordinateType
use CoordinateType
2 parents 872ad25 + 384a590 commit d8736bf

14 files changed

+27
-112
lines changed

‎.github/workflows/build-test-package.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ on: [push,pull_request]
55

66
jobs:
77
cxx-build-workflow:
8-
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4.0
8+
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4.2
99

1010
python-build-workflow:
11-
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.0
11+
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.2
1212
with:
1313
test-notebooks: false
1414
secrets:

‎.github/workflows/clang-format-linter.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ jobs:
77
runs-on: ubuntu-latest
88

99
steps:
10-
- uses: actions/checkout@v1
10+
- uses: actions/checkout@v4
1111
with:
1212
fetch-depth: 1
1313
- uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@master
14+
with:
15+
itk-branch: master

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
*~
2+
.orig

‎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/itkIterativeTriangleCellSubdivisionQuadEdgeMeshFilter.hxx.orig‎

Lines changed: 0 additions & 88 deletions
This file was deleted.

‎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;

0 commit comments

Comments
 (0)