-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/model/exp004state.h b/src/model/exp004state.h index 11e9ebd..d151966 100644 --- a/src/model/exp004state.h +++ b/src/model/exp004state.h | |||
@@ -10,15 +10,18 @@ | |||
10 | #define BASE_VERTICES 0 | 10 | #define BASE_VERTICES 0 |
11 | #define BASE_COLORS 1 | 11 | #define BASE_COLORS 1 |
12 | 12 | ||
13 | #define DEFAULT_COLOR_R 0.5 | 13 | #define CLEAR_COLOR 1.0, 1.0, 1.0, 1.0 |
14 | #define DEFAULT_COLOR_G 0.5 | 14 | #define DRAW_COLOR 0.0, 0.0, 0.0 |
15 | #define DEFAULT_COLOR_B 0.5 | ||
16 | #define DEFAULT_COLOR_A 0.5 | ||
17 | 15 | ||
18 | #define SELECT_COLOR_R 1.0 | 16 | #define DEFAULT_COLOR_R 0.00 |
19 | #define SELECT_COLOR_G 1.0 | 17 | #define DEFAULT_COLOR_G 0.00 |
20 | #define SELECT_COLOR_B 1.0 | 18 | #define DEFAULT_COLOR_B 0.01 |
21 | #define SELECT_COLOR_A 0.8 | 19 | #define DEFAULT_COLOR_A 0.25 |
20 | |||
21 | #define SELECT_COLOR_R 0.00 | ||
22 | #define SELECT_COLOR_G 0.00 | ||
23 | #define SELECT_COLOR_B 0.00 | ||
24 | #define SELECT_COLOR_A 0.75 | ||
22 | 25 | ||
23 | /* | 26 | /* |
24 | * Maintain state of the model. | 27 | * Maintain state of the model. |
@@ -29,7 +32,8 @@ typedef struct | |||
29 | /* | 32 | /* |
30 | * Track the bounding box of the points. | 33 | * Track the bounding box of the points. |
31 | */ | 34 | */ |
32 | struct { | 35 | struct |
36 | { | ||
33 | float min_x; | 37 | float min_x; |
34 | float max_x; | 38 | float max_x; |
35 | float min_y; | 39 | float min_y; |
@@ -49,7 +53,8 @@ typedef struct | |||
49 | /* | 53 | /* |
50 | * Orthographic coordinates after aspect preserving scaling. | 54 | * Orthographic coordinates after aspect preserving scaling. |
51 | */ | 55 | */ |
52 | struct { | 56 | struct |
57 | { | ||
53 | float min_x; | 58 | float min_x; |
54 | float max_x; | 59 | float max_x; |
55 | float min_y; | 60 | float min_y; |
@@ -59,7 +64,8 @@ typedef struct | |||
59 | /* | 64 | /* |
60 | * Viewport size. | 65 | * Viewport size. |
61 | */ | 66 | */ |
62 | struct { | 67 | struct |
68 | { | ||
63 | int w; | 69 | int w; |
64 | int h; | 70 | int h; |
65 | } viewport; | 71 | } viewport; |
@@ -87,7 +93,7 @@ typedef struct | |||
87 | SELECTION_INFO selection; | 93 | SELECTION_INFO selection; |
88 | 94 | ||
89 | ZOOM_INFO zoom; | 95 | ZOOM_INFO zoom; |
90 | 96 | ||
91 | } EXP004STATE; | 97 | } EXP004STATE; |
92 | 98 | ||
93 | #endif // EXP004STATE_H | 99 | #endif // EXP004STATE_H |