From d4627ac2bf77831546167a5a7a4deb59c209acfd Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 26 Jan 2006 13:41:45 +0000
Subject: [PATCH] reorder 2D algo menu to match #define numbers (dave)
---
Common/Options.cpp | 6 +++---
Fltk/Callbacks.cpp | 6 +++---
Fltk/GUI.cpp | 4 ++--
TODO | 7 ++++++-
4 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/Common/Options.cpp b/Common/Options.cpp
index 52653acec4..d744b45c7e 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.272 2006-01-18 04:33:51 geuzaine Exp $
+// $Id: Options.cpp,v 1.273 2006-01-26 13:41:44 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -4569,10 +4569,10 @@ double opt_mesh_algo2d(OPT_ARGS_NUM)
case DELAUNAY_ISO:
WID->mesh_choice[2]->value(0);
break;
- case DELAUNAY_TRIANGLE:
+ case DELAUNAY_ANISO:
WID->mesh_choice[2]->value(1);
break;
- case DELAUNAY_ANISO:
+ case DELAUNAY_TRIANGLE:
default:
WID->mesh_choice[2]->value(2);
break;
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index 107795b5a5..2d4bb84423 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.402 2006-01-23 21:26:34 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.403 2006-01-26 13:41:44 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -1153,8 +1153,8 @@ void mesh_options_ok_cb(CALLBACK_ARGS)
opt_mesh_line_type(0, GMSH_SET, WID->mesh_choice[1]->value());
opt_mesh_algo2d(0, GMSH_SET,
(WID->mesh_choice[2]->value() == 0) ? DELAUNAY_ISO :
- (WID->mesh_choice[2]->value() == 1) ? DELAUNAY_TRIANGLE :
- DELAUNAY_ANISO);
+ (WID->mesh_choice[2]->value() == 1) ? DELAUNAY_ANISO :
+ DELAUNAY_TRIANGLE);
opt_mesh_recombine_algo(0, GMSH_SET,
(WID->mesh_choice[5]->value() == 0) ? 1 : 2);
opt_mesh_algo3d(0, GMSH_SET,
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 772f2a1e88..614b87a9e7 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.482 2006-01-18 04:33:51 geuzaine Exp $
+// $Id: GUI.cpp,v 1.483 2006-01-26 13:41:45 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -2187,8 +2187,8 @@ void GUI::create_option_window()
static Fl_Menu_Item menu_2d_algo[] = {
{"Isotropic", 0, 0, 0},
- {"Triangle", 0, 0, 0},
{"Anisotropic", 0, 0, 0},
+ {"Triangle", 0, 0, 0},
{0}
};
static Fl_Menu_Item menu_recombine_algo[] = {
diff --git a/TODO b/TODO
index d2a2358de1..9939b02d4b 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,9 @@
-$Id: TODO,v 1.118 2006-01-23 21:26:34 geuzaine Exp $
+$Id: TODO,v 1.119 2006-01-26 13:41:44 geuzaine Exp $
+
+********************************************************************
+
+bug: triangle orientations with the anisotropic algo can change from
+element to element in a single surface? (TO BE CONFIRMED)
********************************************************************
--
GitLab