Merge pull request CGAL#7750 from ange-clement/Mesh-3-demo-protect-se…

…lected-polylines-in-dropdown Mesh 3 : improved meshing with selected polylines
lrineau · Oct 5, 2023 · 5b2b631 · 5b2b631
2 parents 8a4b492 + 685caf9
commit 5b2b631
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp
@@ -368,9 +368,9 @@ std::optional<QString> Mesh_3_plugin::get_items_or_return_error_string() const
   {
     auto poly_items_ptr = std::get_if<Polyhedral_mesh_items>(&items.value());
     auto image_items_ptr = std::get_if<Image_mesh_items>(&items.value());
-    if(poly_items_ptr && poly_items_ptr == nullptr)
+    if(poly_items_ptr != nullptr)
       poly_items_ptr->polylines_item = polylines_item;
-    else if(image_items_ptr && image_items_ptr == nullptr)
+    else if(image_items_ptr != nullptr )
       image_items_ptr->polylines_item = polylines_item;
   }
 
@@ -663,6 +663,8 @@ void Mesh_3_plugin::mesh_3(const Mesh_type mesh_type,
         ui.protectEdges->addItem(boundary_only.first, v(boundary_only.second));
       } else
         ui.protectEdges->addItem(sharp_edges.first, v(sharp_edges.second));
+      if (polylines_item != nullptr)
+        ui.protectEdges->addItem(input_polylines.first, v(input_polylines.second));
     } else if (items->index() == IMAGE_MESH_ITEMS) {
       if (polylines_item != nullptr) {
         ui.protectEdges->addItem(input_polylines.first, QVariant::fromValue(input_polylines.second));
@@ -729,6 +731,7 @@ void Mesh_3_plugin::mesh_3(const Mesh_type mesh_type,
   const auto pe_flags = ui.protectEdges->currentData().value<Protection_flags>();
   protect_borders = ui.protect->isChecked() && pe_flags.testFlag(BORDERS);
   protect_features = ui.protect->isChecked() && pe_flags.testFlag(FEATURES);
+  const bool protect_polylines = ui.protect->isChecked() && polylines_item != nullptr;
 
   const bool detect_connected_components = ui.detectComponents->isChecked();
   const int manifold = (ui.manifoldCheckBox->isChecked() ? 1 : 0) +
@@ -775,7 +778,7 @@ void Mesh_3_plugin::mesh_3(const Mesh_type mesh_type,
       sm_items.removeAll(make_not_null(bounding_sm_item));
     }
 
-    Scene_polylines_item::Polylines_container plc;
+    Scene_polylines_item::Polylines_container polylines_empty_container;
     SMesh* bounding_polyhedron = (bounding_sm_item == nullptr)
                                      ? nullptr
                                      : bounding_sm_item->polyhedron();
@@ -811,7 +814,7 @@ void Mesh_3_plugin::mesh_3(const Mesh_type mesh_type,
     {
       thread = cgal_code_mesh_3(
         polyhedrons,
-        (polylines_item == nullptr) ? plc : polylines_item->polylines,
+        protect_polylines ? polylines_item->polylines : polylines_empty_container,
         bounding_polyhedron,
         item_name,
         angle,
@@ -878,11 +881,11 @@ void Mesh_3_plugin::mesh_3(const Mesh_type mesh_type,
       ? image_item->image_weights()
       : nullptr;
 
-    Scene_polylines_item::Polylines_container plc;
+    Scene_polylines_item::Polylines_container polylines_empty_container;
 
     thread = cgal_code_mesh_3(
         pImage,
-        (img_polylines_item == nullptr) ? plc : img_polylines_item->polylines,
+        (img_polylines_item == nullptr) ? polylines_empty_container : img_polylines_item->polylines,
         angle,
         facets_sizing,
         facets_min_sizing,