diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp index 8dba2c09b83b1b307c80553fe8b61692488617af..9a077fa1982be0a8c3bd0efdbb79283d6da558c4 100644 --- a/Fltk/Callbacks.cpp +++ b/Fltk/Callbacks.cpp @@ -1,4 +1,4 @@ -// $Id: Callbacks.cpp,v 1.107 2002-02-20 16:41:20 geuzaine Exp $ +// $Id: Callbacks.cpp,v 1.108 2002-02-20 16:44:25 geuzaine Exp $ #include <sys/types.h> #include <signal.h> @@ -157,21 +157,13 @@ void ManualPlay(int time, int step){ else{//hide all views except view_in_cycle if(step>0){ if((view_in_cycle+=step)>=List_Nbr(CTX.post.list)) view_in_cycle=0; - for(i=0 ; i<List_Nbr(CTX.post.list) ; i+=step){ - if(i == view_in_cycle) - opt_view_visible(i, GMSH_SET|GMSH_GUI, 1); - else - opt_view_visible(i, GMSH_SET|GMSH_GUI, 0); - } + for(i=0 ; i<List_Nbr(CTX.post.list) ; i+=step) + opt_view_visible(i, GMSH_SET|GMSH_GUI, (i==view_in_cycle)); } else{ if((view_in_cycle+=step)<0) view_in_cycle=List_Nbr(CTX.post.list)-1; - for(i=List_Nbr(CTX.post.list)-1 ; i>=0 ; i+=step){ - if(i == view_in_cycle) - opt_view_visible(i, GMSH_SET|GMSH_GUI, 1); - else - opt_view_visible(i, GMSH_SET|GMSH_GUI, 0); - } + for(i=List_Nbr(CTX.post.list)-1 ; i>=0 ; i+=step) + opt_view_visible(i, GMSH_SET|GMSH_GUI, (i==view_in_cycle)); } } Draw(); diff --git a/Fltk/Callbacks.h b/Fltk/Callbacks.h index 600570d4188bf8f0136a4c95269fec393d3c7daf..5d4912afd92e17e0fadd8bc93c8c95a5359a7b85 100644 --- a/Fltk/Callbacks.h +++ b/Fltk/Callbacks.h @@ -4,6 +4,7 @@ #define CALLBACK_ARGS Fl_Widget* w, void* data int SetGlobalShortcut(int event); +void ManualPlay(int time, int step); // Common callbacks diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp index 9081753fd1387683564a2a56729c66c8f67b31e5..6818602dfc7553b626e259a8949d9eb95e2bc81a 100644 --- a/Fltk/GUI.cpp +++ b/Fltk/GUI.cpp @@ -1,4 +1,4 @@ -// $Id: GUI.cpp,v 1.153 2002-02-18 18:01:05 geuzaine Exp $ +// $Id: GUI.cpp,v 1.154 2002-02-20 16:41:20 geuzaine Exp $ // To make the interface as visually consistent as possible, please: // - use the IW, BB, BH, BW and WB values @@ -506,6 +506,22 @@ int GUI::global_shortcuts(int event){ show = !show; return 1; } + else if(Fl::test_shortcut(FL_Left)){ + ManualPlay(1,-1); + return 1; + } + else if(Fl::test_shortcut(FL_Right)){ + ManualPlay(1,1); + return 1; + } + else if(Fl::test_shortcut(FL_Up)){ + ManualPlay(0,-1); + return 1; + } + else if(Fl::test_shortcut(FL_Down)){ + ManualPlay(0,1); + return 1; + } return 0; diff --git a/Makefile b/Makefile index e015367ee9457e5d409cde406ce987133e451bc7..6dd7d136d378fba5facebcb6d147e5472693241c 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ -# $Id: Makefile,v 1.189 2002-02-13 09:16:06 stainier Exp $ +# $Id: Makefile,v 1.190 2002-02-20 16:41:20 geuzaine Exp $ GMSH_MAJOR_VERSION = 1 GMSH_MINOR_VERSION = 34 -GMSH_PATCH_VERSION = 0 +GMSH_PATCH_VERSION = 1 MAKE = make CXX = c++