diff --git a/Common/Options.cpp b/Common/Options.cpp index 8bb15aae751b32f1e230bbf4cbf813ff15afbc86..d8196d31f32a5358bd1853d29a2de1aee2033911 100644 --- a/Common/Options.cpp +++ b/Common/Options.cpp @@ -1,4 +1,4 @@ -// $Id: Options.cpp,v 1.83 2002-07-31 03:59:08 geuzaine Exp $ +// $Id: Options.cpp,v 1.84 2002-08-07 00:30:25 geuzaine Exp $ // // Copyright (C) 1997 - 2002 C. Geuzaine, J.-F. Remacle // @@ -2698,7 +2698,7 @@ double opt_view_tensor_type(OPT_ARGS_NUM){ } #ifdef _FLTK if(WID && (action & GMSH_GUI) && (num == WID->view_number)){ - switch(v->ScaleType){ + switch(v->TensorType){ case DRAW_POST_VONMISES: WID->view_choice[4]->value(0); break; case DRAW_POST_EIGENVECTORS: WID->view_choice[4]->value(1); break; } @@ -2714,13 +2714,12 @@ double opt_view_arrow_type(OPT_ARGS_NUM){ } #ifdef _FLTK if(WID && (action & GMSH_GUI) && (num == WID->view_number)){ - switch(v->ScaleType){ + switch(v->ArrowType){ case DRAW_POST_SEGMENT: WID->view_choice[2]->value(0); break; case DRAW_POST_ARROW: WID->view_choice[2]->value(1); break; - case DRAW_POST_ARROW3D: WID->view_choice[2]->value(2); break; + case DRAW_POST_PYRAMID: WID->view_choice[2]->value(2); break; case DRAW_POST_CONE: WID->view_choice[2]->value(3); break; - case DRAW_POST_CONE3D: WID->view_choice[2]->value(4); break; - case DRAW_POST_DISPLACEMENT: WID->view_choice[2]->value(5); break; + case DRAW_POST_DISPLACEMENT: WID->view_choice[2]->value(4); break; } } #endif @@ -2734,7 +2733,7 @@ double opt_view_arrow_location(OPT_ARGS_NUM){ } #ifdef _FLTK if(WID && (action & GMSH_GUI) && (num == WID->view_number)){ - switch(v->ScaleType){ + switch(v->ArrowLocation){ case DRAW_POST_LOCATE_COG: WID->view_choice[3]->value(0); break; case DRAW_POST_LOCATE_VERTEX: WID->view_choice[3]->value(1); break; } diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp index a6fc4182e2ee592ac787cf828608746f43452960..3e80da30b6279e0403fef72ba8b84c30b19d864d 100644 --- a/Fltk/Callbacks.cpp +++ b/Fltk/Callbacks.cpp @@ -1,4 +1,4 @@ -// $Id: Callbacks.cpp,v 1.136 2002-08-06 06:39:30 geuzaine Exp $ +// $Id: Callbacks.cpp,v 1.137 2002-08-07 00:30:25 geuzaine Exp $ // // Copyright (C) 1997 - 2002 C. Geuzaine, J.-F. Remacle // @@ -2331,9 +2331,8 @@ void view_options_ok_cb(CALLBACK_ARGS){ switch(WID->view_choice[2]->value()){ case 0 : val = DRAW_POST_SEGMENT; break; case 1 : val = DRAW_POST_ARROW; break; - case 2 : val = DRAW_POST_ARROW3D; break; + case 2 : val = DRAW_POST_PYRAMID; break; case 3 : val = DRAW_POST_CONE; break; - case 4 : val = DRAW_POST_CONE3D; break; default : val = DRAW_POST_DISPLACEMENT; break; } opt_view_arrow_type(i, GMSH_SET, val); diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp index d77767094d64f6b46e35c018ee4411fdc57b0511..550421b0964c6c6b9ba14b218ceed224d64d5d0f 100644 --- a/Fltk/GUI.cpp +++ b/Fltk/GUI.cpp @@ -1,4 +1,4 @@ -// $Id: GUI.cpp,v 1.188 2002-08-06 21:14:35 geuzaine Exp $ +// $Id: GUI.cpp,v 1.189 2002-08-07 00:30:25 geuzaine Exp $ // // Copyright (C) 1997 - 2002 C. Geuzaine, J.-F. Remacle // @@ -2471,9 +2471,8 @@ void GUI::create_view_options_window(int num){ static Fl_Menu_Item menu_vectype[] = { {"Line", 0, 0, 0}, {"Arrow", 0, 0, 0}, - {"3D Arrow", 0, 0, 0}, + {"Pyramid", 0, 0, 0}, {"Cone", 0, 0, 0}, - {"3D cone", 0, 0, 0}, {"Displacement", 0, 0, 0}, {0} };