27 files changed, 179 insertions, 549 deletions
diff --git a/src/view/init.c b/src/view/init.c index e32a75e..1c06c7e 100644 --- a/src/view/init.c +++ b/src/view/init.c | |||
@@ -1,12 +1,13 @@ | |||
1 | #include "init.h" | 1 | #include "../model/data/base.h" |
2 | #include "state0.h" | ||
3 | #include "../model/geometry/density_legend_geometry.h" | 2 | #include "../model/geometry/density_legend_geometry.h" |
4 | #include "../model/geometry/map_geometry.h" | 3 | #include "../model/geometry/map_geometry.h" |
5 | #include "../model/geometry/protein_geometry.h" | 4 | #include "../model/geometry/protein_geometry.h" |
6 | #include "../model/geometry/protein_selected_geometry.h" | 5 | #include "../model/geometry/protein_selected_geometry.h" |
7 | #include "../model/selection_info_init.h" | 6 | #include "../model/state/pan_info_init.h" |
8 | #include "../model/zoom_info_init.h" | 7 | #include "../model/state/selection_info_init.h" |
9 | #include "../model/base.h" | 8 | #include "../model/state/zoom_info_init.h" |
9 | #include "init.h" | ||
10 | #include "state0.h" | ||
10 | #include <GL/glut.h> | 11 | #include <GL/glut.h> |
11 | 12 | ||
12 | #define S state0 | 13 | #define S state0 |
@@ -23,6 +24,7 @@ init (void) | |||
23 | S.base_colors_data = NULL; | 24 | S.base_colors_data = NULL; |
24 | selection_info_init (&S.selection); | 25 | selection_info_init (&S.selection); |
25 | zoom_info_init (&S.zoom); | 26 | zoom_info_init (&S.zoom); |
27 | pan_info_init (&S.pan); | ||
26 | S.legend = true; | 28 | S.legend = true; |
27 | 29 | ||
28 | /* | 30 | /* |