Changeset 4385 for trunk

Timestamp:

Jun 12, 2014 9:27:21 AM (10 years ago)

Author:

ldelgass

Message:

Fix out-of-bounds points when resampling: don't consider out-of-boudnds points
in field min/max, set to normalized min.

File:

• trunk/packages/vizservers/nanovis/VtkDataSetReader.cpp (modified) (2 diffs)

trunk/packages/vizservers/nanovis/VtkDataSetReader.cpp

@@ -109 +109 @@
     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;
+        int loc[3];
+        loc[0] = ix; loc[1] = iy; loc[2] = iz;
+        vtkIdType idx = resampledDataSet->ComputePointId(loc);
+        bool valid = (mask->GetComponent(idx, 0) != 0.0);
         if (isVectorData) {
             double vec[3];
-            int loc[3];
-            loc[0] = ix; loc[1] = iy; loc[2] = iz;
-            vtkIdType idx = resampledDataSet->ComputePointId(loc);
             resampledDataSet->GetPointData()->GetVectors()->GetTuple(idx, vec);
             val = sqrt(vec[0]*vec[0] + vec[1]*vec[1] + vec[2]*vec[2]);
@@ -124 +126 @@
             data[nindex+3] = (float)vec[2];
         } else {
-            val = resampledDataSet->GetScalarComponentAsDouble(ix, iy, iz, 0);
-            data[nindex] = (float)val;
+            //val = resampledDataSet->GetScalarComponentAsDouble(ix, iy, iz, 0);
+            val = resampledDataSet->GetPointData()->GetScalars()->GetComponent(idx, 0);
+            data[nindex] = valid ? (float)val : -FLT_MAX;
         }
-         if (val < vmin) {
-            vmin = val;
-        } else if (val > vmax) {
-            vmax = val;
-        }
-        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;
+            }
         }