songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2932 from kkatrio/null-edge-hole-filling 

PMP hole filling: null edge
This commit is contained in:
Laurent Rineau 2018-03-26 10:55:58 +02:00
parent 282fb619ce bec3227a00
commit 1ef766c19b
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Hole_filling/Triangulate_hole_polyline.h
View File

@ -1142,7 +1142,7 @@ public:
triangulate_all(P, Q, WC, std::make_pair(0,n-1), W, lambda); triangulate_all(P, Q, WC, std::make_pair(0,n-1), W, lambda);
if(W.get(0,n-1) == Weight::NOT_VALID()) { if(W.get(0,n-1) == Weight::NOT_VALID() || n <= 2) {
#ifndef CGAL_TEST_SUITE #ifndef CGAL_TEST_SUITE
CGAL_warning(!"Returning no output. No possible triangulation is found!"); CGAL_warning(!"Returning no output. No possible triangulation is found!");
#else #else

1
Polygon_mesh_processing/test/Polygon_mesh_processing/data/null_edge.polylines.txt Normal file
View File

@ -0,0 +1 @@
3 -1 -1 0 1 1 0 -1 -1 0

2
Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_polyline_test.cpp
View File

@ -223,6 +223,8 @@ void test_should_be_no_output(const char* file_name, bool use_DT) {
test_should_be_no_output("data/collinear.polylines.txt", true); test_should_be_no_output("data/collinear.polylines.txt", true);
test_should_be_no_output("data/collinear.polylines.txt", false); test_should_be_no_output("data/collinear.polylines.txt", false);
test_should_be_no_output("data/null_edge.polylines.txt", true);
test_should_be_no_output("data/null_edge.polylines.txt", false);
std::cerr << "All Done!" << std::endl; std::cerr << "All Done!" << std::endl;
} }

10
Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_polyline_plugin.cpp
View File

@ -114,8 +114,14 @@ public Q_SLOTS:
print_message(QString("Triangulated in %1 sec.").arg(timer.time())); print_message(QString("Triangulated in %1 sec.").arg(timer.time()));
if(patch.empty()) { if(patch.empty()) {
print_message("Warning: generating patch is not successful, please try it without 'Delaunay Triangulation'!"); if(use_DT){
continue; print_message("Warning: generating patch is not successful, please try it without 'Delaunay Triangulation'!");
continue;
}
else{
print_message("Warning: generating patch is not successful, skipping.");
continue;
}
} }
if(mw->property("is_polyhedron_mode").toBool()){ if(mw->property("is_polyhedron_mode").toBool()){