| -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 @@ #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 DEFAULT_COLOR_A (1.0 / 7.0) #define SELECT_COLOR_R 0.00 #define SELECT_COLOR_G 0.00 #define SELECT_COLOR_B 0.00 #define SELECT_COLOR_A 0.75 -typedef enum { PROTEIN_GEOMETRY } LISTS; +typedef enum +{ PROTEIN_GEOMETRY, DENSITY_LEGEND_GEOMETRY } LISTS; +#define NUM_LISTS 2 /* * Maintain state of the model. @@ -61,10 +63,10 @@ typedef struct */ struct { - float min_x; - float max_x; - float min_y; - float max_y; + double min_x; + double max_x; + double min_y; + double max_y; } ortho; /* |
