From ebdffe3328e8196a328105f970120a028a246faf Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 28 Apr 2005 14:53:13 +0000
Subject: [PATCH] removed "interactive aniso contruction" option from the GUI
(to make some \ space for the "quad algorithm" option in the panel)
---
Common/Options.cpp | 10 ++--------
Fltk/Callbacks.cpp | 3 +--
Fltk/GUI.cpp | 23 +++++++++--------------
3 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/Common/Options.cpp b/Common/Options.cpp
index ce773c6ae0..a1141ab700 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.241 2005-04-19 16:03:09 remacle Exp $
+// $Id: Options.cpp,v 1.242 2005-04-28 14:53:12 geuzaine Exp $
//
// Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
//
@@ -4387,9 +4387,7 @@ double opt_mesh_recombine_algo(OPT_ARGS_NUM)
{
if(action & GMSH_SET){
int algo = (int)val;
- printf("algo = %d\n",algo);
- if(algo != 1 &&
- algo != 2){
+ if(algo != 1 && algo != 2){
Msg(WARNING, "Unknown mesh algorithm: keeping existing value");
}
else{
@@ -4494,10 +4492,6 @@ double opt_mesh_interactive(OPT_ARGS_NUM)
{
if(action & GMSH_SET)
CTX.mesh.interactive = (int)val;
-#if defined(HAVE_FLTK)
- if(WID && (action & GMSH_GUI))
- WID->mesh_butt[4]->value(CTX.mesh.interactive);
-#endif
return CTX.mesh.interactive;
}
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index e8a0b7d4e0..de77aba083 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.352 2005-04-19 16:03:09 remacle Exp $
+// $Id: Callbacks.cpp,v 1.353 2005-04-28 14:53:12 geuzaine Exp $
//
// Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
//
@@ -1018,7 +1018,6 @@ void mesh_options_ok_cb(CALLBACK_ARGS)
opt_mesh_points_per_element(0, GMSH_SET, WID->mesh_butt[0]->value());
opt_mesh_optimize(0, GMSH_SET, WID->mesh_butt[2]->value());
opt_mesh_order(0, GMSH_SET, WID->mesh_butt[3]->value()? 2 : 1);
- opt_mesh_interactive(0, GMSH_SET, WID->mesh_butt[4]->value());
opt_mesh_constrained_bgmesh(0, GMSH_SET, WID->mesh_butt[5]->value());
opt_mesh_points(0, GMSH_SET, WID->mesh_butt[6]->value());
opt_mesh_lines(0, GMSH_SET, WID->mesh_butt[7]->value());
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index e44f02e383..36236474a9 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.438 2005-04-19 16:03:09 remacle Exp $
+// $Id: GUI.cpp,v 1.439 2005-04-28 14:53:13 geuzaine Exp $
//
// Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
//
@@ -2191,40 +2191,35 @@ void GUI::create_option_window()
mesh_choice[3]->menu(menu_3d_algo);
mesh_choice[3]->align(FL_ALIGN_RIGHT);
- mesh_choice[5] = new Fl_Choice(L + 2 * WB, 2 * WB + 3 * BH, IW, BH, "Quad algorithm");
+ mesh_choice[5] = new Fl_Choice(L + 2 * WB, 2 * WB + 3 * BH, IW, BH, "Quadrangulation algorithm (Recombine)");
mesh_choice[5]->menu(menu_recombine_algo);
mesh_choice[5]->align(FL_ALIGN_RIGHT);
- mesh_butt[4] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 4 * BH, BW, BH, "Show interactive anisotropic mesh construction");
- mesh_butt[4]->type(FL_TOGGLE_BUTTON);
- mesh_butt[4]->down_box(GMSH_TOGGLE_BOX);
- mesh_butt[4]->selection_color(GMSH_TOGGLE_COLOR);
-
- mesh_value[0] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 5 * BH, IW, BH, "Number of smoothing steps");
+ mesh_value[0] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 4 * BH, IW, BH, "Number of smoothing steps");
mesh_value[0]->minimum(0);
mesh_value[0]->maximum(100);
mesh_value[0]->step(1);
mesh_value[0]->align(FL_ALIGN_RIGHT);
- mesh_value[1] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 6 * BH, IW, BH, "Mesh scaling factor");
+ mesh_value[1] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 5 * BH, IW, BH, "Mesh scaling factor");
mesh_value[1]->minimum(0.001);
mesh_value[1]->maximum(1000);
mesh_value[1]->step(0.001);
mesh_value[1]->align(FL_ALIGN_RIGHT);
- mesh_value[2] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 7 * BH, IW, BH, "Characteristic length factor");
+ mesh_value[2] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 6 * BH, IW, BH, "Characteristic length factor");
mesh_value[2]->minimum(0.001);
mesh_value[2]->maximum(1000);
mesh_value[2]->step(0.001);
mesh_value[2]->align(FL_ALIGN_RIGHT);
- mesh_value[3] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 8 * BH, IW, BH, "Random perturbation factor");
+ mesh_value[3] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 7 * BH, IW, BH, "Random perturbation factor");
mesh_value[3]->minimum(1.e-6);
mesh_value[3]->maximum(1.e-1);
mesh_value[3]->step(1.e-6);
mesh_value[3]->align(FL_ALIGN_RIGHT);
- mesh_butt[2] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 9 * BH, BW, BH, "Optimize quality of tetrahedral elements");
+ mesh_butt[2] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 8 * BH, BW, BH, "Optimize quality of tetrahedral elements");
mesh_butt[2]->type(FL_TOGGLE_BUTTON);
mesh_butt[2]->down_box(GMSH_TOGGLE_BOX);
mesh_butt[2]->selection_color(GMSH_TOGGLE_COLOR);
@@ -2232,12 +2227,12 @@ void GUI::create_option_window()
mesh_butt[2]->deactivate();
#endif
- mesh_butt[3] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 10 * BH, BW, BH, "Generate second order elements");
+ mesh_butt[3] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 9 * BH, BW, BH, "Generate second order elements");
mesh_butt[3]->type(FL_TOGGLE_BUTTON);
mesh_butt[3]->down_box(GMSH_TOGGLE_BOX);
mesh_butt[3]->selection_color(GMSH_TOGGLE_COLOR);
- mesh_butt[5] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 11 * BH, BW, BH, "Constrain background mesh with characteristic length field");
+ mesh_butt[5] = new Fl_Check_Button(L + 2 * WB, 2 * WB + 10 * BH, BW, BH, "Constrain background mesh with characteristic length field");
mesh_butt[5]->type(FL_TOGGLE_BUTTON);
mesh_butt[5]->down_box(GMSH_TOGGLE_BOX);
mesh_butt[5]->selection_color(GMSH_TOGGLE_COLOR);
--
GitLab