From e9864cf874e089310b3be3bcc9d2e3e36903d0ae Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Tue, 11 Feb 2020 14:06:53 +0100 Subject: [PATCH] Fixes after review --- .../include/CGAL/Polygon_mesh_processing/clip.h | 7 +++++-- .../CGAL/Polygon_mesh_processing/connected_components.h | 3 +-- .../Plugins/PMP/Join_and_split_polyhedra_plugin.cpp | 5 ++--- .../Surface_mesh_parameterization/dependencies | 1 - 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/clip.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/clip.h index 664e0292a9e..0d96584af2e 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/clip.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/clip.h @@ -411,7 +411,7 @@ void split_along_edges(TriangleMesh& tm, * See Subsection \ref coref_clip for more details. * \attention With the current implementation, `clipper` will be modified (refined with the intersection with `tm`). * - * \pre \link CGAL::Polygon_mesh_processing::does_self_intersect() `!CGAL::Polygon_mesh_processing::does_self_intersect(tm1)` \endlink + * \pre \link CGAL::Polygon_mesh_processing::does_self_intersect() `!CGAL::Polygon_mesh_processing::does_self_intersect(tm)` \endlink * \pre \link CGAL::Polygon_mesh_processing::does_self_intersect() `!CGAL::Polygon_mesh_processing::does_self_intersect(clipper)` \endlink * \pre \link CGAL::Polygon_mesh_processing::does_bound_a_volume() `CGAL::Polygon_mesh_processing::does_bound_a_volume(clipper)` \endlink * @@ -580,7 +580,7 @@ bool clip( TriangleMesh& tm, * \ingroup PMP_corefinement_grp * corefines `tm` and `splitter` and duplicates edges in `tm` that are on the intersection with `splitter`. * - * \pre \link CGAL::Polygon_mesh_processing::does_self_intersect() `!CGAL::Polygon_mesh_processing::does_self_intersect(tm1)` \endlink + * \pre \link CGAL::Polygon_mesh_processing::does_self_intersect() `!CGAL::Polygon_mesh_processing::does_self_intersect(tm)` \endlink * \pre \link CGAL::Polygon_mesh_processing::does_self_intersect() `!CGAL::Polygon_mesh_processing::does_self_intersect(splitter)` \endlink * * @tparam TriangleMesh a model of `MutableFaceGraph`, `HalfedgeListGraph` and `FaceListGraph`. @@ -666,6 +666,9 @@ void split( TriangleMesh& tm, * @param np optional sequence of \ref pmp_namedparameters "Named Parameters" among the ones listed below * * \cgalNamedParamsBegin + * \cgalParamBegin{vertex_point_map} + * the property map with the points associated to the vertices of `tm`. + * \cgalParamEnd * \cgalParamBegin{visitor} a class model of `PMPCorefinementVisitor` * that is used to track the creation of new faces. * \cgalParamEnd diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h index 54f923050d8..9932d96fdc5 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h @@ -1056,8 +1056,7 @@ void split_connected_components_impl( * * * \tparam PolygonMesh a model of `FaceListGraph` - * \tparam PolygonMeshRange a model of `SequenceContainer` (providing - * `void push_back()` and `PolygonMesh& back()`) with `PolygonMesh` as value type. + * \tparam PolygonMeshRange a model of `SequenceContainer` with `PolygonMesh` as value type. * * \tparam NamedParameters a sequence of Named Parameters * diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Join_and_split_polyhedra_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Join_and_split_polyhedra_plugin.cpp index d61cb23bbad..1c1e7f3bd70 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Join_and_split_polyhedra_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Join_and_split_polyhedra_plugin.cpp @@ -153,7 +153,6 @@ void Polyhedron_demo_join_and_split_polyhedra_plugin::on_actionSplitPolyhedra_tr if (new_polyhedra.size()==1) { - new_polyhedra.front(); CGAL::Three::Three::information( tr("%1 has only one connected component").arg(item->name()) ); QApplication::restoreOverrideCursor(); continue; @@ -167,9 +166,9 @@ void Polyhedron_demo_join_and_split_polyhedra_plugin::on_actionSplitPolyhedra_tr compute_color_map(item->color(), new_polyhedra.size(), std::back_inserter(color_map)); Scene_group_item *group = new Scene_group_item("CC"); scene->addItem(group); - for(FaceGraph polyhedron_ptr : new_polyhedra) + for(FaceGraph& poly : new_polyhedra) { - Scene_facegraph_item* new_item=new Scene_facegraph_item(polyhedron_ptr); + Scene_facegraph_item* new_item=new Scene_facegraph_item(poly); new_item->setName(tr("%1 - CC %2").arg(item->name()).arg(cc)); new_item->setColor(color_map[cc]); ++cc; diff --git a/Surface_mesh_parameterization/package_info/Surface_mesh_parameterization/dependencies b/Surface_mesh_parameterization/package_info/Surface_mesh_parameterization/dependencies index d66c39f593f..6365759ce7c 100644 --- a/Surface_mesh_parameterization/package_info/Surface_mesh_parameterization/dependencies +++ b/Surface_mesh_parameterization/package_info/Surface_mesh_parameterization/dependencies @@ -1,7 +1,6 @@ Algebraic_foundations BGL Box_intersection_d -Cartesian_kernel Circulator Distance_2 Distance_3