Changeset 2953 for trunk/packages/vizservers/nanovis/dxReader.cpp

Timestamp:

Apr 9, 2012 10:18:09 AM (12 years ago)

Author:

ldelgass

Message:

Remove unused global origin, make default transfer function a bit more
sensible (used to have full opacity at 0). Fix HeightMap? dtor to use delete[]
instead of free() on array allocated with new[]. Document data response in
protocol.

File:

• trunk/packages/vizservers/nanovis/dxReader.cpp (modified) (8 diffs)

trunk/packages/vizservers/nanovis/dxReader.cpp

@@ -213 +213 @@
     }
 
-    TRACE("found nx=%d ny=%d nz=%d\ndx=%f dy=%f dz=%f\nx0=%f y0=%f z0=%f\n", 
-          nx, ny, nz, dx, dy, dz, x0, y0, z0);
+    TRACE("found nx=%d ny=%d nxy=%d nz=%d\ndx=%f dy=%f dz=%f\nx0=%f y0=%f z0=%f\n", 
+          nx, ny, nxy, nz, dx, dy, dz, x0, y0, z0);
 
     lx = (nx - 1) * dx;
@@ -296 +296 @@
 #if ISO_TEST
         double dv = vmax - vmin;
-        int count = nx*ny*nz;
-        int ngen = 0;
-        double v;
         if (dv == 0.0) {
             dv = 1.0;
         }
 
-        for (int i = 0; i < count; ++i) {
-            v = data[ngen];
+        int ngen = 0;
+        const int step = 4;
+        for (int i = 0; i < nx*ny*nz; ++i) {
+            double v = data[ngen];
             // scale all values [0-1], -1 => out of bounds
             v = (isnan(v)) ? -1.0 : (v - vmin)/dv;
 
             data[ngen] = v;
-            ngen += 4;
+            ngen += step;
         }
 
@@ -429 +428 @@
         }
 
-        // figure out a good mesh spacing
-        int nsample = 30;
         x0 = field.rangeMin(Rappture::xaxis);
         lx = field.rangeMax(Rappture::xaxis) - field.rangeMin(Rappture::xaxis);
@@ -437 +434 @@
         z0 = field.rangeMin(Rappture::zaxis);
         lz = field.rangeMax(Rappture::zaxis) - field.rangeMin(Rappture::zaxis);
+
+        // figure out a good mesh spacing
+        int nsample = 30;
         double dmin = pow((lx*ly*lz)/((nsample-1)*(nsample-1)*(nsample-1)), 0.333);
 
@@ -453 +453 @@
         dz = lz /(double)(nz - 1);
 
-        data = new float[4*nx*ny*nz];
-
         vmin = field.valueMin();
         vmax = field.valueMax();
@@ -463 +461 @@
         }
 
+        data = new float[4*nx*ny*nz];
         // generate the uniformly sampled data that we need for a volume
         int ngen = 0;
@@ -490 +489 @@
 
     TRACE("nx = %i ny = %i nz = %i\n", nx, ny, nz);
+    TRACE("x0 = %lg y0 = %lg z0 = %lg\n", x0, y0, z0);
     TRACE("lx = %lg ly = %lg lz = %lg\n", lx, ly, lz);
     TRACE("dx = %lg dy = %lg dz = %lg\n", dx, dy, dz);
-    TRACE("dataMin = %lg\tdataMax = %lg\tnzero_min = %lg\n",
+    TRACE("dataMin = %lg dataMax = %lg nzero_min = %lg\n",
           vmin, vmax, nzero_min);
 
@@ -502 +502 @@
     volPtr->updatePending = true;
 
-        // TBD..
+    // TBD..
 #if 0 && defined(USE_POINTSET_RENDERER)
     PointSet *pset = new PointSet();