Changeset 4904 for nanovis/branches/1.1/VtkReader.cpp

Timestamp:

Dec 22, 2014, 4:18:59 AM (10 years ago)

Author:

ldelgass

Message:

Merge serveral changes from trunk. Does not include threading, world space
changes, etc.

File:

• nanovis/branches/1.1/VtkReader.cpp (modified) (16 diffs)

nanovis/branches/1.1/VtkReader.cpp

@@ -8 +8 @@
 #include <float.h>
 
-#include <RpOutcome.h>
 #include <RpField1D.h>
 #include <RpFieldRect3D.h>
@@ -16 +15 @@
 #include "ReaderCommon.h"
 
+#include "config.h"
 #include "nanovis.h"
 #include "VtkReader.h"
@@ -183 +183 @@
 
 Volume *
-nv::load_vtk_volume_stream(Rappture::Outcome& result, const char *tag, std::iostream& fin)
+nv::load_vtk_volume_stream(const char *tag, std::iostream& fin)
 {
     TRACE("Enter tag:%s", tag);
@@ -207 +207 @@
         fin.getline(line, sizeof(line) - 1);
         if (fin.fail()) {
-            result.error("Error in data stream");
+            ERROR("Error in data stream");
             return NULL;
         }
@@ -222 +222 @@
                     isRect = 1;
                 } else {
-                    result.addError("Unsupported DataSet type '%s'", str);
+                    ERROR("Unsupported DataSet type '%s'", str);
                     return NULL;
                 }
             } else if (sscanf(start, "DIMENSIONS %d %d %d", &nx, &ny, &nz) == 3) {
                 if (nx <= 0 || ny <= 0 || nz <= 0) {
-                    result.error("Found non-positive dimensions");
+                    ERROR("Found non-positive dimensions");
                     return NULL;
                 }
@@ -235 +235 @@
             } else if (sscanf(start, "SPACING %lg %lg %lg", &dx, &dy, &dz) == 3) {
                 if ((nx > 1 && dx == 0.0) || (ny > 1 && dy == 0.0) || (nz > 1 && dz == 0.0)) {
-                    result.error("Found zero spacing for dimension");
+                    ERROR("Found zero spacing for dimension");
                     return NULL;
                 }
@@ -241 +241 @@
             } else if (sscanf(start, "POINT_DATA %d", &npts) == 1) {
                 if (npts < 1 || npts != nx * ny * nz) {
-                    result.addError("Error in data stream: unexpected number of point data: %d", npts);
+                    ERROR("Error in data stream: unexpected number of point data: %d", npts);
                     return NULL;
                 }
                 if (isBinary < 0 || fin.eof()) {
                     // Should know if ASCII or BINARY by now
-                    result.error("Error in data stream");
+                    ERROR("Error in data stream");
                     return NULL;
                 }
                 fin.getline(line, sizeof(line) - 1);
                 if (fin.fail()) {
-                    result.error("Error in data stream");
+                    ERROR("Error in data stream");
                     return NULL;
                 }
@@ -257 +257 @@
                     ;  // skip leading blanks
                 if (sscanf(start, "SCALARS %s %s", str, type) != 2) {
-                    result.error("Error in data stream");
+                    ERROR("Error in data stream");
                     return NULL;
                 }
@@ -267 +267 @@
                     ftype = UCHAR;
                     if (!isBinary) {
-                        result.addError("unsigned char only supported in binary VTK files");
+                        ERROR("unsigned char only supported in binary VTK files");
                         return NULL;
                     }
@@ -279 +279 @@
                     ftype = UINT;
                 } else {
-                    result.addError("Unsupported scalar type: '%s'", type);
+                    ERROR("Unsupported scalar type: '%s'", type);
                     return NULL;
                 }
                 if (fin.eof()) {
-                    result.error("Error in data stream");
+                    ERROR("Error in data stream");
                     return NULL;
                 }
                 fin.getline(line, sizeof(line) - 1);
                 if (fin.fail()) {
-                    result.error("Error in data stream");
+                    ERROR("Error in data stream");
                     return NULL;
                 }
@@ -296 +296 @@
                     // skip lookup table, but don't read ahead
                     if (fin.eof()) {
-                        result.error("Error in data stream");
+                        ERROR("Error in data stream");
                         return NULL;
                     }
                 } else {
                     // Lookup table line is required
-                    result.error("Missing LOOKUP_TABLE");
+                    ERROR("Missing LOOKUP_TABLE");
                     return NULL;
                 }
@@ -310 +310 @@
                     if (fin.fail()) {
                         deleteFieldData(fieldData, ftype);
-                        result.error("Error in data stream");
+                        ERROR("Error in data stream");
                         return NULL;
                     }
@@ -320 +320 @@
                         if (fin.fail()) {
                             deleteFieldData(fieldData, ftype);
-                            result.error("Error in data stream");
+                            ERROR("Error in data stream");
                             return NULL;
                         }
@@ -333 +333 @@
     if (isRect < 0 || numRead != npts || npts < 1) {
         deleteFieldData(fieldData, ftype);
-        result.error("Error in data stream");
+        ERROR("Error in data stream");
         return NULL;
     }
@@ -468 +468 @@
     } else {
         deleteFieldData(fieldData, ftype);
-        result.error("Unsupported DataSet");
+        ERROR("Unsupported DataSet");
         return NULL;
     }
@@ -495 +495 @@
     float dz0 = -0.5*lz/lx;
     if (volume) {
-        volume->location(vrmath::Vector3f(dx0, dy0, dz0));
-        TRACE("Set volume location to %g %g %g", dx0, dy0, dz0);
+        volume->setPosition(vrmath::Vector3f(dx0, dy0, dz0));
+        TRACE("Set volume position to %g %g %g", dx0, dy0, dz0);
     }
     return volume;