Changeset 2269 for trunk/packages/vizservers/vtkvis/RpHeightMap.cpp

Timestamp:

Jun 2, 2011, 2:21:08 PM (13 years ago)

Author:

ldelgass

Message:

Add glyphs command/object for rendering 3D glyph objects at all points in a
data set with scaling and color mapping. Useful for vector field hedgehogs
and general 3D scatter plots. Still need to deal with data ranges better and
add options for using vector mag. vs. components for scaling, etc.
Also compute point data when only cell data is present and point data is needed.
Probably this should be done in the DataSet? class instead to minimize
duplicating work.

File:

• trunk/packages/vizservers/vtkvis/RpHeightMap.cpp (modified) (5 diffs)

trunk/packages/vizservers/vtkvis/RpHeightMap.cpp

@@ -9 +9 @@
 
 #include <vtkDataSet.h>
+#include <vtkPointData.h>
+#include <vtkCellData.h>
+#include <vtkCellDataToPointData.h>
 #include <vtkDataSetMapper.h>
 #include <vtkPolyDataMapper.h>
 #include <vtkUnstructuredGrid.h>
 #include <vtkProperty.h>
-#include <vtkPointData.h>
 #include <vtkImageData.h>
 #include <vtkLookupTable.h>
@@ -30 +32 @@
 using namespace Rappture::VtkVis;
 
-#define MESH_POINTS
+//#define MESH_POINTS
 
 HeightMap::HeightMap() :
@@ -112 +114 @@
 
     if (_transformedData == NULL) {
+        vtkSmartPointer<vtkCellDataToPointData> cellToPtData;
+
+        if (ds->GetPointData() == NULL ||
+            ds->GetPointData()->GetScalars() == NULL) {
+            ERROR("No scalar point data in dataset %s", _dataSet->getName().c_str());
+            if (ds->GetCellData() != NULL &&
+                ds->GetCellData()->GetScalars() != NULL) {
+                cellToPtData = 
+                    vtkSmartPointer<vtkCellDataToPointData>::New();
+                cellToPtData->SetInput(ds);
+                ds = cellToPtData->GetOutput();
+            } else {
+                ERROR("No scalar cell data in dataset %s", _dataSet->getName().c_str());
+            }
+        }
+
         vtkPolyData *pd = vtkPolyData::SafeDownCast(ds);
         if (pd != NULL) {
@@ -214 +232 @@
                 gf->SetInput(_volumeSlicer->GetOutput());
             } else {
-                // structured grid, unstructured grid, or rectilinear grid
+                // 2D image data, structured grid, unstructured grid, or rectilinear grid
                 gf->SetInput(ds);
             }
@@ -243 +261 @@
             if (lut)
                 _lut = lut;
-            else
+            else {
                 _lut = vtkSmartPointer<vtkLookupTable>::New();
+            }
         }
     }