diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 48823cfd19b2477d76f6c01fea618c6bb91095b5..34a52a8b97b9640884807843ad874af986f7fb9a 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -614,7 +614,7 @@ StringXNumber GeneralOptions_Number[] = {
{ F, "TranslationZ" , opt_general_translation2 , 0.0 ,
"Z-axis translation (in model units)" },
- { F|O, "VectorType" , opt_general_vector_type , DRAW_POST_ARROW ,
+ { F|O, "VectorType" , opt_general_vector_type , DRAW_POST_ARROW3D ,
"Default vector display type (for normals, etc.)" },
{ F|O, "Verbosity" , opt_general_verbosity , 2. ,
"Level of information printed during processing (0=no information)" },
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index d79dcc529c586adebac4feba6f372a242153ca5d..b166fc927f7570870617eaed2c26f3ad5fd12cfa 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.204 2004-02-20 17:57:59 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.205 2004-02-20 23:22:36 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -1472,10 +1472,11 @@ void help_short_cb(CALLBACK_ARGS)
Msg(DIRECT, " Shift+o show option window");
Msg(DIRECT, " "XX"+o open file");
Msg(DIRECT, " p go to post-processor module");
- Msg(DIRECT, " Shift+p show post-processing general options");
+ Msg(DIRECT, " Shift+p show general post-processing options");
Msg(DIRECT, " "XX"+q quit");
Msg(DIRECT, " "XX"+s save mesh in default format");
Msg(DIRECT, " "XX"+Shift+s save file as");
+ Msg(DIRECT, " Shift+w show current post-processing view options");
Msg(DIRECT, "");
Msg(DIRECT, "Other shortcuts");
Msg(DIRECT, "");
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 21b7bcc0a5861b6784ac99a37100f915f22c510b..6894aa722a705a886b22f1479d6d50a4d9be734a 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.271 2004-02-20 17:57:59 geuzaine Exp $
+// $Id: GUI.cpp,v 1.272 2004-02-20 23:22:36 geuzaine Exp $
//
// Copyright (C) 1997-2004 C. Geuzaine, J.-F. Remacle
//
@@ -502,6 +502,14 @@ int GUI::global_shortcuts(int event)
post_options_cb(0, 0);
return 1;
}
+ else if(Fl::test_shortcut(FL_SHIFT + 'w')) {
+ if(List_Nbr(CTX.post.list))
+ if(view_number >= 0)
+ create_view_options_window(view_number);
+ else
+ create_view_options_window(0);
+ return 1;
+ }
else if(Fl::test_shortcut(FL_CTRL + FL_SHIFT + 'd')) {
opt_post_anim_delay(0, GMSH_SET | GMSH_GUI,
opt_post_anim_delay(0, GMSH_GET, 0) + 0.01);
@@ -1648,14 +1656,11 @@ void GUI::create_option_window()
}
geo_value[0] = new Fl_Value_Input(2 * WB, 2 * WB + 5 * BH, IW, BH, "Normals");
- geo_value[0]->minimum(0);
- geo_value[0]->maximum(100);
- geo_value[0]->step(0.1);
geo_value[1] = new Fl_Value_Input(2 * WB, 2 * WB + 6 * BH, IW, BH, "Tangents");
- geo_value[1]->minimum(0);
- geo_value[1]->maximum(100);
- geo_value[1]->step(0.1);
for(i = 0; i < 2; i++) {
+ geo_value[i]->minimum(0);
+ geo_value[i]->maximum(500);
+ geo_value[i]->step(1);
geo_value[i]->align(FL_ALIGN_RIGHT);
}
o->end();
@@ -1819,16 +1824,16 @@ void GUI::create_option_window()
mesh_value[8] = new Fl_Value_Input(2 * WB, 2 * WB + 7 * BH, IW, BH, "Normals");
mesh_value[8]->minimum(0);
- mesh_value[8]->maximum(100);
- mesh_value[8]->step(0.1);
+ mesh_value[8]->maximum(500);
+ mesh_value[8]->step(1);
for(i = 4; i < 9; i++) {
mesh_value[i]->align(FL_ALIGN_RIGHT);
}
mesh_value[13] = new Fl_Value_Input(2 * WB, 2 * WB + 8 * BH, IW, BH, "Tangents");
mesh_value[13]->minimum(0);
- mesh_value[13]->maximum(100);
- mesh_value[13]->step(0.1);
+ mesh_value[13]->maximum(200);
+ mesh_value[13]->step(1.0);
mesh_value[13]->align(FL_ALIGN_RIGHT);
o->end();
@@ -2249,7 +2254,7 @@ void GUI::create_option_window()
view_value[60] = new Fl_Value_Input(2 * WB, 2 * WB + 6 * BH, IW, BH, "Arrow size");
view_value[60]->minimum(0);
- view_value[60]->maximum(1000);
+ view_value[60]->maximum(500);
view_value[60]->step(1);
view_value[60]->align(FL_ALIGN_RIGHT);
view_value[60]->callback(set_changed_cb, 0);
@@ -2306,6 +2311,9 @@ void GUI::update_view_window(int num)
int i;
double val;
+ if(num < 0 || num >= List_Nbr(CTX.post.list))
+ return;
+
view_number = num;
Post_View *v = (Post_View *) List_Pointer(CTX.post.list, num);
@@ -2437,7 +2445,6 @@ void GUI::update_view_window(int num)
// colors
view_colorbar_window->update(v->Name, v->Min, v->Max, &v->CT, &v->Changed);
-
}
// Create the window for the statistics
diff --git a/doc/texinfo/shortcuts.texi b/doc/texinfo/shortcuts.texi
index a6df332aad90f1191d40cbd92cf0da4f95902be7..93ee16fb58857756e26d0b8e605f0ddde33d933d 100644
--- a/doc/texinfo/shortcuts.texi
+++ b/doc/texinfo/shortcuts.texi
@@ -41,7 +41,7 @@ open file
go to post-processor module
@item Shift+p
-show post-processing general options
+show general post-processing options
@item Ctrl+q
quit
@@ -52,6 +52,9 @@ save mesh in default format
@item Ctrl+Shift+s
save file as
+@item Shift+w
+show current post-processing view options
+
@end table
@sp 1