- Timestamp:
- Mar 6, 2008, 4:05:12 PM (16 years ago)
- Location:
- trunk/vizservers/nanovis
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/vizservers/nanovis/Command.cpp
r927 r928 1 1 2 2 /* 3 3 * ---------------------------------------------------------------------- … … 520 520 } 521 521 } else { 522 for ( unsignedint n = 0; n < objc; n++) {522 for (int n = 0; n < objc; n++) { 523 523 Volume *volPtr; 524 524 … … 553 553 c = tolower((unsigned char)string[0]); 554 554 if (c == 'x') { 555 *indexPtr = 0;555 *indexPtr = NanoVis::X; 556 556 return TCL_OK; 557 557 } else if (c == 'y') { 558 *indexPtr = 1;558 *indexPtr = NanoVis::Y; 559 559 return TCL_OK; 560 560 } else if (c == 'z') { 561 *indexPtr = 2;561 *indexPtr = NanoVis::Z; 562 562 return TCL_OK; 563 563 } -
trunk/vizservers/nanovis/dxReader.cpp
r927 r928 237 237 volPtr = NanoVis::load_volume(index, nx, ny, nz, 3, data, vmin, vmax, 238 238 nzero_min); 239 volPtr->set_limits( 0, x0, x0 + (nx * ddx));240 volPtr->set_limits( 1, y0, y0 + (ny * ddy));241 volPtr->set_limits( 2, z0, z0 + (nz * ddz));239 volPtr->set_limits(NanoVis::X, x0, x0 + (nx * ddx)); 240 volPtr->set_limits(NanoVis::Y, y0, y0 + (ny * ddy)); 241 volPtr->set_limits(NanoVis::Z, z0, z0 + (nz * ddz)); 242 242 delete [] data; 243 243 } else { … … 621 621 volPtr = NanoVis::load_volume(index, nx, ny, nz, 4, data, 622 622 field.valueMin(), field.valueMax(), nzero_min); 623 volPtr->set_limits( 0, field.rangeMin(Rappture::xaxis),623 volPtr->set_limits(NanoVis::X, field.rangeMin(Rappture::xaxis), 624 624 field.rangeMax(Rappture::xaxis)); 625 volPtr->set_limits( 1, field.rangeMin(Rappture::yaxis),625 volPtr->set_limits(NanoVis::Y, field.rangeMin(Rappture::yaxis), 626 626 field.rangeMax(Rappture::yaxis)); 627 volPtr->set_limits( 2, field.rangeMin(Rappture::zaxis),627 volPtr->set_limits(NanoVis::Z, field.rangeMin(Rappture::zaxis), 628 628 field.rangeMax(Rappture::zaxis)); 629 629 delete [] data; … … 917 917 volPtr = NanoVis::load_volume(index, nx, ny, nz, 4, data, 918 918 field.valueMin(), field.valueMax(), nzero_min); 919 volPtr->set_limits( 0, field.rangeMin(Rappture::xaxis),919 volPtr->set_limits(NanoVis::X, field.rangeMin(Rappture::xaxis), 920 920 field.rangeMax(Rappture::xaxis)); 921 volPtr->set_limits( 1, field.rangeMin(Rappture::yaxis),921 volPtr->set_limits(NanoVis::Y, field.rangeMin(Rappture::yaxis), 922 922 field.rangeMax(Rappture::yaxis)); 923 volPtr->set_limits( 2, field.rangeMin(Rappture::zaxis),923 volPtr->set_limits(NanoVis::Z, field.rangeMin(Rappture::zaxis), 924 924 field.rangeMax(Rappture::zaxis)); 925 925 // TBD.. … … 1063 1063 volPtr = NanoVis::load_volume(index, nx, ny, nz, 4, data, 1064 1064 field.valueMin(), field.valueMax(), nzero_min); 1065 volPtr->set_limits( 0, field.rangeMin(Rappture::xaxis),1065 volPtr->set_limits(NanoVis::X, field.rangeMin(Rappture::xaxis), 1066 1066 field.rangeMax(Rappture::xaxis)); 1067 volPtr->set_limits( 1, field.rangeMin(Rappture::yaxis),1067 volPtr->set_limits(NanoVis::Y, field.rangeMin(Rappture::yaxis), 1068 1068 field.rangeMax(Rappture::yaxis)); 1069 volPtr->set_limits( 2, field.rangeMin(Rappture::zaxis),1069 volPtr->set_limits(NanoVis::Z, field.rangeMin(Rappture::zaxis), 1070 1070 field.rangeMax(Rappture::zaxis)); 1071 1071
Note: See TracChangeset
for help on using the changeset viewer.