From dba7c3eb73c81f4b7bf0961a8784c589f31e2d0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Thu, 26 Mar 2020 19:40:38 +0100 Subject: [PATCH] extra run of the script to remove tabs and trailing whitespaces --- BGL/doc/BGL/BGL.txt | 2 +- ...lection_borders_regularization_example.cpp | 4 +-- BGL/include/CGAL/boost/graph/selection.h | 32 +++++++++---------- .../Plugins/PMP/Selection_plugin.cpp | 10 +++--- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/BGL/doc/BGL/BGL.txt b/BGL/doc/BGL/BGL.txt index 110303af235..b31a570ee71 100644 --- a/BGL/doc/BGL/BGL.txt +++ b/BGL/doc/BGL/BGL.txt @@ -743,7 +743,7 @@ parameters, with and without preventing unselection. The following example shows how to apply this alpha expansion regularization to the borders of a face selection of a `CGAL::Surface_mesh` object: - + \cgalExample{BGL_graphcut/face_selection_borders_regularization_example.cpp} diff --git a/BGL/examples/BGL_graphcut/face_selection_borders_regularization_example.cpp b/BGL/examples/BGL_graphcut/face_selection_borders_regularization_example.cpp index dae5b7dcd20..1dbb8a564a8 100644 --- a/BGL/examples/BGL_graphcut/face_selection_borders_regularization_example.cpp +++ b/BGL/examples/BGL_graphcut/face_selection_borders_regularization_example.cpp @@ -36,7 +36,7 @@ int main(int argc, char** argv) } std::cerr << nb_selected_before << " selected before regularization" << std::endl; - + CGAL::regularize_face_selection_borders (mesh, boost::make_assoc_property_map(is_selected_map), 0.5); // using weight = 0.5 @@ -47,6 +47,6 @@ int main(int argc, char** argv) ++ nb_selected_after; std::cerr << nb_selected_after << " selected after regularization" << std::endl; - + return EXIT_SUCCESS; } diff --git a/BGL/include/CGAL/boost/graph/selection.h b/BGL/include/CGAL/boost/graph/selection.h index b02362525bd..93e16306b1c 100644 --- a/BGL/include/CGAL/boost/graph/selection.h +++ b/BGL/include/CGAL/boost/graph/selection.h @@ -75,14 +75,14 @@ struct Regularization_graph typedef typename GT::edge_descriptor fg_edge_descriptor; typedef typename GT::edge_iterator fg_edge_iterator; typedef typename GT::vertex_descriptor fg_vertex_descriptor; - + typedef fg_face_descriptor vertex_descriptor; typedef fg_face_iterator vertex_iterator; typedef fg_edge_descriptor edge_descriptor; typedef boost::undirected_tag directed_category; typedef boost::disallow_parallel_edge_tag edge_parallel_category; typedef boost::edge_list_graph_tag traversal_category; - + struct Filter_border_edges { FaceGraph* fg; @@ -133,7 +133,7 @@ struct Regularization_graph friend reference get (const Vertex_label_probability_map& pmap, key_type fd) { double value = (1. - pmap.rg->weight) * pmap.rg->area (fd) / pmap.rg->total_area; - + std::vector out(2); if (get(pmap.rg->is_selected_map, fd)) { @@ -214,7 +214,7 @@ struct Regularization_graph else labels.push_back(0); } - + // Compute normalization factors for (fg_edge_descriptor ed : edges(fg)) total_length += length (ed); @@ -234,7 +234,7 @@ struct Regularization_graph { fg_halfedge_descriptor hd = halfedge (fd, fg); fg_halfedge_descriptor nhd = next (hd, fg); - + return approximate_sqrt (squared_area (get (vertex_point_map, source (hd, fg)), get (vertex_point_map, target (hd, fg)), get (vertex_point_map, target (nhd, fg)))); @@ -263,7 +263,7 @@ struct Regularization_graph { return face (halfedge (ed, graph.fg), graph.fg); } - + friend vertex_descriptor target (edge_descriptor ed, const Regularization_graph& graph) { return face (opposite(halfedge (ed, graph.fg), graph.fg), graph.fg); @@ -475,7 +475,7 @@ reduce_face_selection( \cgalParamEnd \cgalNamedParamsEnd */ -template +template void regularize_face_selection_borders( FaceGraph& fg, @@ -485,9 +485,9 @@ regularize_face_selection_borders( { using parameters::choose_parameter; using parameters::get_parameter; - + CGAL_precondition (0.0 <= weight && weight < 1.0); - + typedef boost::graph_traits GT; typedef typename GT::face_descriptor fg_face_descriptor; typedef typename GT::halfedge_descriptor fg_halfedge_descriptor; @@ -512,14 +512,14 @@ regularize_face_selection_borders( vertex_point_map, weight, prevent_unselection); - + alpha_expansion_graphcut (graph, graph.edge_cost_map(), graph.vertex_label_probability_map(), graph.vertex_label_map(), CGAL::parameters::vertex_index_map (face_index_map)); - + for (fg_face_descriptor fd : faces(fg)) put(is_selected, fd, graph.labels[get(face_index_map,fd)]); } @@ -560,7 +560,7 @@ regularize_face_selection_borders( // TODO: this is a quick and dirty version, the complexity is // crazy and it should be easy to do better (with priority queues, // for example) - + auto border_length = [&]() -> double { @@ -571,7 +571,7 @@ regularize_face_selection_borders( fg_face_descriptor f1 = face (opposite(halfedge (ed, fg), fg), fg); if (get(is_selected,f0) == get(is_selected,f1)) continue; - + fg_vertex_descriptor esource = source(ed, fg); fg_vertex_descriptor etarget = target(ed, fg); @@ -587,7 +587,7 @@ regularize_face_selection_borders( fg_edge_descriptor chosen; double length_before = border_length(); double shortest_length = length_before; - + for (fg_edge_descriptor ed : edges(fg)) { fg_face_descriptor selected = face (halfedge (ed, fg), fg); @@ -631,7 +631,7 @@ regularize_face_selection_borders( fg_vertex_descriptor chosen; double length_before = border_length(); double shortest_length = length_before; - + for (fg_vertex_descriptor vd : vertices(fg)) { fg_halfedge_descriptor hd = halfedge(vd, fg); @@ -676,7 +676,7 @@ regularize_face_selection_borders( break; fg_halfedge_descriptor hd = halfedge (chosen, fg); - + for (fg_face_descriptor fd : faces_around_target (hd, fg)) put(is_selected, fd, true); } diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Selection_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Selection_plugin.cpp index 8121b9a7c13..28c6dcff884 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Selection_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Selection_plugin.cpp @@ -380,7 +380,7 @@ public Q_SLOTS: Scene_polyhedron_selection_item* selection_item = getSelectedItem(); if(!selection_item) { print_message("Error: there is no selected polyhedron selection item!"); - return; + return; } QMultipleInputDialog dialog ("Regularize Selection Border", mw); @@ -393,7 +393,7 @@ public Q_SLOTS: if (dialog.exec() != QDialog::Accepted) return; - + boost::unordered_map is_selected_map; std::size_t index = 0; for(fg_face_descriptor fh : faces(*selection_item->polyhedron())) @@ -420,7 +420,7 @@ public Q_SLOTS: *selection_item->polyhedron()); if (is_selected_map[f0] == is_selected_map[f1]) continue; - + fg_vertex_descriptor esource = source(ed, *selection_item->polyhedron()); fg_vertex_descriptor etarget = target(ed, *selection_item->polyhedron()); @@ -440,9 +440,9 @@ public Q_SLOTS: CGAL::parameters::prevent_unselection (prevent_unselection->isChecked())); std::cerr << "Length of border after regularization = " << border_length() << std::endl; - + selection_item->selected_facets.clear(); - + for(fg_face_descriptor fh : faces(*selection_item->polyhedron())) { if (is_selected_map[fh])