36 files changed, 332 insertions, 176 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 3bb95ee..1ccb4f8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,17 +1,18 @@ bin_PROGRAMS = exp004viz exp004viz_SOURCES = \ - controller/clear_selection.c \ - controller/exp004display.c \ - controller/exp004mouse.c \ - controller/exp004processhits.c \ - controller/exp004reshape.c \ - controller/keyboard.c \ - controller/mousewheel.c \ - controller/performzoom.c \ - controller/selection_from_db.c \ - controller/selsave.c \ - controller/set_ortho.c \ + controller/actions/clear_selection.c \ + controller/actions/pan.c \ + controller/actions/process_hits.c \ + controller/actions/sel_save.c \ + controller/actions/selection_from_db.c \ + controller/actions/set_ortho.c \ + controller/actions/zoom.c \ + controller/callbacks/display.c \ + controller/callbacks/keyboard.c \ + controller/callbacks/mouse.c \ + controller/callbacks/mouse_wheel.c \ + controller/callbacks/reshape.c \ db/dbconnect.c \ exp004viz.c \ model/exp004base.c \ @@ -32,24 +33,26 @@ exp004viz_SOURCES = \ exp004viz_LDADD = ${GLUT_LIBS} noinst_HEADERS = \ - controller/clear_selection.h \ - controller/exp004display.h \ - controller/exp004mouse.h \ - controller/exp004processhits.h \ - controller/exp004reshape.h \ - controller/keyboard.h \ - controller/mousewheel.h \ - controller/performzoom.h \ - controller/selection_from_db.h \ - controller/selsave.h \ - controller/set_ortho.h \ + controller/actions/clear_selection.h \ + controller/actions/pan.h \ + controller/actions/process_hits.h \ + controller/actions/sel_save.h \ + controller/actions/selection_from_db.h \ + controller/actions/set_ortho.h \ + controller/actions/vis_sel_set.h \ + controller/actions/zoom.h \ + controller/callbacks/display.h \ + controller/callbacks/keyboard.h \ + controller/callbacks/mouse.h \ + controller/callbacks/mouse_wheel.h \ + controller/callbacks/reshape.h \ db/dbconnect.h \ model/exp004base.h \ model/exp004state.h \ model/geometry/density_legend_geometry.h \ + model/geometry/map_geometry.h \ model/geometry/protein_geometry.h \ model/geometry/protein_selected_geometry.h \ - model/geometry/map_geometry.h \ model/selection_info.h \ model/selection_info_init.h \ model/selection_purposes.h \ @@ -79,8 +82,8 @@ AM_CFLAGS = -Wall -ggdb -std=gnu99 -pipe -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_S db2 PRECOMPILE $<; CLEANFILES = \ - controller/clear_selection.c \ - controller/selection_from_db.c \ - controller/selsave.c \ + controller/actions/clear_selection.c \ + controller/actions/selection_from_db.c \ + controller/actions/sel_save.c \ db/dbconnect.c \ model/exp004base.c |
