diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index 19b97f5..734e183 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -5,10 +5,10 @@ on: [push,pull_request] jobs: cxx-build-workflow: - uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4.0 + uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4.2 python-build-workflow: - uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.0 + uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.2 with: test-notebooks: false secrets: diff --git a/.github/workflows/clang-format-linter.yml b/.github/workflows/clang-format-linter.yml index 69166d9..c8e1681 100644 --- a/.github/workflows/clang-format-linter.yml +++ b/.github/workflows/clang-format-linter.yml @@ -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 diff --git a/.gitignore b/.gitignore index b25c15b..19e1e7f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *~ +.orig diff --git a/include/itkCellAreaTriangleCellSubdivisionCriterion.h b/include/itkCellAreaTriangleCellSubdivisionCriterion.h index 1000a4b..2242471 100644 --- a/include/itkCellAreaTriangleCellSubdivisionCriterion.h +++ b/include/itkCellAreaTriangleCellSubdivisionCriterion.h @@ -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; @@ -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::max(); } + CellAreaTriangleCellSubdivisionCriterion() { m_MaximumArea = NumericTraits::max(); } ~CellAreaTriangleCellSubdivisionCriterion() override = default; private: - CoordRepType m_MaximumArea; + CoordinateType m_MaximumArea; }; } // namespace itk diff --git a/include/itkCellAreaTriangleCellSubdivisionCriterion.hxx b/include/itkCellAreaTriangleCellSubdivisionCriterion.hxx index 018a1a4..75578cf 100644 --- a/include/itkCellAreaTriangleCellSubdivisionCriterion.hxx +++ b/include/itkCellAreaTriangleCellSubdivisionCriterion.hxx @@ -54,7 +54,7 @@ CellAreaTriangleCellSubdivisionCriterion::Comput ++nn; } - CoordRepType area = TriangleHelper::ComputeArea(pointArray[0], pointArray[1], pointArray[2]); + CoordinateType area = TriangleHelper::ComputeArea(pointArray[0], pointArray[1], pointArray[2]); if (area > m_MaximumArea) { cellIds.push_back(static_cast(cter->Index())); diff --git a/include/itkEdgeLengthTriangleEdgeCellSubdivisionCriterion.h b/include/itkEdgeLengthTriangleEdgeCellSubdivisionCriterion.h index 9ef7361..faa868c 100644 --- a/include/itkEdgeLengthTriangleEdgeCellSubdivisionCriterion.h +++ b/include/itkEdgeLengthTriangleEdgeCellSubdivisionCriterion.h @@ -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; @@ -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::max(); } + EdgeLengthTriangleEdgeCellSubdivisionCriterion() { m_MaximumLength = NumericTraits::max(); } ~EdgeLengthTriangleEdgeCellSubdivisionCriterion() override = default; private: - CoordRepType m_MaximumLength; + CoordinateType m_MaximumLength; }; } // namespace itk diff --git a/include/itkIterativeTriangleCellSubdivisionQuadEdgeMeshFilter.hxx.orig b/include/itkIterativeTriangleCellSubdivisionQuadEdgeMeshFilter.hxx.orig deleted file mode 100644 index b28091c..0000000 --- a/include/itkIterativeTriangleCellSubdivisionQuadEdgeMeshFilter.hxx.orig +++ /dev/null @@ -1,88 +0,0 @@ -/*========================================================================= - * - * Copyright NumFOCUS - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0.txt - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - *=========================================================================*/ - -#ifndef itkIterativeTriangleCellSubdivisionQuadEdgeMeshFilter_hxx -#define itkIterativeTriangleCellSubdivisionQuadEdgeMeshFilter_hxx - -<<<<<<< HEAD -#include "itkIterativeTriangleCellSubdivisionQuadEdgeMeshFilter.h" -#include -======= ->>>>>>> COMP: Remove inclusion of .hxx files as headers - -namespace itk -{ -template -IterativeTriangleCellSubdivisionQuadEdgeMeshFilter:: - IterativeTriangleCellSubdivisionQuadEdgeMeshFilter() -{ - this->m_ResolutionLevels = 1; -} - -template -void -IterativeTriangleCellSubdivisionQuadEdgeMeshFilter::SetCellsToBeSubdivided( - const SubdivisionCellContainer & cellIdList) -{ - this->m_CellsToBeSubdivided = cellIdList; - this->Modified(); -} - -template -void -IterativeTriangleCellSubdivisionQuadEdgeMeshFilter::AddSubdividedCellId( - OutputCellIdentifier cellId) -{ - this->m_CellsToBeSubdivided.push_back(cellId); - this->Modified(); -} - -template -void -IterativeTriangleCellSubdivisionQuadEdgeMeshFilter::GenerateData() -{ - this->m_CellSubdivisionFilterVector.clear(); - const auto resolution = std::max(static_cast(1), this->m_ResolutionLevels); - for (size_t i = 0; i < resolution; ++i) - { - this->m_CellSubdivisionFilterVector.push_back(TCellSubdivisionFilter::New()); - } - this->m_CellSubdivisionFilterVector.at(0)->SetInput(this->GetInput()); - this->m_CellSubdivisionFilterVector.at(0)->SetCellsToBeSubdivided(this->m_CellsToBeSubdivided); - this->m_CellSubdivisionFilterVector.at(0)->Update(); - this->GraftOutput(this->m_CellSubdivisionFilterVector.at(0)->GetOutput()); - for (size_t i = 1; i < resolution; ++i) - { - this->m_CellSubdivisionFilterVector.at(i)->SetInput(this->GetOutput()); - this->m_CellSubdivisionFilterVector.at(i)->SetCellsToBeSubdivided( - this->m_CellSubdivisionFilterVector.at(i - 1)->GetCellsToBeSubdivided()); - this->m_CellSubdivisionFilterVector.at(i)->Update(); - this->GraftOutput(this->m_CellSubdivisionFilterVector.at(i)->GetOutput()); - } -} - -template -void -IterativeTriangleCellSubdivisionQuadEdgeMeshFilter::PrintSelf(std::ostream & os, - Indent indent) const -{ - Superclass::PrintSelf(os, indent); - std::cout << indent << "Subdivision Resolution Levels: " << m_ResolutionLevels << std::endl; -} -} // namespace itk -#endif diff --git a/include/itkLinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h b/include/itkLinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h index a7a46af..15e7764 100644 --- a/include/itkLinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h +++ b/include/itkLinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h @@ -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; diff --git a/include/itkLoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h b/include/itkLoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h index 1de57f9..1d6df0d 100644 --- a/include/itkLoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h +++ b/include/itkLoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h @@ -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; diff --git a/include/itkModifiedButterflyTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h b/include/itkModifiedButterflyTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h index 91c4ed5..9b55406 100644 --- a/include/itkModifiedButterflyTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h +++ b/include/itkModifiedButterflyTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h @@ -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; diff --git a/include/itkQuadEdgeMeshSubdivisionCriterion.h b/include/itkQuadEdgeMeshSubdivisionCriterion.h index 8cbcbd1..b7e2351 100644 --- a/include/itkQuadEdgeMeshSubdivisionCriterion.h +++ b/include/itkQuadEdgeMeshSubdivisionCriterion.h @@ -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; diff --git a/include/itkSubdivisionQuadEdgeMeshFilter.h b/include/itkSubdivisionQuadEdgeMeshFilter.h index 57cf4cc..0be0e56 100644 --- a/include/itkSubdivisionQuadEdgeMeshFilter.h +++ b/include/itkSubdivisionQuadEdgeMeshFilter.h @@ -59,7 +59,7 @@ class SubdivisionQuadEdgeMeshFilter : public QuadEdgeMeshToQuadEdgeMeshFilter