From 0f8f524b4bcc8e2632d420335ae5215701f0a3b3 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 17 Feb 2012 06:31:39 +0000
Subject: [PATCH] fix copy and paste bug
---
Common/Options.cpp | 6 +++---
Fltk/optionWindow.cpp | 5 ++++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Common/Options.cpp b/Common/Options.cpp
index 2f22ee4e80..0fb008815f 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -3943,7 +3943,7 @@ double opt_geometry_occ_fix_degenerated(OPT_ARGS_NUM)
(CTX::instance()->geom.occFixDegenerated);
}
#endif
- return CTX::instance()->geom.occFixSmallEdges;
+ return CTX::instance()->geom.occFixDegenerated;
}
double opt_geometry_occ_fix_small_edges(OPT_ARGS_NUM)
@@ -5144,12 +5144,12 @@ double opt_mesh_hom_no_metric(OPT_ARGS_NUM)
double opt_mesh_cgns_import_order(OPT_ARGS_NUM)
{
if(action & GMSH_SET) {
- int value = (int)val;
+ int value = (int)val;
double order = val;
while(order >= 2.0) {
order = order / 2.0;
}
-
+
if (order != 1.0)
value = 1;
CTX::instance()->mesh.cgnsImportOrder = value;
diff --git a/Fltk/optionWindow.cpp b/Fltk/optionWindow.cpp
index dec0c7e3fe..486ce34d88 100644
--- a/Fltk/optionWindow.cpp
+++ b/Fltk/optionWindow.cpp
@@ -385,11 +385,14 @@ static void geometry_options_ok_cb(Fl_Widget *w, void *data)
opt_geometry_auto_coherence(0, GMSH_SET, o->geo.butt[8]->value());
opt_geometry_light(0, GMSH_SET, o->geo.butt[9]->value());
opt_geometry_highlight_orphans(0, GMSH_SET, o->geo.butt[10]->value());
+
opt_geometry_occ_fix_degenerated(0, GMSH_SET, o->geo.butt[16]->value());
+ opt_geometry_occ_fix_small_edges(0, GMSH_SET, o->geo.butt[11]->value());
opt_geometry_occ_fix_small_faces(0, GMSH_SET, o->geo.butt[12]->value());
opt_geometry_occ_sew_faces(0, GMSH_SET, o->geo.butt[13]->value());
- opt_geometry_light_two_side(0, GMSH_SET, o->geo.butt[14]->value());
opt_geometry_occ_connect_faces(0, GMSH_SET, o->geo.butt[15]->value());
+
+ opt_geometry_light_two_side(0, GMSH_SET, o->geo.butt[14]->value());
int old_hide_compound = (int)opt_geometry_hide_compounds(0, GMSH_GET, 0);
opt_geometry_hide_compounds(0, GMSH_SET, o->geo.butt[17]->value());
--
GitLab