| -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/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) * This implementation can be improved by mapping the video memory * directly rather than loading into system memory and then copying * into video memory. - */ + */ /* * db2dclgn -d exp004 -t coordinates */ EXEC SQL BEGIN DECLARE SECTION; - EXEC SQL INCLUDE 'model/coordinates.h'; + EXEC SQL INCLUDE 'model/coordinates.h'; EXEC SQL END DECLARE SECTION; - EXEC SQL DECLARE c2 CURSOR FOR - SELECT * FROM coordinates; + EXEC SQL DECLARE c2 CURSOR FOR SELECT *FROM coordinates; EXEC SQL OPEN c2; @@ -45,14 +44,12 @@ exp004base (void) S.bb.min_y = 0.0; S.bb.max_y = 0.0; - EXEC SQL FETCH c2 INTO :coordinates; + EXEC SQL FETCH c2 INTO:coordinates; while (sqlca.sqlcode != 100) { int i = coordinates.coord_id - 1; - strncpy(S.gi_data[i], - coordinates.gi.data, - sizeof (S.gi_data[i])); + strncpy (S.gi_data[i], coordinates.gi.data, sizeof (S.gi_data[i])); S.base_vertices_data[i][0] = coordinates.x; S.base_vertices_data[i][1] = coordinates.y; @@ -76,7 +73,7 @@ exp004base (void) S.base_colors_data[i][2] = DEFAULT_COLOR_B; S.base_colors_data[i][3] = DEFAULT_COLOR_A; - EXEC SQL FETCH c2 INTO :coordinates; + EXEC SQL FETCH c2 INTO:coordinates; } EXEC SQL CLOSE c2; @@ -106,8 +103,7 @@ exp004base (void) // Invert the y coordinate to match up with the LGL Java viewer. for (int i = 0; i < ROWS; i++) - S.base_vertices_data[i][1] = - S.ortho_max - S.base_vertices_data[i][1]; + S.base_vertices_data[i][1] = S.ortho_max - S.base_vertices_data[i][1]; // Move the origin (0,0) to the center of the data. S.ortho_min = 0.0; @@ -115,9 +111,8 @@ exp004base (void) for (int i = 0; i < ROWS; i++) { - S.base_vertices_data[i][0] = - S.base_vertices_data[i][0] - - (0.5 * (S.bb.max_x - S.bb.min_x)); + S.base_vertices_data[i][0] = + S.base_vertices_data[i][0] - (0.5 * (S.bb.max_x - S.bb.min_x)); if (S.ortho_min > S.base_vertices_data[i][0]) S.ortho_min = S.base_vertices_data[i][0]; @@ -125,9 +120,8 @@ exp004base (void) if (S.ortho_max < S.base_vertices_data[i][0]) S.ortho_max = S.base_vertices_data[i][0]; - S.base_vertices_data[i][1] = - S.base_vertices_data[i][1] - - (0.5 * (S.bb.max_y - S.bb.min_y)); + S.base_vertices_data[i][1] = + S.base_vertices_data[i][1] - (0.5 * (S.bb.max_y - S.bb.min_y)); if (S.ortho_min > S.base_vertices_data[i][1]) S.ortho_min = S.base_vertices_data[i][1]; @@ -140,7 +134,7 @@ exp004base (void) glBindBuffer (GL_ARRAY_BUFFER, S.buffers[BASE_VERTICES]); glVertexPointer (2, GL_FLOAT, 0, 0); - glBufferData (GL_ARRAY_BUFFER, + glBufferData (GL_ARRAY_BUFFER, sizeof (S.base_vertices_data), S.base_vertices_data, GL_STATIC_DRAW); |
