-rw-r--r-- | r/connect.R | 2 | ||||
-rw-r--r-- | src/Makefile.am | 3 | ||||
-rw-r--r-- | src/controller/exp004reshape.c | 11 | ||||
-rw-r--r-- | src/model/density_legend_geometry.c | 81 | ||||
-rw-r--r-- | src/model/density_legend_geometry.h | 9 | ||||
-rw-r--r-- | src/model/display_list_index.h | 6 | ||||
-rw-r--r-- | src/model/exp004state.h | 14 | ||||
-rw-r--r-- | src/util/check_error.c | 6 | ||||
-rw-r--r-- | src/view/exp004geometry.c | 7 | ||||
-rw-r--r-- | src/view/exp004init.c | 8 | ||||
-rw-r--r-- | src/view/exp004view.c | 4 |
11 files changed, 124 insertions, 27 deletions
diff --git a/src/model/exp004state.h b/src/model/exp004state.h index 1af8a5b..5a9761a 100644 --- a/src/model/exp004state.h +++ b/src/model/exp004state.h | |||
@@ -16,14 +16,16 @@ | |||
16 | #define DEFAULT_COLOR_R 0.00 | 16 | #define DEFAULT_COLOR_R 0.00 |
17 | #define DEFAULT_COLOR_G 0.00 | 17 | #define DEFAULT_COLOR_G 0.00 |
18 | #define DEFAULT_COLOR_B 0.01 | 18 | #define DEFAULT_COLOR_B 0.01 |
19 | #define DEFAULT_COLOR_A 0.25 | 19 | #define DEFAULT_COLOR_A (1.0 / 7.0) |
20 | 20 | ||
21 | #define SELECT_COLOR_R 0.00 | 21 | #define SELECT_COLOR_R 0.00 |
22 | #define SELECT_COLOR_G 0.00 | 22 | #define SELECT_COLOR_G 0.00 |
23 | #define SELECT_COLOR_B 0.00 | 23 | #define SELECT_COLOR_B 0.00 |
24 | #define SELECT_COLOR_A 0.75 | 24 | #define SELECT_COLOR_A 0.75 |
25 | 25 | ||
26 | typedef enum { PROTEIN_GEOMETRY } LISTS; | 26 | typedef enum |
27 | { PROTEIN_GEOMETRY, DENSITY_LEGEND_GEOMETRY } LISTS; | ||
28 | #define NUM_LISTS 2 | ||
27 | 29 | ||
28 | /* | 30 | /* |
29 | * Maintain state of the model. | 31 | * Maintain state of the model. |
@@ -61,10 +63,10 @@ typedef struct | |||
61 | */ | 63 | */ |
62 | struct | 64 | struct |
63 | { | 65 | { |
64 | float min_x; | 66 | double min_x; |
65 | float max_x; | 67 | double max_x; |
66 | float min_y; | 68 | double min_y; |
67 | float max_y; | 69 | double max_y; |
68 | } ortho; | 70 | } ortho; |
69 | 71 | ||
70 | /* | 72 | /* |