From a04159db42a5047c213f67f502fed3c957d2b94b Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 6 Apr 2016 05:32:55 +0000
Subject: [PATCH] new Delaunay in gui
---
Common/Options.cpp | 15 +++++++++------
Fltk/optionWindow.cpp | 14 ++++++++------
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/Common/Options.cpp b/Common/Options.cpp
index 5d61e8d0fc..854257eb66 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -5955,20 +5955,23 @@ double opt_mesh_algo3d(OPT_ARGS_NUM)
#if defined(HAVE_FLTK)
if(FlGui::available() && (action & GMSH_GUI)) {
switch (CTX::instance()->mesh.algo3d) {
+ case ALGO_3D_RTREE:
+ FlGui::instance()->options->mesh.choice[3]->value(6);
+ break;
case ALGO_3D_MMG3D:
- FlGui::instance()->options->mesh.choice[3]->value(4);
+ FlGui::instance()->options->mesh.choice[3]->value(5);
break;
case ALGO_3D_FRONTAL_HEX:
- FlGui::instance()->options->mesh.choice[3]->value(3);
+ FlGui::instance()->options->mesh.choice[3]->value(4);
break;
case ALGO_3D_FRONTAL_DEL:
- FlGui::instance()->options->mesh.choice[3]->value(2);
+ FlGui::instance()->options->mesh.choice[3]->value(3);
break;
case ALGO_3D_FRONTAL:
- FlGui::instance()->options->mesh.choice[3]->value(1);
+ FlGui::instance()->options->mesh.choice[3]->value(2);
break;
- case ALGO_3D_RTREE:
- FlGui::instance()->options->mesh.choice[3]->value(5);
+ case ALGO_3D_DELAUNAY_NEW:
+ FlGui::instance()->options->mesh.choice[3]->value(1);
break;
case ALGO_3D_DELAUNAY:
default:
diff --git a/Fltk/optionWindow.cpp b/Fltk/optionWindow.cpp
index 964a3c2215..87845be4ed 100644
--- a/Fltk/optionWindow.cpp
+++ b/Fltk/optionWindow.cpp
@@ -533,12 +533,13 @@ static void mesh_options_ok_cb(Fl_Widget *w, void *data)
(o->mesh.choice[2]->value() == 5) ? ALGO_2D_PACK_PRLGRMS :
ALGO_2D_AUTO);
opt_mesh_algo3d(0, GMSH_SET,
- (o->mesh.choice[3]->value() == 0) ? ALGO_3D_DELAUNAY :
- (o->mesh.choice[3]->value() == 2) ? ALGO_3D_FRONTAL_DEL :
- (o->mesh.choice[3]->value() == 3) ? ALGO_3D_FRONTAL_HEX :
- (o->mesh.choice[3]->value() == 4) ? ALGO_3D_MMG3D :
- (o->mesh.choice[3]->value() == 5) ? ALGO_3D_RTREE :
- ALGO_3D_FRONTAL);
+ (o->mesh.choice[3]->value() == 1) ? ALGO_3D_DELAUNAY_NEW :
+ (o->mesh.choice[3]->value() == 2) ? ALGO_3D_FRONTAL :
+ (o->mesh.choice[3]->value() == 3) ? ALGO_3D_FRONTAL_DEL :
+ (o->mesh.choice[3]->value() == 4) ? ALGO_3D_FRONTAL_HEX :
+ (o->mesh.choice[3]->value() == 5) ? ALGO_3D_MMG3D :
+ (o->mesh.choice[3]->value() == 6) ? ALGO_3D_RTREE :
+ ALGO_3D_DELAUNAY);
opt_mesh_algo_recombine(0, GMSH_SET, o->mesh.choice[1]->value());
opt_mesh_recombine_all(0, GMSH_SET, o->mesh.butt[21]->value());
@@ -2237,6 +2238,7 @@ optionWindow::optionWindow(int deltaFontSize)
};
static Fl_Menu_Item menu_3d_algo[] = {
{"Delaunay", 0, 0, 0},
+ {"New Delaunay", 0, 0, 0},
{"Frontal", 0, 0, 0},
{"Frontal Delaunay (experimental)", 0, 0, 0},
{"Frontal Hex (experimental)", 0, 0, 0},
--
GitLab