Changeset 5699

Timestamp:

Jun 15, 2015 3:08:46 PM (9 years ago)

Author:

ldelgass

Message:

Merge from trunk

Location:

nanovis/branches/1.2

Files:

• . (modified) (1 prop)
• HeightMap.cpp (modified) (1 diff)
• VtkDataSetReader.cpp (modified) (6 diffs)

nanovis/branches/1.2/HeightMap.cpp

@@ -1 @@
- /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
  * Copyright (c) 2004-2013  HUBzero Foundation, LLC

nanovis/branches/1.2/VtkDataSetReader.cpp

@@ -12 +12 @@
 #include <vtkImageData.h>
 #include <vtkPointData.h>
+#include <vtkCellData.h>
 #include <vtkDataArray.h>
 #include <vtkDataSetReader.h>
@@ -28 +29 @@
 
 using namespace nv;
+
+static void print(vtkDataSet *ds)
+{
+    if (ds == NULL)
+        return;
+
+    TRACE("DataSet class: %s", ds->GetClassName());
+
+    TRACE("DataSet memory: %g MiB", ds->GetActualMemorySize()/1024.);
+
+    double bounds[6];
+    ds->GetBounds(bounds);
+
+    // Topology
+    TRACE("DataSet bounds: %g %g %g %g %g %g",
+          bounds[0], bounds[1],
+          bounds[2], bounds[3],
+          bounds[4], bounds[5]);
+    TRACE("Points: %d Cells: %d", ds->GetNumberOfPoints(), ds->GetNumberOfCells());
+
+    double dataRange[2];
+    if (ds->GetPointData() != NULL) {
+        TRACE("PointData arrays: %d", ds->GetPointData()->GetNumberOfArrays());
+        for (int i = 0; i < ds->GetPointData()->GetNumberOfArrays(); i++) {
+            if (ds->GetPointData()->GetArray(i) != NULL) {
+                ds->GetPointData()->GetArray(i)->GetRange(dataRange, -1);
+                TRACE("PointData[%d]: '%s' comp:%d, (%g,%g)", i,
+                      ds->GetPointData()->GetArrayName(i),
+                      ds->GetPointData()->GetAbstractArray(i)->GetNumberOfComponents(),
+                      dataRange[0], dataRange[1]);
+            } else {
+                TRACE("PointData[%d]: '%s' comp:%d", i,
+                      ds->GetPointData()->GetArrayName(i),
+                      ds->GetPointData()->GetAbstractArray(i)->GetNumberOfComponents());
+            }
+        }
+        if (ds->GetPointData()->GetScalars() != NULL) {
+            TRACE("Active point scalars: %s", ds->GetPointData()->GetScalars()->GetName());
+        }
+        if (ds->GetPointData()->GetVectors() != NULL) {
+            TRACE("Active point vectors: %s", ds->GetPointData()->GetVectors()->GetName());
+        }
+    }
+    if (ds->GetCellData() != NULL) {
+        TRACE("CellData arrays: %d", ds->GetCellData()->GetNumberOfArrays());
+        for (int i = 0; i < ds->GetCellData()->GetNumberOfArrays(); i++) {
+            if (ds->GetCellData()->GetArray(i) != NULL) {
+                ds->GetCellData()->GetArray(i)->GetRange(dataRange, -1);
+                TRACE("CellData[%d]: '%s' comp:%d, (%g,%g)", i,
+                      ds->GetCellData()->GetArrayName(i),
+                      ds->GetCellData()->GetAbstractArray(i)->GetNumberOfComponents(),
+                      dataRange[0], dataRange[1]);
+            } else {
+                TRACE("CellData[%d]: '%s' comp:%d", i,
+                      ds->GetCellData()->GetArrayName(i),
+                      ds->GetCellData()->GetAbstractArray(i)->GetNumberOfComponents());
+            }
+        }
+        if (ds->GetCellData()->GetScalars() != NULL) {
+            TRACE("Active cell scalars: %s", ds->GetCellData()->GetScalars()->GetName());
+        }
+        if (ds->GetCellData()->GetVectors() != NULL) {
+            TRACE("Active cell vectors: %s", ds->GetCellData()->GetVectors()->GetName());
+        }
+    }
+    if (ds->GetFieldData() != NULL) {
+        TRACE("FieldData arrays: %d", ds->GetFieldData()->GetNumberOfArrays());
+        for (int i = 0; i < ds->GetFieldData()->GetNumberOfArrays(); i++) {
+            if (ds->GetFieldData()->GetArray(i) != NULL) {
+                ds->GetFieldData()->GetArray(i)->GetRange(dataRange, -1);
+                TRACE("FieldData[%d]: '%s' comp:%d, tuples:%d (%g,%g)", i,
+                      ds->GetFieldData()->GetArrayName(i),
+                      ds->GetFieldData()->GetAbstractArray(i)->GetNumberOfComponents(),
+                      ds->GetFieldData()->GetAbstractArray(i)->GetNumberOfTuples(),
+                      dataRange[0], dataRange[1]);
+            } else {
+                TRACE("FieldData[%d]: '%s' comp:%d, tuples:%d", i,
+                      ds->GetFieldData()->GetArrayName(i),
+                      ds->GetFieldData()->GetAbstractArray(i)->GetNumberOfComponents(),
+                      ds->GetFieldData()->GetAbstractArray(i)->GetNumberOfTuples());
+            }
+        }
+    }
+}
 
 Volume *
@@ -60 +145 @@
             return NULL;
 
+        print(dataSet);
+
         int maxDim = 64;
 
@@ -110 +197 @@
     int iz = 0;
     vtkDataArray *mask = resampledDataSet->GetPointData()->GetArray("vtkValidPointMask");
+    int numValidPoints = 0;
     for (int p = 0; p < npts; p++) {
         int nindex = p * 4;
@@ -131 +219 @@
         }
         if (valid) {
+            numValidPoints++;
             if (val < vmin) {
                 vmin = val;
@@ -150 +239 @@
     }
 
+    if (numValidPoints < 1) {
+        ERROR("No valid points in resample volume");
+        vmin = 0.0;
+        vmax = 1.0;
+    } else {
+        TRACE("Valid points: %d of %d", numValidPoints, resampledDataSet->GetNumberOfPoints());
+    }
+
     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
+        // Normalize all values [0,1], -1 => out of bounds
         normalizeScalar(data, npts, 4, vmin, vmax);
         computeSimpleGradient(data, nx, ny, nz,