| -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/util/pick_convert.c b/src/util/pick_convert.c index baafcfb..eca819a 100644 --- a/src/util/pick_convert.c +++ b/src/util/pick_convert.c @@ -5,8 +5,9 @@ */ #define N 3.0 -void pick_convert (int select_x, int select_y, int x, int y, - double *c_x, double *c_y, double *w, double *h) +void +pick_convert (int select_x, int select_y, int x, int y, + double *c_x, double *c_y, double *w, double *h) { /* * Calculate X and the width. @@ -14,7 +15,7 @@ void pick_convert (int select_x, int select_y, int x, int y, if (x > select_x) { *c_x = (x - select_x) / 2.0 + select_x; - *w = x - select_x; + *w = x - select_x; } else if (x < select_x) { |
