-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/controller/selection_from_db.sqc b/src/controller/selection_from_db.sqc index 8a49510..8c12c79 100644 --- a/src/controller/selection_from_db.sqc +++ b/src/controller/selection_from_db.sqc @@ -22,18 +22,17 @@ selection_from_db (void) EXEC SQL END DECLARE SECTION; EXEC SQL DECLARE c3 CURSOR FOR - SELECT * FROM vis_sel_set - ORDER BY title, id DESC; + SELECT * FROM vis_sel_set ORDER BY title, id DESC; EXEC SQL OPEN c3; check_error (__FILE__, __LINE__); - + /* * This loop currently assumes only one set in the table and does * not use the title assigned to that set. This should be improved * to allow the user to manage multiple sets by name. */ - EXEC SQL FETCH c3 INTO :vis_sel_set; + EXEC SQL FETCH c3 INTO:vis_sel_set; while (sqlca.sqlcode != 100) { int i = vis_sel_set.id - 1; @@ -44,7 +43,7 @@ selection_from_db (void) S.base_colors_data[i][2] = vis_sel_set.b; S.base_colors_data[i][3] = 0.6; - EXEC SQL FETCH c3 INTO :vis_sel_set; + EXEC SQL FETCH c3 INTO:vis_sel_set; } EXEC SQL CLOSE c3; |