From 8d959d3191f1de1a9f1667a95729407b809adc24 Mon Sep 17 00:00:00 2001 From: Stewart Boogert Date: Wed, 2 Oct 2024 22:14:21 +0100 Subject: [PATCH 1/4] cgal: remove isotropic_remeshing --- src/pyg4ometry/pycgal/Polygon_mesh_processing.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pyg4ometry/pycgal/Polygon_mesh_processing.cxx b/src/pyg4ometry/pycgal/Polygon_mesh_processing.cxx index d963b8554..171c2fcb6 100644 --- a/src/pyg4ometry/pycgal/Polygon_mesh_processing.cxx +++ b/src/pyg4ometry/pycgal/Polygon_mesh_processing.cxx @@ -92,13 +92,13 @@ PYBIND11_MODULE(Polygon_mesh_processing, m) { m.def("volume", [](Surface_mesh_EPICK &pm1) { return CGAL::to_double(CGAL::Polygon_mesh_processing::volume(pm1)); }); - m.def("isotropic_remeshing", [](Surface_mesh_EPICK &pm1, - double target_mesh_length, int nb_iter) { - return CGAL::Polygon_mesh_processing::isotropic_remeshing( - faces(pm1), target_mesh_length, pm1, - CGAL::parameters::number_of_iterations(nb_iter).protect_constraints( - true)); - }); + // m.def("isotropic_remeshing", [](Surface_mesh_EPICK &pm1, + // double target_mesh_length, int nb_iter) { + // return CGAL::Polygon_mesh_processing::isotropic_remeshing( + // faces(pm1), target_mesh_length, pm1, + // CGAL::parameters::number_of_iterations(nb_iter).protect_constraints( + // true)); + // }); /* m.def("angle_and_area_smoothing", [](Surface_mesh_EPICK &pm1, int nb_iter) { return CGAL::Polygon_mesh_processing::angle_and_area_smoothing(pm1, From a9117c7c99f94797c12dcca513d4454770b8fb44 Mon Sep 17 00:00:00 2001 From: Stewart Boogert Date: Wed, 2 Oct 2024 22:27:04 +0100 Subject: [PATCH 2/4] cgal: remove deprec header --- src/pyg4ometry/pycgal/Polygon_mesh_processing.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pyg4ometry/pycgal/Polygon_mesh_processing.cxx b/src/pyg4ometry/pycgal/Polygon_mesh_processing.cxx index 171c2fcb6..060ca28ac 100644 --- a/src/pyg4ometry/pycgal/Polygon_mesh_processing.cxx +++ b/src/pyg4ometry/pycgal/Polygon_mesh_processing.cxx @@ -40,7 +40,7 @@ typedef CGAL::Aff_transformation_3 Aff_transformation_3_ECER; #include #include // #include -#include +// #include #include PYBIND11_MODULE(Polygon_mesh_processing, m) { From aa15c6a40836909b55990b8a766a33916768bfc0 Mon Sep 17 00:00:00 2001 From: Stewart Boogert Date: Wed, 2 Oct 2024 22:44:59 +0100 Subject: [PATCH 3/4] cgal: get other usage --- .../pycgal/Polygon_mesh_processing.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pyg4ometry/pycgal/Polygon_mesh_processing.cxx b/src/pyg4ometry/pycgal/Polygon_mesh_processing.cxx index 060ca28ac..f485852fb 100644 --- a/src/pyg4ometry/pycgal/Polygon_mesh_processing.cxx +++ b/src/pyg4ometry/pycgal/Polygon_mesh_processing.cxx @@ -36,7 +36,7 @@ typedef CGAL::Aff_transformation_3 Aff_transformation_3_ECER; #include #include #include -#include +// #include #include #include // #include @@ -163,13 +163,13 @@ PYBIND11_MODULE(Polygon_mesh_processing, m) { m.def("volume", [](Surface_mesh_EPECK &pm1) { return CGAL::to_double(CGAL::Polygon_mesh_processing::volume(pm1)); }); - m.def("isotropic_remeshing", [](Surface_mesh_EPECK &pm1, - double target_mesh_length, int nb_iter) { - return CGAL::Polygon_mesh_processing::isotropic_remeshing( - faces(pm1), target_mesh_length, pm1, - CGAL::parameters::number_of_iterations(nb_iter).protect_constraints( - true)); - }); + // m.def("isotropic_remeshing", [](Surface_mesh_EPECK &pm1, + // double target_mesh_length, int nb_iter) { + // return CGAL::Polygon_mesh_processing::isotropic_remeshing( + // faces(pm1), target_mesh_length, pm1, + // CGAL::parameters::number_of_iterations(nb_iter).protect_constraints( + // true)); + // }); /********************************************************************** ECER From 86fb7c1c0082df810296896752eeb980b3142443 Mon Sep 17 00:00:00 2001 From: Stewart Boogert Date: Wed, 2 Oct 2024 23:01:33 +0100 Subject: [PATCH 4/4] vis: remove unused isotropic remeshing dep --- src/pyg4ometry/visualisation/VtkViewerNew.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pyg4ometry/visualisation/VtkViewerNew.py b/src/pyg4ometry/visualisation/VtkViewerNew.py index 8c6694b55..23f42d61c 100644 --- a/src/pyg4ometry/visualisation/VtkViewerNew.py +++ b/src/pyg4ometry/visualisation/VtkViewerNew.py @@ -7,7 +7,8 @@ from .VisualisationOptions import ( getPredefinedMaterialVisOptions as _getPredefinedMaterialVisOptions, ) -from pyg4ometry.pycgal.Polygon_mesh_processing import isotropic_remeshing as _isotropic_remeshing + +# from pyg4ometry.pycgal.Polygon_mesh_processing import isotropic_remeshing as _isotropic_remeshing class VtkViewerNew(_ViewerBase):