Changeset 4612 for nanovis/branches/1.1/dxReader.cpp

Timestamp:

Aug 2, 2014, 11:06:20 AM (10 years ago)

Author:

ldelgass

Message:

merge r3597 from trunk

Location:

nanovis/branches/1.1

Files:

• . (modified) (1 prop)
• dxReader.cpp (modified) (3 diffs)

nanovis/branches/1.1/dxReader.cpp

@@ -225 +225 @@
         return NULL;
     }
-    Volume *volPtr = NULL;
+    Volume *volume = NULL;
     float *data = NULL;
     double vmin = DBL_MAX;
@@ -481 +481 @@
           vmin, vmax, nzero_min);
 
-    volPtr = NanoVis::loadVolume(tag, nx, ny, nz, 4, data,
+    volume = NanoVis::loadVolume(tag, nx, ny, nz, 4, data,
                                  vmin, vmax, nzero_min);
-    volPtr->xAxis.setRange(x0, x0 + lx);
-    volPtr->yAxis.setRange(y0, y0 + ly);
-    volPtr->zAxis.setRange(z0, z0 + lz);
-    volPtr->updatePending = true;
+    volume->xAxis.setRange(x0, x0 + lx);
+    volume->yAxis.setRange(y0, y0 + ly);
+    volume->zAxis.setRange(z0, z0 + lz);
+    volume->updatePending = true;
 
     // TBD..
 #if 0 && defined(USE_POINTSET_RENDERER)
     PointSet *pset = new PointSet();
-    pset->initialize(volPtr, (float*)data);
+    pset->initialize(volume, (float*)data);
     pset->setVisible(true);
     NanoVis::pointSet.push_back(pset);
     updateColor(pset);
-    volPtr->pointsetIndex = NanoVis::pointSet.size() - 1;
+    volume->pointsetIndex = NanoVis::pointSet.size() - 1;
 #endif
     delete [] data;
@@ -505 +505 @@
     float dy0 = -0.5*ly/lx;
     float dz0 = -0.5*lz/lx;
-    if (volPtr) {
-        volPtr->location(vrmath::Vector3f(dx0, dy0, dz0));
+    if (volume) {
+        volume->location(vrmath::Vector3f(dx0, dy0, dz0));
         TRACE("Set volume location to %g %g %g", dx0, dy0, dz0);
     }
-    return volPtr;
+    return volume;
 }