Changeset 5312 for nanovis/branches/1.2

Timestamp:

Apr 24, 2015 7:26:39 PM (8 years ago)

Author:

ldelgass

Message:

merge r5311 from trunk

Location:

nanovis/branches/1.2

Files:

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

nanovis/branches/1.2/dxReader.cpp

@@ -62 +62 @@
 
     Rappture::MeshTri2D xymesh;
-    int dummy, nx, ny, nz, nxy, npts;
+    int dummy, nx, ny, nz, nxy, npts, naxes;
     // origin
     double x0, y0, z0;
@@ -77 +77 @@
     dx = dy = dz = 0.0;
     x0 = y0 = z0 = 0.0; // May not have an origin line.
-    nx = ny = nz = npts = nxy = 0;
+    nx = ny = nz = npts = nxy = naxes = 0;
     while (!fin.eof()) {
         fin.getline(line, sizeof(line) - 1);
@@ -185 +185 @@
                     return NULL;
                 }
+                naxes++;
             } else if (sscanf(start, "object %d class array type %s rank 0 items %d data follows",
                               &dummy, type, &npts) == 3) {
@@ -209 +210 @@
     }
 
-    TRACE("found nx=%d ny=%d nxy=%d nz=%d\ndx=%g dy=%g dz=%g\nx0=%g y0=%g z0=%g", 
-          nx, ny, nxy, nz, dx, dy, dz, x0, y0, z0);
+    TRACE("found nx=%d ny=%d nxy=%d nz=%d\nnaxes=%d dx=%g dy=%g dz=%g\nx0=%g y0=%g z0=%g", 
+          nx, ny, nxy, nz, naxes, dx, dy, dz, x0, y0, z0);
+
+    if (npts > 1 && naxes == 0) {
+        ERROR("Invalid DX file: no deltas found");
+        return NULL;
+    }
+    if (npts > 1 && ((dx == dy) && (dx == dz) && (dx == 0.0))) {
+        ERROR("Invalid deltas in DX file: %g %g %g", dx, dy, dz);
+        return NULL;
+    }
 
     lx = (nx - 1) * dx;