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/model/exp004base.sqc b/src/model/exp004base.sqc
index 2742138..a9c94cf 100644
--- a/src/model/exp004base.sqc
+++ b/src/model/exp004base.sqc
@@ -23,17 +23,16 @@ exp004base (void)
23 * This implementation can be improved by mapping the video memory23 * This implementation can be improved by mapping the video memory
24 * directly rather than loading into system memory and then copying24 * directly rather than loading into system memory and then copying
25 * into video memory.25 * into video memory.
26 */26 */
2727
28 /*28 /*
29 * db2dclgn -d exp004 -t coordinates29 * db2dclgn -d exp004 -t coordinates
30 */30 */
31 EXEC SQL BEGIN DECLARE SECTION;31 EXEC SQL BEGIN DECLARE SECTION;
32 EXEC SQL INCLUDE 'model/coordinates.h'; 32 EXEC SQL INCLUDE 'model/coordinates.h';
33 EXEC SQL END DECLARE SECTION;33 EXEC SQL END DECLARE SECTION;
3434
35 EXEC SQL DECLARE c2 CURSOR FOR35 EXEC SQL DECLARE c2 CURSOR FOR SELECT *FROM coordinates;
36 SELECT * FROM coordinates;
3736
38 EXEC SQL OPEN c2;37 EXEC SQL OPEN c2;
3938
@@ -45,14 +44,12 @@ exp004base (void)
45 S.bb.min_y = 0.0;44 S.bb.min_y = 0.0;
46 S.bb.max_y = 0.0;45 S.bb.max_y = 0.0;
4746
48 EXEC SQL FETCH c2 INTO :coordinates;47 EXEC SQL FETCH c2 INTO:coordinates;
49 while (sqlca.sqlcode != 100)48 while (sqlca.sqlcode != 100)
50 {49 {
51 int i = coordinates.coord_id - 1;50 int i = coordinates.coord_id - 1;
5251
53 strncpy(S.gi_data[i], 52 strncpy (S.gi_data[i], coordinates.gi.data, sizeof (S.gi_data[i]));
54 coordinates.gi.data,
55 sizeof (S.gi_data[i]));
5653
57 S.base_vertices_data[i][0] = coordinates.x;54 S.base_vertices_data[i][0] = coordinates.x;
58 S.base_vertices_data[i][1] = coordinates.y;55 S.base_vertices_data[i][1] = coordinates.y;
@@ -76,7 +73,7 @@ exp004base (void)
76 S.base_colors_data[i][2] = DEFAULT_COLOR_B;73 S.base_colors_data[i][2] = DEFAULT_COLOR_B;
77 S.base_colors_data[i][3] = DEFAULT_COLOR_A;74 S.base_colors_data[i][3] = DEFAULT_COLOR_A;
7875
79 EXEC SQL FETCH c2 INTO :coordinates;76 EXEC SQL FETCH c2 INTO:coordinates;
80 }77 }
8178
82 EXEC SQL CLOSE c2;79 EXEC SQL CLOSE c2;
@@ -106,8 +103,7 @@ exp004base (void)
106103
107 // Invert the y coordinate to match up with the LGL Java viewer.104 // Invert the y coordinate to match up with the LGL Java viewer.
108 for (int i = 0; i < ROWS; i++)105 for (int i = 0; i < ROWS; i++)
109 S.base_vertices_data[i][1] = 106 S.base_vertices_data[i][1] = S.ortho_max - S.base_vertices_data[i][1];
110 S.ortho_max - S.base_vertices_data[i][1];
111107
112 // Move the origin (0,0) to the center of the data.108 // Move the origin (0,0) to the center of the data.
113 S.ortho_min = 0.0;109 S.ortho_min = 0.0;
@@ -115,9 +111,8 @@ exp004base (void)
115111
116 for (int i = 0; i < ROWS; i++)112 for (int i = 0; i < ROWS; i++)
117 {113 {
118 S.base_vertices_data[i][0] = 114 S.base_vertices_data[i][0] =
119 S.base_vertices_data[i][0] -115 S.base_vertices_data[i][0] - (0.5 * (S.bb.max_x - S.bb.min_x));
120 (0.5 * (S.bb.max_x - S.bb.min_x));
121116
122 if (S.ortho_min > S.base_vertices_data[i][0])117 if (S.ortho_min > S.base_vertices_data[i][0])
123 S.ortho_min = S.base_vertices_data[i][0];118 S.ortho_min = S.base_vertices_data[i][0];
@@ -125,9 +120,8 @@ exp004base (void)
125 if (S.ortho_max < S.base_vertices_data[i][0])120 if (S.ortho_max < S.base_vertices_data[i][0])
126 S.ortho_max = S.base_vertices_data[i][0];121 S.ortho_max = S.base_vertices_data[i][0];
127122
128 S.base_vertices_data[i][1] = 123 S.base_vertices_data[i][1] =
129 S.base_vertices_data[i][1] -124 S.base_vertices_data[i][1] - (0.5 * (S.bb.max_y - S.bb.min_y));
130 (0.5 * (S.bb.max_y - S.bb.min_y));
131125
132 if (S.ortho_min > S.base_vertices_data[i][1])126 if (S.ortho_min > S.base_vertices_data[i][1])
133 S.ortho_min = S.base_vertices_data[i][1];127 S.ortho_min = S.base_vertices_data[i][1];
@@ -140,7 +134,7 @@ exp004base (void)
140134
141 glBindBuffer (GL_ARRAY_BUFFER, S.buffers[BASE_VERTICES]);135 glBindBuffer (GL_ARRAY_BUFFER, S.buffers[BASE_VERTICES]);
142 glVertexPointer (2, GL_FLOAT, 0, 0);136 glVertexPointer (2, GL_FLOAT, 0, 0);
143 glBufferData (GL_ARRAY_BUFFER, 137 glBufferData (GL_ARRAY_BUFFER,
144 sizeof (S.base_vertices_data), S.base_vertices_data,138 sizeof (S.base_vertices_data), S.base_vertices_data,
145 GL_STATIC_DRAW);139 GL_STATIC_DRAW);
146140

Valid XHTML 1.0 Strict

Copyright © 2009 Don Pellegrino All Rights Reserved.