| -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 @@ #define BASE_VERTICES 0 #define BASE_COLORS 1 -#define DEFAULT_COLOR_R 0.5 -#define DEFAULT_COLOR_G 0.5 -#define DEFAULT_COLOR_B 0.5 -#define DEFAULT_COLOR_A 0.5 +#define CLEAR_COLOR 1.0, 1.0, 1.0, 1.0 +#define DRAW_COLOR 0.0, 0.0, 0.0 -#define SELECT_COLOR_R 1.0 -#define SELECT_COLOR_G 1.0 -#define SELECT_COLOR_B 1.0 -#define SELECT_COLOR_A 0.8 +#define DEFAULT_COLOR_R 0.00 +#define DEFAULT_COLOR_G 0.00 +#define DEFAULT_COLOR_B 0.01 +#define DEFAULT_COLOR_A 0.25 + +#define SELECT_COLOR_R 0.00 +#define SELECT_COLOR_G 0.00 +#define SELECT_COLOR_B 0.00 +#define SELECT_COLOR_A 0.75 /* * Maintain state of the model. @@ -29,7 +32,8 @@ typedef struct /* * Track the bounding box of the points. */ - struct { + struct + { float min_x; float max_x; float min_y; @@ -49,7 +53,8 @@ typedef struct /* * Orthographic coordinates after aspect preserving scaling. */ - struct { + struct + { float min_x; float max_x; float min_y; @@ -59,7 +64,8 @@ typedef struct /* * Viewport size. */ - struct { + struct + { int w; int h; } viewport; @@ -87,7 +93,7 @@ typedef struct SELECTION_INFO selection; ZOOM_INFO zoom; - + } EXP004STATE; #endif // EXP004STATE_H |
