summaryrefslogtreecommitdiffstats
Unidiff
-rw-r--r--Makefile.am10
-rw-r--r--r/connect.R16
-rw-r--r--src/controller/exp004mouse.c51
-rw-r--r--src/controller/exp004processhits.c16
-rw-r--r--src/controller/exp004reshape.c26
-rw-r--r--src/controller/keyboard.c2
-rw-r--r--src/controller/selection_from_db.sqc9
-rw-r--r--src/controller/selsave.sqc4
-rw-r--r--src/controller/set_ortho.c11
-rw-r--r--src/controller/vis_sel_set.h3
-rw-r--r--src/model/coordinates.h3
-rw-r--r--src/model/exp004base.sqc30
-rw-r--r--src/model/exp004state.h30
-rw-r--r--src/model/selection_info.h11
-rw-r--r--src/model/selection_info_init.c2
-rw-r--r--src/model/selection_info_init.h2
-rw-r--r--src/model/selection_purposes.h22
-rw-r--r--src/model/zoom_info.h5
-rw-r--r--src/model/zoom_info_init.c2
-rw-r--r--src/model/zoom_info_init.h2
-rw-r--r--src/util/pick_convert.c7
-rw-r--r--src/util/sqlinfoprint.c2
-rw-r--r--src/util/sqlinfoprint.h7
-rw-r--r--src/view/exp004geometry.c6
-rw-r--r--src/view/exp004view.c7
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)
22 EXEC SQL END DECLARE SECTION;22 EXEC SQL END DECLARE SECTION;
2323
24 EXEC SQL DECLARE c3 CURSOR FOR24 EXEC SQL DECLARE c3 CURSOR FOR
25 SELECT * FROM vis_sel_set25 SELECT * FROM vis_sel_set ORDER BY title, id DESC;
26 ORDER BY title, id DESC;
2726
28 EXEC SQL OPEN c3;27 EXEC SQL OPEN c3;
29 check_error (__FILE__, __LINE__);28 check_error (__FILE__, __LINE__);
30 29
31 /*30 /*
32 * This loop currently assumes only one set in the table and does31 * This loop currently assumes only one set in the table and does
33 * not use the title assigned to that set. This should be improved32 * not use the title assigned to that set. This should be improved
34 * to allow the user to manage multiple sets by name.33 * to allow the user to manage multiple sets by name.
35 */34 */
36 EXEC SQL FETCH c3 INTO :vis_sel_set;35 EXEC SQL FETCH c3 INTO:vis_sel_set;
37 while (sqlca.sqlcode != 100)36 while (sqlca.sqlcode != 100)
38 {37 {
39 int i = vis_sel_set.id - 1;38 int i = vis_sel_set.id - 1;
@@ -44,7 +43,7 @@ selection_from_db (void)
44 S.base_colors_data[i][2] = vis_sel_set.b;43 S.base_colors_data[i][2] = vis_sel_set.b;
45 S.base_colors_data[i][3] = 0.6;44 S.base_colors_data[i][3] = 0.6;
4645
47 EXEC SQL FETCH c3 INTO :vis_sel_set;46 EXEC SQL FETCH c3 INTO:vis_sel_set;
48 }47 }
4948
50 EXEC SQL CLOSE c3;49 EXEC SQL CLOSE c3;

Valid XHTML 1.0 Strict

Copyright © 2009 Don Pellegrino All Rights Reserved.