Changeset 3818 for trunk/packages/vizservers/vtkvis/Renderer.h

Timestamp:

Jul 18, 2013, 2:51:21 PM (11 years ago)

Author:

ldelgass

Message:

Add colormode for PolyData?, by default color map if an active scalar field with
multiple components is present (color scalars). Add protocol for image/text3d
drawing components. Make 'color' synonym for 'ccolor' in protocol commands,
also accept 'ccolor' or 'constant' as colormode. Add experimental commands for
simple legend (no field info required), extended colormode for heightmap with
explicit range. Add fontconfig support (needs testing). Added code to remove
duplicate points from unstructured grids. Should probably be optional. Stack
trace on error (if WANT_TRACE is on) using VTK.

File:

• trunk/packages/vizservers/vtkvis/Renderer.h (modified) (12 diffs)

trunk/packages/vizservers/vtkvis/Renderer.h

@@ -40 +40 @@
 #include "Group.h"
 #include "HeightMap.h"
+#include "Image.h"
 #include "LIC.h"
 #include "Line.h"
@@ -49 +50 @@
 #include "Sphere.h"
 #include "Streamlines.h"
+#include "Text3D.h"
 #include "Volume.h"
 #include "Warp.h"
@@ -420 +422 @@
 
     void setColorMapNumberOfTableEntries(const ColorMapId& id, int numEntries);
+
+    bool renderColorMap(const ColorMapId& id,
+                        int width, int height,
+                        bool opaque,
+                        vtkUnsignedCharArray *imgData);
 
     bool renderColorMap(const ColorMapId& id, 
@@ -745 +752 @@
                                const char *name, double range[2] = NULL);
 
+    // Images
+
+    void setImageBackground(const DataSetId& id, bool state);
+
+    void setImageBacking(const DataSetId& id, bool state);
+
+    void setImageBorder(const DataSetId& id, bool state);
+
+    void setImageExtents(const DataSetId& id, int extents[6]);
+
+    void setImageLevel(const DataSetId& id, double level);
+
+    void setImageWindow(const DataSetId& id, double window);
+
+    void setImageZSlice(const DataSetId& id, int z);
 
     // Lines
@@ -796 +818 @@
                                PolyData::CloudStyle style);
 
+    void setPolyDataColorMode(const DataSetId& id,
+                              PolyData::ColorMode mode,
+                              const char *name, double range[2] = NULL);
+
+    void setPolyDataColorMode(const DataSetId& id,
+                              PolyData::ColorMode mode,
+                              DataSet::DataAttributeType type,
+                              const char *name, double range[2] = NULL);
+
     // Color-mapped surfaces
 
@@ -880 +911 @@
 
     void setStreamlinesTypeToRibbons(const DataSetId& id, double width, double angle);
+
+    // Text3Ds
+
+    bool addText3D(const DataSetId& id, const char *string,
+                   const char *fontFamily, int fontSize,
+                   bool bold = false, bool italic = false, bool shadow = false);
+
+    void setText3DBold(const DataSetId& id, bool state);
+
+    void setText3DFollowCamera(const DataSetId& id, bool state);
+
+    void setText3DFont(const DataSetId& id, const char *fontFamily);
+
+    void setText3DFontSize(const DataSetId& id, int size);
+
+    void setText3DItalic(const DataSetId& id, bool state);
+
+    void setText3DShadow(const DataSetId& id, bool state);
+
+    void setText3DText(const DataSetId& id, const char *text);
 
     // Volumes
@@ -919 +970 @@
     typedef std::tr1::unordered_map<DataSetId, Group *> GroupHashmap;
     typedef std::tr1::unordered_map<DataSetId, HeightMap *> HeightMapHashmap;
+    typedef std::tr1::unordered_map<DataSetId, Image *> ImageHashmap;
     typedef std::tr1::unordered_map<DataSetId, LIC *> LICHashmap;
     typedef std::tr1::unordered_map<DataSetId, Line *> LineHashmap;
@@ -928 +980 @@
     typedef std::tr1::unordered_map<DataSetId, Sphere *> SphereHashmap;
     typedef std::tr1::unordered_map<DataSetId, Streamlines *> StreamlinesHashmap;
+    typedef std::tr1::unordered_map<DataSetId, Text3D *> Text3DHashmap;
     typedef std::tr1::unordered_map<DataSetId, Volume *> VolumeHashmap;
     typedef std::tr1::unordered_map<DataSetId, Warp *> WarpHashmap;
@@ -1023 +1076 @@
     FieldRangeHashmap _vectorCellDataRange;
     FieldRangeHashmap _vectorCompCellDataRange[3];
+    FieldRangeHashmap _scalarFieldDataRange;
+    FieldRangeHashmap _vectorFieldDataRange;
+    FieldRangeHashmap _vectorCompFieldDataRange[3];
 
     FieldRangeHashmap _userScalarPointDataRange;
@@ -1030 +1086 @@
     FieldRangeHashmap _userVectorCellDataRange;
     FieldRangeHashmap _userVectorCompCellDataRange[3];
+    FieldRangeHashmap _userScalarFieldDataRange;
+    FieldRangeHashmap _userVectorFieldDataRange;
+    FieldRangeHashmap _userVectorCompFieldDataRange[3];
 
     bool _axesAutoBounds[3];
@@ -1050 +1109 @@
     GroupHashmap _groups;
     HeightMapHashmap _heightMaps;
+    ImageHashmap _images;
     LICHashmap _lics;
     LineHashmap _lines;
@@ -1059 +1119 @@
     SphereHashmap _spheres;
     StreamlinesHashmap _streamlines;
+    Text3DHashmap _text3Ds;
     VolumeHashmap _volumes;
     WarpHashmap _warps;