diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Surface_mesh_approximation_dockwidget.ui b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Surface_mesh_approximation_dockwidget.ui index 991f943d413..65b1d9a5f1e 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Surface_mesh_approximation_dockwidget.ui +++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Surface_mesh_approximation_dockwidget.ui @@ -6,8 +6,8 @@ 0 0 - 654 - 360 + 717 + 356 @@ -64,74 +64,27 @@ - - - - #Relaxations - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - QAbstractSpinBox::NoButtons - - - 5 - - - - + + + + Error drop - - true - - - - - - - false - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - QAbstractSpinBox::NoButtons - - - 4 - - - 0.000100000000000 - - - 1.000000000000000 - - - 0.010000000000000 - - - 0.010000000000000 - - + #Proxies - - true - - - true + + + + + + #Relaxations @@ -164,6 +117,50 @@ + + + + true + + + Negative value is ignored + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + QAbstractSpinBox::NoButtons + + + 4 + + + -1.000000000000000 + + + 1.000000000000000 + + + 0.010000000000000 + + + -1.000000000000000 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + QAbstractSpinBox::NoButtons + + + 5 + + + diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Surface_mesh_approximation_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Surface_mesh_approximation_plugin.cpp index ce5fcfef22d..b83bf4c9758 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Surface_mesh_approximation_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Surface_mesh_approximation_plugin.cpp @@ -299,10 +299,8 @@ void Polyhedron_demo_surface_mesh_approximation_plugin::on_buttonSeeding_clicked time.start(); approx.initialize_seeds(CGAL::parameters::seeding_method( static_cast(ui_widget.comboMethod->currentIndex())) - .max_number_of_proxies((ui_widget.cb_nb_proxies->isChecked() ? - boost::optional(ui_widget.nb_proxies->value()) : boost::none)) - .min_error_drop((ui_widget.cb_error_drop->isChecked() ? - boost::optional(ui_widget.error_drop->value()) : boost::none)) + .max_number_of_proxies(ui_widget.nb_proxies->value()) + .min_error_drop(ui_widget.error_drop->value()) .number_of_relaxations(ui_widget.nb_relaxations->value())); approx.run(ui_widget.nb_iterations->value());