Changeset 2269 for trunk/packages/vizservers/vtkvis/RpVtkRenderer.h

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/RpVtkRenderer.h (modified) (6 diffs)

trunk/packages/vizservers/vtkvis/RpVtkRenderer.h

@@ -27 +27 @@
 #include "ColorMap.h"
 #include "RpVtkDataSet.h"
-#include "RpPseudoColor.h"
 #include "RpContour2D.h"
+#include "RpGlyphs.h"
 #include "RpHeightMap.h"
 #include "RpPolyData.h"
+#include "RpPseudoColor.h"
 #include "RpVolume.h"
 #include "Trace.h"
@@ -74 +75 @@
     typedef std::tr1::unordered_map<DataSetId, DataSet *> DataSetHashmap;
     typedef std::tr1::unordered_map<ColorMapId, ColorMap *> ColorMapHashmap;
-    typedef std::tr1::unordered_map<DataSetId, PseudoColor *> PseudoColorHashmap;
     typedef std::tr1::unordered_map<DataSetId, Contour2D *> Contour2DHashmap;
+    typedef std::tr1::unordered_map<DataSetId, Glyphs *> GlyphsHashmap;
     typedef std::tr1::unordered_map<DataSetId, HeightMap *> HeightMapHashmap;
     typedef std::tr1::unordered_map<DataSetId, PolyData *> PolyDataHashmap;
+    typedef std::tr1::unordered_map<DataSetId, PseudoColor *> PseudoColorHashmap;
     typedef std::tr1::unordered_map<DataSetId, Volume *> VolumeHashmap;
 
@@ -180 +182 @@
                         vtkUnsignedCharArray *imgData);
 
-    // Color-mapped surfaces
-
-    void addPseudoColor(const DataSetId& id);
-
-    void deletePseudoColor(const DataSetId& id);
-
-    PseudoColor *getPseudoColor(const DataSetId& id);
-
-    void setPseudoColorColorMap(const DataSetId& id, const ColorMapId& colorMapId);
-
-    void setPseudoColorOpacity(const DataSetId& id, double opacity);
-
-    void setPseudoColorVisibility(const DataSetId& id, bool state);
-
-    void setPseudoColorEdgeVisibility(const DataSetId& id, bool state);
-
-    void setPseudoColorEdgeColor(const DataSetId& id, float color[3]);
-
-    void setPseudoColorEdgeWidth(const DataSetId& id, float edgeWidth);
-
-    void setPseudoColorLighting(const DataSetId& id, bool state);
-
     // Contour plots
 
@@ -223 +203 @@
 
     void setContourLighting(const DataSetId& id, bool state);
+
+    // Glyphs
+
+    void addGlyphs(const DataSetId& id);
+
+    void deleteGlyphs(const DataSetId& id);
+
+    Glyphs *getGlyphs(const DataSetId& id);
+
+    void setGlyphsColorMap(const DataSetId& id, const ColorMapId& colorMapId);
+
+    void setGlyphsShape(const DataSetId& id, Glyphs::GlyphShape shape);
+
+    void setGlyphsScaleFactor(const DataSetId& id, double scale);
+
+    void setGlyphsOpacity(const DataSetId& id, double opacity);
+
+    void setGlyphsVisibility(const DataSetId& id, bool state);
+
+    void setGlyphsLighting(const DataSetId& id, bool state);
 
     // Height maps
@@ -283 +283 @@
 
     void setPolyDataLighting(const DataSetId& id, bool state);
+
+    // Color-mapped surfaces
+
+    void addPseudoColor(const DataSetId& id);
+
+    void deletePseudoColor(const DataSetId& id);
+
+    PseudoColor *getPseudoColor(const DataSetId& id);
+
+    void setPseudoColorColorMap(const DataSetId& id, const ColorMapId& colorMapId);
+
+    void setPseudoColorOpacity(const DataSetId& id, double opacity);
+
+    void setPseudoColorVisibility(const DataSetId& id, bool state);
+
+    void setPseudoColorEdgeVisibility(const DataSetId& id, bool state);
+
+    void setPseudoColorEdgeColor(const DataSetId& id, float color[3]);
+
+    void setPseudoColorEdgeWidth(const DataSetId& id, float edgeWidth);
+
+    void setPseudoColorLighting(const DataSetId& id, bool state);
 
     // Volumes
@@ -353 +375 @@
     ColorMapHashmap _colorMaps;
     DataSetHashmap _dataSets;
-    PseudoColorHashmap _pseudoColors;
     Contour2DHashmap _contours;
+    GlyphsHashmap _glyphs;
     HeightMapHashmap _heightMaps;
     PolyDataHashmap _polyDatas;
+    PseudoColorHashmap _pseudoColors;
     VolumeHashmap _volumes;