Changeset 2861 for trunk

Timestamp:

Mar 16, 2012, 1:23:13 AM (13 years ago)

Author:

ldelgass

Message:

Continue bringing load_volume_stream and load_volume_stream2 in line in
anticipation of merging into a single function.

File:

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

trunk/packages/vizservers/nanovis/dxReader.cpp

@@ -65 +65 @@
     do {
         fin.getline(line, sizeof(line) - 1);
+        if (fin.fail()) {
+            result.error("error in data stream");
+            return NULL;
+        }
         for (start = line; *start == ' ' || *start == '\t'; start++)
             ;  // skip leading blanks
@@ -81 +85 @@
                     fin.getline(line,sizeof(line)-1);
                     if (sscanf(line, "%lg %lg %lg", &xx, &yy, &zz) == 3) {
-                        xymesh.addNode( Rappture::Node2D(xx,yy) );
+                        xymesh.addNode(Rappture::Node2D(xx,yy));
                     }
                 }
@@ -176 +180 @@
 
     TRACE("found nx=%d ny=%d, nz=%d, x0=%f, y0=%f, z0=%f\n", 
-           nx, ny, nz, x0, y0, z0);
+          nx, ny, nz, x0, y0, z0);
+
     // read data points
     if (fin.eof() && (npts > 0)) {
@@ -199 +204 @@
         while (!fin.eof() && nread < npts) {
             fin.getline(line,sizeof(line)-1);
+            if (fin.fail()) {
+                result.addError("error reading data points");
+                return NULL;
+            }
             int n = sscanf(line, "%lg %lg %lg %lg %lg %lg",
                            &dval[0], &dval[1], &dval[2], &dval[3], &dval[4], &dval[5]);
@@ -265 +274 @@
         delete [] data;
     } else {
-        Rappture::Mesh1D zgrid(z0, z0+nz*dz, nz);
+        Rappture::Mesh1D zgrid(z0, z0 + nz*dz, nz);
         Rappture::FieldPrism3D field(xymesh, zgrid);
 
@@ -371 +380 @@
     if (volPtr) {
         volPtr->location(Vector3(dx0, dy0, dz0));
-        TRACE("volume moved\n");
+        TRACE("Set volume location to %g %g %g\n", dx0, dy0, dz0);
     }
     return volPtr;
@@ -378 +387 @@
 /**
  * \brief Load a 3D volume from a dx-format file
+ *
+ * In DX format:
+ *  rank 0 means scalars,
+ *  rank 1 means vectors,
+ *  rank 2 means matrices,
+ *  rank 3 means tensors
+ * 
+ *  For rank 1, shape is a single number equal to the number of dimensions.
+ *  e.g. rank 1 shape 3 means a 3-component vector field
  */
 Volume *
@@ -417 +435 @@
                     fin.getline(line,sizeof(line)-1);
                     if (sscanf(line, "%lg %lg %lg", &xx, &yy, &zz) == 3) {
-                        xymesh.addNode( Rappture::Node2D(xx,yy) );
+                        xymesh.addNode(Rappture::Node2D(xx,yy));
                     }
                 }
@@ -469 +487 @@
             } else if (sscanf(start, "delta %lg %lg %lg", &ddx, &ddy, &ddz) == 3) {
                 // found one of the delta lines
+                int count = 0;
                 if (ddx != 0.0) {
                     dx = ddx;
-                } else if (ddy != 0.0) {
+                    count++;
+                }
+                if (ddy != 0.0) {
                     dy = ddy;
-                } else if (ddz != 0.0) {
+                    count++;
+                }
+                if (ddz != 0.0) {
                     dz = ddz;
+                    count++;
+                }
+                if (count > 1) {
+                    result.addError("don't know how to handle multiple non-zero"
+                                    " delta values");
+                    return NULL;
                 }
             } else if (sscanf(start, "object %d class array type %s rank 0 items %d data follows",
@@ -484 +513 @@
                 } else if (!isrect && (npts != nxy*nz)) {
                     result.addError("inconsistent data: expected %d points"
-                                    " but found %d points", nx*ny*nz, npts);
+                                    " but found %d points", nxy*nz, npts);
                     return NULL;
                 }
@@ -499 +528 @@
         }
     }
+
+    TRACE("found nx=%d ny=%d, nz=%d, x0=%f, y0=%f, z0=%f\n", 
+          nx, ny, nz, x0, y0, z0);
+
     // read data points
     if (fin.eof()) {
@@ -506 +539 @@
     Volume *volPtr = NULL;
     if (isrect) {
-        Rappture::Mesh1D xgrid(x0, x0+nx*dx, nx);
-        Rappture::Mesh1D ygrid(y0, y0+ny*dy, ny);
-        Rappture::Mesh1D zgrid(z0, z0+nz*dz, nz);
+        Rappture::Mesh1D xgrid(x0, x0 + nx*dx, nx);
+        Rappture::Mesh1D ygrid(y0, y0 + ny*dy, ny);
+        Rappture::Mesh1D zgrid(z0, z0 + nz*dz, nz);
         Rappture::FieldRect3D field(xgrid, ygrid, zgrid);
 
@@ -542 +575 @@
         if (nread != nx*ny*nz) {
             result.addError("inconsistent data: expected %d points"
-                            " but found %d points", nx*ny*nz, npts);
+                            " but found %d points", nx*ny*nz, nread);
             return NULL;
         }
@@ -564 +597 @@
 #endif
 
-//#define _SOBEL
+//#define _SOBEL_
 #ifdef _SOBEL_
         const int step = 1;
@@ -613 +646 @@
                     double v = field.value(xval,yval,zval);
 
+                    if (v != 0.0 && v < nzero_min) {
+                        nzero_min = v;
+                    }
+
                     // scale all values [0-1], -1 => out of bounds
                     v = (isnan(v)) ? -1.0 : (v - vmin)/dv;
@@ -642 +679 @@
         volPtr->update_pending = true;
         // TBD..
-        // POINTSET
-        /*
-          PointSet *pset = new PointSet();
-          pset->initialize(volPtr, (float*)data);
-          pset->setVisible(true);
-          NanoVis::pointSet.push_back(pset);
-          updateColor(pset);
-          volPtr->pointsetIndex = NanoVis::pointSet.size() - 1;
-        */
-
+#if 0 && defined(USE_POINTSET_RENDERER)
+        PointSet *pset = new PointSet();
+        pset->initialize(volPtr, (float*)data);
+        pset->setVisible(true);
+        NanoVis::pointSet.push_back(pset);
+        updateColor(pset);
+        volPtr->pointsetIndex = NanoVis::pointSet.size() - 1;
+#endif
         delete [] data;
     } else {
-        Rappture::Mesh1D zgrid(z0, z0+nz*dz, nz);
+        Rappture::Mesh1D zgrid(z0, z0 + nz*dz, nz);
         Rappture::FieldPrism3D field(xymesh, zgrid);
 
@@ -682 +717 @@
         if (nread != nxy*nz) {
             result.addError("inconsistent data: expected %d points"
-                            " but found %d points", nx*ny*nz, npts);
+                            " but found %d points", nxy*nz, nread);
             return NULL;
         }
@@ -736 +771 @@
         }
 
-        // Compute the gradient of this data.  BE CAREFUL: center
-        // calculation on each node to avoid skew in either direction.
-        ngen = 0;
-        for (int iz=0; iz < nz; iz++) {
-            for (int iy=0; iy < ny; iy++) {
-                for (int ix=0; ix < nx; ix++) {
-                    // gradient in x-direction
-                    double valm1 = (ix == 0) ? 0.0 : data[ngen-1];
-                    double valp1 = (ix == nx-1) ? 0.0 : data[ngen+1];
-                    if (valm1 < 0 || valp1 < 0) {
-                        data[ngen+1] = 0.0;
-                    } else {
-                        data[ngen+1] = valp1-valm1; // assume dx=1
-                        //data[ngen+1] = ((valp1-valm1) + 1.0) * 0.5; // assume dx=1 (ISO)
-                    }
-                    
-                    // gradient in y-direction
-                    valm1 = (iy == 0) ? 0.0 : data[ngen-4*nx];
-                    valp1 = (iy == ny-1) ? 0.0 : data[ngen+4*nx];
-                    if (valm1 < 0 || valp1 < 0) {
-                        data[ngen+2] = 0.0;
-                    } else {
-                        data[ngen+2] = valp1-valm1; // assume dy=1
-                        //data[ngen+2] = ((valp1-valm1) + 1.0) * 0.5; // assume dy=1 (ISO)
-                    }
-                    
-                    // gradient in z-direction
-                    valm1 = (iz == 0) ? 0.0 : data[ngen-4*nx*ny];
-                    valp1 = (iz == nz-1) ? 0.0 : data[ngen+4*nx*ny];
-                    if (valm1 < 0 || valp1 < 0) {
-                        data[ngen+3] = 0.0;
-                    } else {
-                        data[ngen+3] = valp1-valm1; // assume dz=1
-                        //data[ngen+3] = ((valp1-valm1) + 1.0) * 0.5; // assume dz=1 (ISO)
-                    }
-                    
-                    ngen += 4;
-                }
-            }
-        }
+        computeSimpleGradient(data, nx, ny, nz);
 
         volPtr = NanoVis::load_volume(tag, nx, ny, nz, 4, data,
@@ -789 +785 @@
         volPtr->update_pending = true;
         // TBD..
-        // POINTSET
-        /*
-          PointSet *pset = new PointSet();
-          pset->initialize(volPtr, (float*)data);
-          pset->setVisible(true);
-          NanoVis::pointSet.push_back(pset);
-          updateColor(pset);
-          volPtr->pointsetIndex = NanoVis::pointSet.size() - 1;
-        */
-
+#if 0 && defined(USE_POINTSET_RENDERER)
+        PointSet *pset = new PointSet();
+        pset->initialize(volPtr, (float*)data);
+        pset->setVisible(true);
+        NanoVis::pointSet.push_back(pset);
+        updateColor(pset);
+        volPtr->pointsetIndex = NanoVis::pointSet.size() - 1;
+#endif
         delete [] data;
     }
@@ -810 +804 @@
     if (volPtr) {
         volPtr->location(Vector3(dx0, dy0, dz0));
+        TRACE("Set volume location to %g %g %g\n", dx0, dy0, dz0);
     }
     return volPtr;