From c3f86a985ff75b926ed1eefbc83886155e2164fe Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 3 Dec 2006 18:04:11 +0000
Subject: [PATCH] algo2d=triangle is not available at the moment
---
Common/Options.cpp | 12 ++++--------
Fltk/GUI.cpp | 4 +++-
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/Common/Options.cpp b/Common/Options.cpp
index de303b7cd0..84f23ce4b0 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.321 2006-11-30 13:55:20 geuzaine Exp $
+// $Id: Options.cpp,v 1.322 2006-12-03 18:04:11 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -4634,13 +4634,9 @@ double opt_mesh_algo2d(OPT_ARGS_NUM)
{
if(action & GMSH_SET){
int algo = (int)val;
- if(algo != DELAUNAY_ISO &&
- algo != DELAUNAY_TRIANGLE){
- Msg(WARNING, "Unknown mesh algorithm: keeping existing value");
- }
- else{
- CTX.mesh.algo2d = algo;
- }
+ // at the moment the only 2d algo available is ours!
+ // CTX.mesh.algo2d = algo;
+ CTX.mesh.algo2d = DELAUNAY_ISO;
}
#if defined(HAVE_FLTK)
if(WID && (action & GMSH_GUI)) {
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index eea14c491f..1340fc1f9d 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.579 2006-12-03 17:45:37 geuzaine Exp $
+// $Id: GUI.cpp,v 1.580 2006-12-03 18:04:11 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -2244,6 +2244,8 @@ void GUI::create_option_window()
mesh_choice[2]->menu(menu_2d_algo);
mesh_choice[2]->align(FL_ALIGN_RIGHT);
mesh_choice[2]->callback(mesh_options_ok_cb);
+ // not reimplemented yet
+ ((Fl_Menu_Item*)mesh_choice[2]->menu())[1].deactivate();
mesh_choice[3] = new Fl_Choice(L + 2 * WB, 2 * WB + 2 * BH, IW, BH, "3D algorithm");
mesh_choice[3]->menu(menu_3d_algo);
--
GitLab