Mercurial > octave-nkf
changeset 10797:d479134f59de
fltk_backend.cc: use enum for plot_window::gui_mode instead of int
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 19 Jul 2010 02:59:03 -0400 |
| parents | eaf7c8ab3b0c |
| children | 8b135864b86b |
| files | src/ChangeLog src/DLD-FUNCTIONS/fltk_backend.cc |
| diffstat | 2 files changed, 14 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Jul 18 22:22:45 2010 -0700 +++ b/src/ChangeLog Mon Jul 19 02:59:03 2010 -0400 @@ -1,3 +1,8 @@ +2010-07-19 John W. Eaton <jwe@octave.org> + + * DLD-FUNCTIONS/fltk_backend.cc (plot_window::gui_mode): + Use enum instead of int. Change all uses. + 2010-07-18 Kai Habel <kai.habel@gmx.de> * DLD-FUNCTIONS/fltk_backend.cc: Add mode for mouse rotation.
--- a/src/DLD-FUNCTIONS/fltk_backend.cc Sun Jul 18 22:22:45 2010 -0700 +++ b/src/DLD-FUNCTIONS/fltk_backend.cc Mon Jul 19 02:59:03 2010 -0400 @@ -302,7 +302,7 @@ set_name (); resizable (canvas); size_range (4*status_h, 2*status_h); - gui_mode = 1; + gui_mode = pan_zoom; } ~plot_window (void) @@ -348,8 +348,7 @@ int shift; // Interactive Mode - // 1...pan/zoom, 2...rotate/zoom - int gui_mode; + enum { pan_zoom, rotate_zoom } gui_mode; // Figure properties. figure::properties& fp; @@ -380,10 +379,10 @@ toggle_grid (); if (widg == panzoom) - gui_mode = 1; + gui_mode = pan_zoom; if (widg == rotate) - gui_mode = 2; + gui_mode = rotate_zoom; if (widg == help) fl_message ("%s", help_text); @@ -636,12 +635,12 @@ case 'p': case 'P': - gui_mode = 1; + gui_mode = pan_zoom; break; case 'r': case 'R': - gui_mode = 2; + gui_mode = rotate_zoom; break; } } @@ -694,7 +693,7 @@ { if (ax0 && ax0.isa ("axes")) { - if (gui_mode == 1) + if (gui_mode == pan_zoom) pixel2status (ax0, px0, py0, Fl::event_x (), Fl::event_y ()); else view2status (ax0); @@ -706,9 +705,9 @@ pixel2pos (ax0, px0, py0, x0, y0); pixel2pos (ax0, Fl::event_x (), Fl::event_y (), x1, y1); - if (gui_mode == 1) + if (gui_mode == pan_zoom) ap.translate_view (x0 - x1, y0 - y1); - else if (gui_mode == 2) + else if (gui_mode == rotate_zoom) { double daz, del; daz = (Fl::event_x () - px0) / pos(2) * 360;