Changeset 5488 for nanovis/branches/1.2/VtkDataSetReader.cpp

Timestamp:

May 11, 2015 2:50:11 AM (9 years ago)

Author:

ldelgass

Message:

Partial (manual) merge of r3935 - vector fields in VTK reader

File:

• nanovis/branches/1.2/VtkDataSetReader.cpp (modified) (3 diffs)

nanovis/branches/1.2/VtkDataSetReader.cpp

@@ -11 +11 @@
 #include <vtkDataSet.h>
 #include <vtkImageData.h>
+#include <vtkPointData.h>
+#include <vtkDataArray.h>
 #include <vtkDataSetReader.h>
 #include <vtkCharArray.h>
@@ -102 +104 @@
     memset(data, 0, npts * 4);
 
+    bool isVectorData = (resampledDataSet->GetPointData()->GetVectors() != NULL);
+
     int ix = 0;
     int iy = 0;
     int iz = 0;
+    vtkDataArray *mask = resampledDataSet->GetPointData()->GetArray("vtkValidPointMask");
     for (int p = 0; p < npts; p++) {
         int nindex = p * 4;
-        double val = resampledDataSet->GetScalarComponentAsDouble(ix, iy, iz, 0);
-        data[nindex] = (float)val;
-        if (val < vmin) {
-            vmin = val;
-        } else if (val > vmax) {
-            vmax = val;
+        double val;
+        int loc[3];
+        loc[0] = ix; loc[1] = iy; loc[2] = iz;
+        vtkIdType idx = resampledDataSet->ComputePointId(loc);
+        bool valid = (mask == NULL) ? true : (mask->GetComponent(idx, 0) != 0.0);
+        if (isVectorData) {
+            double vec[3];
+            resampledDataSet->GetPointData()->GetVectors()->GetTuple(idx, vec);
+            val = sqrt(vec[0]*vec[0] + vec[1]*vec[1] + vec[2]*vec[2]);
+            data[nindex] = (float)val;
+            data[nindex+1] = (float)vec[0];
+            data[nindex+2] = (float)vec[1];
+            data[nindex+3] = (float)vec[2];
+        } else {
+            //val = resampledDataSet->GetScalarComponentAsDouble(ix, iy, iz, 0);
+            val = resampledDataSet->GetPointData()->GetScalars()->GetComponent(idx, 0);
+            data[nindex] = valid ? (float)val : -FLT_MAX;
         }
-        if (val != 0.0 && val < nzero_min) {
-            nzero_min = val;
+        if (valid) {
+            if (val < vmin) {
+                vmin = val;
+            } else if (val > vmax) {
+                vmax = val;
+            }
+            if (val != 0.0 && val < nzero_min) {
+                nzero_min = val;
+            }
         }
 
@@ -127 +150 @@
     }
 
-    // scale all values [0-1], -1 => out of bounds
-    normalizeScalar(data, npts, 4, vmin, vmax);
-    computeSimpleGradient(data, nx, ny, nz,
-                          dx, dy, dz);
+    if (isVectorData) {
+        // Normalize magnitude [0,1] and vector components [0,1]
+        normalizeVector(data, npts, vmin, vmax);
+    } else {
+        // scale all values [0-1], -1 => out of bounds
+        normalizeScalar(data, npts, 4, vmin, vmax);
+        computeSimpleGradient(data, nx, ny, nz,
+                              dx, dy, dz);
+    }
 
+    TRACE("isVectorData: %s", isVectorData ? "yes" : "no");
     TRACE("nx = %i ny = %i nz = %i", nx, ny, nz);
     TRACE("x0 = %lg y0 = %lg z0 = %lg", x0, y0, z0);