Changeset 3680 for trunk/packages/vizservers/vtkvis/HeightMap.h

Timestamp:

Jun 7, 2013 2:27:25 PM (11 years ago)

Author:

ldelgass

Message:

Improved cloud support in vtkvis: handle ugrids with no cells as well as
polydata clouds, add cloudstyle options to some graphics objects.

File:

• trunk/packages/vizservers/vtkvis/HeightMap.h (modified) (7 diffs)

trunk/packages/vizservers/vtkvis/HeightMap.h

@@ -13 +13 @@
 #include <vtkContourFilter.h>
 #include <vtkLookupTable.h>
-#include <vtkDataSetMapper.h>
+#include <vtkPolyDataMapper.h>
 #include <vtkActor.h>
 #include <vtkPlaneCollection.h>
@@ -21 +21 @@
 #include <vtkPolyDataNormals.h>
 #include <vtkAssembly.h>
-#include <vtkPolyData.h>
+#include <vtkDataSet.h>
 #include <vtkPlane.h>
 
@@ -37 +37 @@
 class HeightMap : public GraphicsObject {
 public:
+    enum CloudStyle {
+        CLOUD_MESH,
+        CLOUD_SPLAT
+    };
     enum ColorMode {
         COLOR_BY_SCALAR,
@@ -73 +77 @@
 
     virtual void setAspect(double aspect);
+
+    void setCloudStyle(CloudStyle style);
 
     void selectVolumeSlice(Axis axis, double ratio);
@@ -134 +140 @@
 
     vtkAlgorithmOutput *initWarp(vtkAlgorithmOutput *input);
-    vtkAlgorithmOutput *initWarp(vtkPolyData *input);
+    vtkAlgorithmOutput *initWarp(vtkDataSet *input);
 
     int _numContours;
@@ -147 +153 @@
     bool _pipelineInitialized;
 
+    CloudStyle _cloudStyle;
     ColorMap *_colorMap;
     ColorMode _colorMode;
@@ -157 +164 @@
 
     vtkSmartPointer<vtkLookupTable> _lut;
-    vtkSmartPointer<vtkDataSetMapper> _dsMapper;
+    vtkSmartPointer<vtkPolyDataMapper> _mapper;
     vtkSmartPointer<vtkContourFilter> _contourFilter;
     vtkSmartPointer<vtkPolyDataMapper> _contourMapper;
-    vtkSmartPointer<vtkGaussianSplatter> _pointSplatter;
+    vtkSmartPointer<vtkGaussianSplatter> _splatter;
     vtkSmartPointer<vtkExtractVOI> _volumeSlicer;
     vtkSmartPointer<vtkPlane> _cutPlane;