From f084954892cc86d76340142aade60db92cf3ea76 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Wed, 12 Nov 2014 16:16:03 +0100 Subject: [PATCH] add input dialogs to demo to be able to set Delaunay refinement parameters --- .../Constrained_Delaunay_triangulation_2.cpp | 12 ++++++++++-- .../Constrained_Delaunay_triangulation_2.ui | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp index 50accdfe995..8a91abd01c1 100644 --- a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp @@ -641,14 +641,22 @@ MainWindow::on_actionMakeDelaunayMesh_triggered() { // wait cursor QApplication::setOverrideCursor(Qt::WaitCursor); - double edge_length = 0; CGAL::Timer timer; timer.start(); initializeID(cdt); discoverComponents(cdt); + bool ok; + double d = QInputDialog::getDouble(this, tr("Shape criterion"), + tr("B = "), 0.125, 0.005, 100, 4, &ok); + double shape = ok ? d : 0.125; + + d = QInputDialog::getDouble(this, tr("Size criterion"), + tr("S = "), 0., 0., std::numeric_limits::max(), 5, &ok); + double edge_len = ok ? d : 0.; + std::size_t nv = cdt.number_of_vertices(); - CGAL::refine_Delaunay_mesh_2(cdt, Criteria(0.125, edge_length), true); + CGAL::refine_Delaunay_mesh_2(cdt, Criteria(shape, edge_len), true); timer.stop(); nv = cdt.number_of_vertices() - nv; initializeID(cdt); diff --git a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui index 6ba7fbfe661..5e45f1ccbde 100644 --- a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui +++ b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui @@ -286,7 +286,7 @@ - Make Delaunay mesh + Make Delaunay mesh...