- Timestamp:
- Mar 21, 2008, 1:58:50 PM (17 years ago)
- Location:
- trunk/vizservers/nanovis
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/vizservers/nanovis/dxReader.cpp
r958 r959 55 55 56 56 dx = dy = dz = 0.0; // Suppress compiler warning. 57 x0 = y0 = z0 = 0.0; // May not have an origin line. 57 58 while (!fin.eof()) { 58 59 fin.getline(line, sizeof(line) - 1); … … 195 196 nzero_min); 196 197 197 volPtr->xAxis.SetRange(x0, x0 + (nx * d dx));198 volPtr->yAxis.SetRange(y0, y0 + (ny * d dy));199 volPtr->zAxis.SetRange(z0, z0 + (nz * d dz));200 volPtr->wAxis.SetRange(y0, y0 + (ny * d dy));198 volPtr->xAxis.SetRange(x0, x0 + (nx * dx)); 199 volPtr->yAxis.SetRange(y0, y0 + (ny * dy)); 200 volPtr->zAxis.SetRange(z0, z0 + (nz * dz)); 201 volPtr->wAxis.SetRange(y0, y0 + (ny * dy)); 201 202 volPtr->update_pending = true; 202 203 delete [] data; … … 221 222 int isrect = 1; 222 223 dx = dy = dz = 0.0; // Suppress compiler warning. 224 x0 = y0 = z0 = 0.0; // May not have an origin line. 223 225 do { 224 226 fin.getline(line,sizeof(line)-1); … … 411 413 volPtr = NanoVis::load_volume(index, nx, ny, nz, 4, data, 412 414 vmin, vmax, nzero_min); 413 #ifdef notdef 414 fprintf(stderr, "x nx=%d ddx=%g min=%g max=%g\n", nx, ddx, 415 x0, x0 + (nx * ddx)); 416 fflush(stderr); 417 volPtr->xAxis.SetRange(x0, x0 + (nx * ddx)); 418 volPtr->yAxis.SetRange(y0, y0 + (ny * ddy)); 419 volPtr->zAxis.SetRange(z0, z0 + (nz * ddz)); 420 #else 421 volPtr->xAxis.SetRange(-20.0, 108.0); 422 volPtr->yAxis.SetRange(0.001, 102.2); 423 volPtr->zAxis.SetRange(-21, 19); 424 #endif 425 volPtr->update_pending = true; 415 volPtr->xAxis.SetRange(x0, x0 + (nx * dx)); 416 volPtr->yAxis.SetRange(y0, y0 + (ny * dy)); 417 volPtr->zAxis.SetRange(z0, z0 + (nz * dz)); 418 volPtr->wAxis.SetRange(z0, z0 + (nz * dz)); 419 volPtr->update_pending = true; 426 420 delete [] data; 427 421 … … 560 554 volPtr = NanoVis::load_volume(index, nx, ny, nz, 4, data, 561 555 field.valueMin(), field.valueMax(), nzero_min); 562 #ifdef notdef563 fprintf(stderr, "x min=%g max=%g\n",564 field.rangeMin(Rappture::xaxis),565 field.rangeMax(Rappture::xaxis));566 fflush(stderr);567 #endif568 556 volPtr->xAxis.SetRange(field.rangeMin(Rappture::xaxis), 569 557 field.rangeMax(Rappture::xaxis)); … … 571 559 field.rangeMax(Rappture::yaxis)); 572 560 volPtr->zAxis.SetRange(field.rangeMin(Rappture::zaxis), 561 field.rangeMax(Rappture::zaxis)); 562 volPtr->wAxis.SetRange(field.rangeMin(Rappture::zaxis), 573 563 field.rangeMax(Rappture::zaxis)); 574 564 volPtr->update_pending = true; … … 603 593 604 594 dx = dy = dz = 0.0; // Suppress compiler warning. 595 x0 = y0 = z0 = 0.0; // May not have an origin line. 605 596 while (!fin.eof()) { 606 597 fin.getline(line, sizeof(line) - 1); … … 810 801 volPtr->zAxis.SetRange(field.rangeMin(Rappture::zaxis), 811 802 field.rangeMax(Rappture::zaxis)); 803 volPtr->wAxis.SetRange(field.rangeMin(Rappture::zaxis), 804 field.rangeMax(Rappture::zaxis)); 812 805 volPtr->update_pending = true; 813 806 // TBD.. … … 957 950 volPtr->zAxis.SetRange(field.rangeMin(Rappture::zaxis), 958 951 field.rangeMax(Rappture::zaxis)); 952 volPtr->wAxis.SetRange(field.rangeMin(Rappture::zaxis), 953 field.rangeMax(Rappture::zaxis)); 959 954 volPtr->update_pending = true; 960 955 // TBD.. -
trunk/vizservers/nanovis/dxReader2.cpp
r958 r959 89 89 volPtr = NanoVis::load_volume(index, nx, ny, nz, 4, data, 90 90 dxObj.dataMin(), dxObj.dataMax(), dxObj.nzero_min()); 91 #ifdef notdef 92 volPtr->SetRange(AxisRange::X, x0, x0 + (nx * ddx)); 93 volPtr->SetRange(AxisRange::Y, y0, y0 + (ny * ddy)); 94 volPtr->SetRange(AxisRange::Z, z0, z0 + (nz * ddz)); 95 #endif 91 const float *origin = dxObj.origin(); 92 const float *max = dxObj.max(); 96 93 94 volPtr->xAxis.SetRange(origin[0], max[0]); 95 volPtr->yAxis.SetRange(origin[1], max[1]); 96 volPtr->zAxis.SetRange(origin[2], max[2]); 97 volPtr->wAxis.SetRange(origin[2], max[2]); 97 98 volPtr->update_pending = true; 99 98 100 delete [] data; 99 101
Note: See TracChangeset
for help on using the changeset viewer.