Changeset 5542 for nanovis/branches/1.2/Grid.cpp
- Timestamp:
- May 18, 2015 2:47:29 AM (9 years ago)
- Location:
- nanovis/branches/1.2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
nanovis/branches/1.2
- Property svn:mergeinfo changed
/nanovis/trunk merged: 5478,5480
- Property svn:mergeinfo changed
-
nanovis/branches/1.2/Grid.cpp
r4904 r5542 43 43 { 44 44 bboxMin.set(xAxis.min(), yAxis.min(), zAxis.min()); 45 bboxMax.set(xAxis.min() + xAxis.range(), 46 yAxis.min() + yAxis.range(), 47 zAxis.min() + zAxis.range()); 45 bboxMax.set(xAxis.max(), yAxis.max(), zAxis.max()); 48 46 } 49 47 … … 75 73 double paspectZ = zDataRange / xDataRange; 76 74 77 double xscale = xAxis. range() / xDataRange;78 double yscale = yAxis. range() / xDataRange;79 double zscale = zAxis. range() / xDataRange;80 81 double xoffset = (xAxis.min() - xAxis.dataMin()) * xAxis.scale();82 double yoffset = (yAxis.min() - yAxis.dataMin()) * yAxis.scale();83 double zoffset = (zAxis.min() - zAxis.dataMin()) * zAxis.scale();75 double xscale = xAxis.length() / xDataRange; 76 double yscale = yAxis.length() / xDataRange; 77 double zscale = zAxis.length() / xDataRange; 78 79 double xoffset = (xAxis.min() - xAxis.dataMin()) / xAxis.length(); 80 double yoffset = (yAxis.min() - yAxis.dataMin()) / yAxis.length(); 81 double zoffset = (zAxis.min() - zAxis.dataMin()) / zAxis.length(); 84 82 85 83 float xTickLen = TICK_LENGTH; … … 93 91 float zTitleOfs = TITLE_OFFSET; 94 92 95 TRACE("Axis ranges: %g %g %g", xAxis.range(), yAxis.range(), zAxis.range()); 96 TRACE("Axis scales: %g %g %g", xAxis.scale(), yAxis.scale(), zAxis.scale()); 93 TRACE("Axis lengths: %g %g %g", 94 xAxis.length(), 95 yAxis.length(), 96 zAxis.length()); 97 97 TRACE("Axis min/max: %g,%g %g,%g %g,%g", 98 98 xAxis.min(), xAxis.max(), … … 131 131 glBegin(GL_LINES); 132 132 { 133 bool result; 134 TickIter iter; 135 136 for (result = xAxis.firstMajor(iter); result; result = iter.next()) { 137 float x; 138 x = xAxis.map(iter.getValue()); 133 Ticks::ConstIterator itr; 134 for (itr = xAxis.firstMajor(); itr != xAxis.lastMajor(); ++itr) { 135 float x = (float)xAxis.map(*itr); 139 136 glVertex3f(x, 0.0f, 0.0f); 140 137 glVertex3f(x, 1.0f, 0.0f); … … 142 139 glVertex3f(x, 0.0f, 1.0f + zTickLen); 143 140 } 144 for (result = yAxis.firstMajor(iter); result; result = iter.next()) { 145 float y; 146 y = yAxis.map(iter.getValue()); 141 for (itr = yAxis.firstMajor(); itr != yAxis.lastMajor(); ++itr) { 142 float y = (float)yAxis.map(*itr); 147 143 glVertex3f(0.0f, y, 0.0f); 148 144 glVertex3f(1.0f + xTickLen, y, 0.0f); … … 150 146 glVertex3f(0.0f, y, 1.0f); 151 147 } 152 for (result = zAxis.firstMajor(iter); result; result = iter.next()) { 153 float z; 154 z = zAxis.map(iter.getValue()); 148 for (itr = zAxis.firstMajor(); itr != zAxis.lastMajor(); ++itr) { 149 float z = (float)zAxis.map(*itr); 155 150 glVertex3f(0.0f, 0.0f, z); 156 151 glVertex3f(0.0f, 1.0f, z); … … 167 162 glBegin(GL_LINES); 168 163 { 169 bool result; 170 TickIter iter; 171 172 for (result = xAxis.firstMinor(iter); result; result = iter.next()) { 173 float x; 174 x = xAxis.map(iter.getValue()); 164 Ticks::ConstIterator itr; 165 for (itr = xAxis.firstMinor(); itr != xAxis.lastMinor(); ++itr) { 166 float x = (float)xAxis.map(*itr); 175 167 glVertex3f(x, 0.0f, 0.0f); 176 168 glVertex3f(x, 1.0f, 0.0f); … … 178 170 glVertex3f(x, 0.0f, 1.0f); 179 171 } 180 for (result = yAxis.firstMinor(iter); result; result = iter.next()) { 181 float y; 182 y = yAxis.map(iter.getValue()); 172 for (itr = yAxis.firstMinor(); itr != yAxis.lastMinor(); ++itr) { 173 float y = (float)yAxis.map(*itr); 183 174 glVertex3f(0.0f, y, 0.0f); 184 175 glVertex3f(1.0f, y, 0.0f); … … 186 177 glVertex3f(0.0f, y, 1.0f); 187 178 } 188 for (result = zAxis.firstMinor(iter); result; result = iter.next()) { 189 float z; 190 z = zAxis.map(iter.getValue()); 179 for (itr = zAxis.firstMinor(); itr != zAxis.lastMinor(); ++itr) { 180 float z = (float)zAxis.map(*itr); 191 181 glVertex3f(0.0f, 0.0f, z); 192 182 glVertex3f(0.0f, 1.0f, z); … … 201 191 int viewport[4]; 202 192 double wx, wy, wz; 203 bool result;204 TickIter iter;205 193 206 194 glGetDoublev(GL_MODELVIEW_MATRIX, mv); … … 219 207 glLoadIdentity(); 220 208 glTranslatef((int) wx, viewport[3] - (int) wy, 0); 221 const char * name = xAxis.name();222 if ( name == NULL) {223 name = "???";224 } 225 _font->draw( name);209 const char *title = xAxis.title(); 210 if (title == NULL) { 211 title = "???"; 212 } 213 _font->draw(title); 226 214 } 227 215 … … 232 220 glLoadIdentity(); 233 221 glTranslatef((int) wx, viewport[3] - (int)wy, 0); 234 const char * name = yAxis.name();235 if ( name == NULL) {236 name = "???";237 } 238 _font->draw( name);222 const char *title = yAxis.title(); 223 if (title == NULL) { 224 title = "???"; 225 } 226 _font->draw(title); 239 227 } 240 228 … … 245 233 glLoadIdentity(); 246 234 glTranslatef((int) wx, (int) viewport[3] - (int)wy, 0.0f); 247 const char * name = zAxis.name();248 if ( name == NULL) {249 name = "???";250 } 251 _font->draw( name);235 const char *title = zAxis.title(); 236 if (title == NULL) { 237 title = "???"; 238 } 239 _font->draw(title); 252 240 } 253 241 … … 255 243 _majorColor.a); 256 244 257 for (result = xAxis.firstMajor(iter); result; result = iter.next()) {258 float x;259 x = xAxis.map(iter.getValue());245 Ticks::ConstIterator itr; 246 for (itr = xAxis.firstMajor(); itr != xAxis.lastMajor(); ++itr) { 247 float x = (float)xAxis.map(*itr); 260 248 if (gluProject(x, 0.0f, 1.0 + zLabelOfs, 261 249 mv, prjm, viewport, … … 265 253 glLoadIdentity(); 266 254 glTranslatef((int) wx, (int) viewport[3] - (int)wy, 0.0f); 267 sprintf(buff, "%.*g", NUMDIGITS, iter.getValue());255 sprintf(buff, "%.*g", NUMDIGITS, *itr); 268 256 _font->draw(buff); 269 257 } 270 258 } 271 for (result = yAxis.firstMajor(iter); result; result = iter.next()) { 272 float y; 273 y = yAxis.map(iter.getValue()); 259 for (itr = yAxis.firstMajor(); itr != yAxis.lastMajor(); ++itr) { 260 float y = (float)yAxis.map(*itr); 274 261 if (gluProject(1.0 + xLabelOfs, y, 0.0f, 275 262 mv, prjm, viewport, … … 279 266 glLoadIdentity(); 280 267 glTranslatef((int) wx, (int) viewport[3] - (int)wy, 0.0f); 281 sprintf(buff, "%.*g", NUMDIGITS, iter.getValue());268 sprintf(buff, "%.*g", NUMDIGITS, *itr); 282 269 _font->draw(buff); 283 270 } 284 271 } 285 for (result = zAxis.firstMajor(iter); result; result = iter.next()) { 286 float z; 287 z = zAxis.map(iter.getValue()); 272 for (itr = zAxis.firstMajor(); itr != zAxis.lastMajor(); ++itr) { 273 float z = (float)zAxis.map(*itr); 288 274 if (gluProject(1.0 + xLabelOfs, 0.0f, z, 289 275 mv, prjm, viewport, … … 293 279 glLoadIdentity(); 294 280 glTranslatef((int) wx, (int) viewport[3] - (int)wy, 0.0f); 295 sprintf(buff, "%.*g", NUMDIGITS, iter.getValue());281 sprintf(buff, "%.*g", NUMDIGITS, *itr); 296 282 _font->draw(buff); 297 283 }
Note: See TracChangeset
for help on using the changeset viewer.