-rw-r--r-- | Makefile.am | 10 | ||||
-rw-r--r-- | r/connect.R | 16 | ||||
-rw-r--r-- | src/controller/exp004mouse.c | 51 | ||||
-rw-r--r-- | src/controller/exp004processhits.c | 16 | ||||
-rw-r--r-- | src/controller/exp004reshape.c | 26 | ||||
-rw-r--r-- | src/controller/keyboard.c | 2 | ||||
-rw-r--r-- | src/controller/selection_from_db.sqc | 9 | ||||
-rw-r--r-- | src/controller/selsave.sqc | 4 | ||||
-rw-r--r-- | src/controller/set_ortho.c | 11 | ||||
-rw-r--r-- | src/controller/vis_sel_set.h | 3 | ||||
-rw-r--r-- | src/model/coordinates.h | 3 | ||||
-rw-r--r-- | src/model/exp004base.sqc | 30 | ||||
-rw-r--r-- | src/model/exp004state.h | 30 | ||||
-rw-r--r-- | src/model/selection_info.h | 11 | ||||
-rw-r--r-- | src/model/selection_info_init.c | 2 | ||||
-rw-r--r-- | src/model/selection_info_init.h | 2 | ||||
-rw-r--r-- | src/model/selection_purposes.h | 22 | ||||
-rw-r--r-- | src/model/zoom_info.h | 5 | ||||
-rw-r--r-- | src/model/zoom_info_init.c | 2 | ||||
-rw-r--r-- | src/model/zoom_info_init.h | 2 | ||||
-rw-r--r-- | src/util/pick_convert.c | 7 | ||||
-rw-r--r-- | src/util/sqlinfoprint.c | 2 | ||||
-rw-r--r-- | src/util/sqlinfoprint.h | 7 | ||||
-rw-r--r-- | src/view/exp004geometry.c | 6 | ||||
-rw-r--r-- | src/view/exp004view.c | 7 |
25 files changed, 140 insertions, 146 deletions
diff --git a/src/controller/set_ortho.c b/src/controller/set_ortho.c index 75af6a6..6478d21 100644 --- a/src/controller/set_ortho.c +++ b/src/controller/set_ortho.c | |||
@@ -10,17 +10,12 @@ set_ortho (void) | |||
10 | if (S.zoom.active) | 10 | if (S.zoom.active) |
11 | { | 11 | { |
12 | gluOrtho2D (S.zoom.coords[0], | 12 | gluOrtho2D (S.zoom.coords[0], |
13 | S.zoom.coords[1], | 13 | S.zoom.coords[1], S.zoom.coords[2], S.zoom.coords[3]); |
14 | S.zoom.coords[2], | ||
15 | S.zoom.coords[3]); | ||
16 | } | 14 | } |
17 | else | 15 | else |
18 | { | 16 | { |
19 | gluOrtho2D (S.ortho.min_x, | 17 | gluOrtho2D (S.ortho.min_x, S.ortho.max_x, S.ortho.min_y, S.ortho.max_y); |
20 | S.ortho.max_x, | 18 | } |
21 | S.ortho.min_y, | ||
22 | S.ortho.max_y); | ||
23 | } | ||
24 | 19 | ||
25 | return; | 20 | return; |
26 | } | 21 | } |