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

Timestamp:

Aug 27, 2011 1:59:23 AM (13 years ago)

Author:

ldelgass

Message:

Handle 2D datasets with offset from origin or in principal planes other than XY.
Add return value for many methods, e.g. creating graphics objects
Add query for server's current list of datasets
Add pixel/world coordinate query of vector fields
Add pixel coordinate support for setting image camera zoom region
Add Heightmap wireframe, surface visibility toggles
Add Point size setting for polydata
Use custom version of 2D axes, fixes tick/label direction in XZ view
Put contour isolines through stripper to remove gaps in line rasterization

File:

• trunk/packages/vizservers/vtkvis/RpVtkRenderer.h (modified) (20 diffs)

trunk/packages/vizservers/vtkvis/RpVtkRenderer.h

@@ -12 +12 @@
 #include <vtkCubeAxesActor.h>
 #ifdef USE_CUSTOM_AXES
-#include <vtkRpCubeAxesActor2D.h>
+#include "vtkRpCubeAxesActor2D.h"
 #else
 #include <vtkCubeAxesActor2D.h>
@@ -59 +59 @@
         Y_AXIS,
         Z_AXIS
+    };
+
+    enum PrincipalPlane {
+        PLANE_XY,
+        PLANE_ZY,
+        PLANE_XZ
     };
 
@@ -104 +110 @@
     DataSet *getDataSet(const DataSetId& id);
 
+    void getDataSetNames(std::vector<std::string>& names);
+
     bool setData(const DataSetId& id, char *data, int nbytes);
 
@@ -112 +120 @@
     bool setDataSetActiveVectors(const DataSetId& id, const char *vectorName);
 
-    double getDataValueAtPixel(const DataSetId& id, int x, int y);
-
-    double getDataValue(const DataSetId& id, double x, double y, double z);
+    bool getScalarValueAtPixel(const DataSetId& id, int x, int y, double *value);
+
+    bool getScalarValue(const DataSetId& id, double x, double y, double z, double *value);
+
+    bool getVectorValueAtPixel(const DataSetId& id, int x, int y, double vector[3]);
+
+    bool getVectorValue(const DataSetId& id, double x, double y, double z, double vector[3]);
 
     void setOpacity(const DataSetId& id, double opacity);
@@ -148 +160 @@
     void resetCameraClippingRange();
 
+    void setCameraZoomRegionPixels(int x, int y, int width, int height);
+
     void setCameraZoomRegion(double x, double y, double width, double height);
 
@@ -232 +246 @@
     // 2D Contour plots
 
-    void addContour2D(const DataSetId& id, int numContours);
-
-    void addContour2D(const DataSetId& id, const std::vector<double>& contours);
+    bool addContour2D(const DataSetId& id, int numContours);
+
+    bool addContour2D(const DataSetId& id, const std::vector<double>& contours);
 
     void deleteContour2D(const DataSetId& id);
@@ -266 +280 @@
     // 3D Contour (isosurface) plots
 
-    void addContour3D(const DataSetId& id, int numContours);
-
-    void addContour3D(const DataSetId& id, const std::vector<double>& contours);
+    bool addContour3D(const DataSetId& id, int numContours);
+
+    bool addContour3D(const DataSetId& id, const std::vector<double>& contours);
 
     void deleteContour3D(const DataSetId& id);
@@ -308 +322 @@
     // Glyphs
 
-    void addGlyphs(const DataSetId& id, Glyphs::GlyphShape shape);
+    bool addGlyphs(const DataSetId& id, Glyphs::GlyphShape shape);
 
     void deleteGlyphs(const DataSetId& id);
@@ -352 +366 @@
     // Height maps
 
-    void addHeightMap(const DataSetId& id, int numContours);
-
-    void addHeightMap(const DataSetId& id, const std::vector<double>& contours);
+    bool addHeightMap(const DataSetId& id, int numContours, double heightScale);
+
+    bool addHeightMap(const DataSetId& id, const std::vector<double>& contours, double heightScale);
 
     void deleteHeightMap(const DataSetId& id);
@@ -382 +396 @@
     void setHeightMapVisibility(const DataSetId& id, bool state);
 
+    void setHeightMapWireframe(const DataSetId& id, bool state);
+
     void setHeightMapVolumeSlice(const DataSetId& id, HeightMap::Axis axis, double ratio);
 
@@ -388 +404 @@
     void setHeightMapColorMap(const DataSetId& id, const ColorMapId& colorMapId);
 
-    void setHeightMapContours(const DataSetId& id, int numContours);
+    void setHeightMapNumContours(const DataSetId& id, int numContours);
 
     void setHeightMapContourList(const DataSetId& id, const std::vector<double>& contours);
 
-    void setHeightMapContourVisibility(const DataSetId& id, bool state);
+    void setHeightMapContourSurfaceVisibility(const DataSetId& id, bool state);
+
+    void setHeightMapContourLineVisibility(const DataSetId& id, bool state);
 
     void setHeightMapContourEdgeColor(const DataSetId& id, float color[3]);
@@ -400 +418 @@
     // LIC plots
 
-    void addLIC(const DataSetId& id);
+    bool addLIC(const DataSetId& id);
     
     void deleteLIC(const DataSetId& id);
@@ -434 +452 @@
     // Molecules
 
-    void addMolecule(const DataSetId& id);
+    bool addMolecule(const DataSetId& id);
     
     void deleteMolecule(const DataSetId& id);
@@ -474 +492 @@
     // PolyData Meshes
 
-    void addPolyData(const DataSetId& id);
+    bool addPolyData(const DataSetId& id);
     
     void deletePolyData(const DataSetId& id);
@@ -498 +516 @@
     void setPolyDataEdgeWidth(const DataSetId& id, float edgeWidth);
 
+    void setPolyDataPointSize(const DataSetId& id, float size);
+
     void setPolyDataLighting(const DataSetId& id, bool state);
 
@@ -509 +529 @@
     // Color-mapped surfaces
 
-    void addPseudoColor(const DataSetId& id);
+    bool addPseudoColor(const DataSetId& id);
 
     void deletePseudoColor(const DataSetId& id);
@@ -543 +563 @@
     // Streamlines
 
-    void addStreamlines(const DataSetId& id);
+    bool addStreamlines(const DataSetId& id);
 
     void deleteStreamlines(const DataSetId& id);
@@ -612 +632 @@
     // Volumes
 
-    void addVolume(const DataSetId& id);
+    bool addVolume(const DataSetId& id);
 
     void deleteVolume(const DataSetId& id);
@@ -678 +698 @@
     void computeScreenWorldCoords();
 
+    bool is2D(const double bounds[6],
+              PrincipalPlane *plane,
+              double *offset) const;
     void initCamera();
     void initAxes();
@@ -687 +710 @@
     double _imgWorldOrigin[2];
     double _imgWorldDims[2];
+    PrincipalPlane _imgCameraPlane;
+    double _imgCameraOffset;
     double _screenWorldCoords[4];
     double _cameraOrientation[4];