| -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/exp004reshape.c b/src/controller/exp004reshape.c index 4d46223..82f134d 100644 --- a/src/controller/exp004reshape.c +++ b/src/controller/exp004reshape.c | |||
| @@ -19,26 +19,18 @@ exp004reshape (int w, int h) | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | if (w <= h) | 21 | if (w <= h) |
| 22 | { | 22 | { |
| 23 | S.ortho.min_x = | 23 | S.ortho.min_x = S.ortho_min; |
| 24 | S.ortho_min; | 24 | S.ortho.max_x = S.ortho_max; |
| 25 | S.ortho.max_x = | 25 | S.ortho.min_y = S.ortho_min * (GLfloat) h / (GLfloat) w; |
| 26 | S.ortho_max; | 26 | S.ortho.max_y = S.ortho_max * (GLfloat) h / (GLfloat) w; |
| 27 | S.ortho.min_y = | ||
| 28 | S.ortho_min * (GLfloat) h / (GLfloat) w; | ||
| 29 | S.ortho.max_y = | ||
| 30 | S.ortho_max * (GLfloat) h / (GLfloat) w; | ||
| 31 | } | 27 | } |
| 32 | else | 28 | else |
| 33 | { | 29 | { |
| 34 | S.ortho.min_x = | 30 | S.ortho.min_x = S.ortho_min * (GLfloat) w / (GLfloat) h; |
| 35 | S.ortho_min * (GLfloat) w / (GLfloat) h; | 31 | S.ortho.max_x = S.ortho_max * (GLfloat) w / (GLfloat) h; |
| 36 | S.ortho.max_x = | 32 | S.ortho.min_y = S.ortho_min; |
| 37 | S.ortho_max * (GLfloat) w / (GLfloat) h; | 33 | S.ortho.max_y = S.ortho_max; |
| 38 | S.ortho.min_y = | ||
| 39 | S.ortho_min; | ||
| 40 | S.ortho.max_y = | ||
| 41 | S.ortho_max; | ||
| 42 | } | 34 | } |
| 43 | 35 | ||
| 44 | set_ortho (); | 36 | set_ortho (); |
