| -rw-r--r-- | src/controller/actions/set_ortho.c | 13 | ||||
| -rw-r--r-- | src/controller/actions/zoom.c | 70 | ||||
| -rw-r--r-- | src/controller/actions/zoom.h | 4 | ||||
| -rw-r--r-- | src/controller/callbacks/display.c | 6 | ||||
| -rw-r--r-- | src/controller/callbacks/keyboard.c | 7 | ||||
| -rw-r--r-- | src/controller/callbacks/mouse.c | 49 | ||||
| -rw-r--r-- | src/controller/callbacks/mouse_wheel.c | 66 | ||||
| -rw-r--r-- | src/controller/callbacks/reshape.c | 68 | ||||
| -rw-r--r-- | src/model/geometry/density_legend_geometry.c | 18 | ||||
| -rw-r--r-- | src/model/state/zoom_info.h | 1 | ||||
| -rw-r--r-- | src/model/state/zoom_info_init.c | 6 |
11 files changed, 197 insertions, 111 deletions
diff --git a/src/controller/actions/set_ortho.c b/src/controller/actions/set_ortho.c index 4309c76..ce66f60 100644 --- a/src/controller/actions/set_ortho.c +++ b/src/controller/actions/set_ortho.c | |||
| @@ -7,15 +7,10 @@ | |||
| 7 | void | 7 | void |
| 8 | set_ortho (void) | 8 | set_ortho (void) |
| 9 | { | 9 | { |
| 10 | if (S.zoom.active) | 10 | gluOrtho2D (S.ortho.min_x, |
| 11 | { | 11 | S.ortho.max_x, |
| 12 | gluOrtho2D (S.zoom.coords[0], | 12 | S.ortho.min_y, |
| 13 | S.zoom.coords[1], S.zoom.coords[2], S.zoom.coords[3]); | 13 | S.ortho.max_y); |
| 14 | } | ||
| 15 | else | ||
| 16 | { | ||
| 17 | gluOrtho2D (S.ortho.min_x, S.ortho.max_x, S.ortho.min_y, S.ortho.max_y); | ||
| 18 | } | ||
| 19 | 14 | ||
| 20 | return; | 15 | return; |
| 21 | } | 16 | } |
