Changeset 3092 for trunk/packages/vizservers

Timestamp:

Jul 14, 2012 1:47:06 PM (12 years ago)

Author:

ldelgass

Message:

Add 'glyphs gorient' command to toggle orienting glyphs by a vector field.

Location:

trunk/packages/vizservers/vtkvis

Files:

• RpGlyphs.cpp (modified) (1 diff)
• RpGlyphs.h (modified) (1 diff)
• RpVtkGraphicsObject.h (modified) (1 diff)
• RpVtkRenderer.h (modified) (1 diff)
• RpVtkRendererCmd.cpp (modified) (2 diffs)
• RpVtkRendererGraphicsObjs.cpp (modified) (1 diff)
• protocol.txt (modified) (1 diff)

trunk/packages/vizservers/vtkvis/RpGlyphs.cpp

@@ -638 +638 @@
 
 /**
+ * \brief Turn on/off orienting glyphs from a vector field
+ */
+void Glyphs::setOrient(bool state)
+{
+#ifdef HAVE_GLYPH3D_MAPPER
+    if (_glyphMapper != NULL) {
+        _glyphMapper->SetOrient(state ? 1 : 0);
+    }
+#else
+    if (_glyphGenerator != NULL) {
+        _glyphGenerator->SetOrient(state ? 1 : 0);
+    }
+#endif
+}
+
+/**
  * \brief Controls relative scaling of glyphs
  */

trunk/packages/vizservers/vtkvis/RpGlyphs.h

@@ -77 +77 @@
     virtual void setClippingPlanes(vtkPlaneCollection *planes);
 
+    void setOrient(bool state);
+
 #ifdef HAVE_GLYPH3D_MAPPER
     void setScalingMode(ScalingMode mode, const char *name, double range[2]);

trunk/packages/vizservers/vtkvis/RpVtkGraphicsObject.h

@@ -658 +658 @@
         if (getActor() != NULL) {
             setCulling(getActor()->GetProperty(), state);
-         } else if (getAssembly() != NULL) {
+        } else if (getAssembly() != NULL) {
             vtkProp3DCollection *props = getAssembly()->GetParts();
             vtkProp3D *prop;

trunk/packages/vizservers/vtkvis/RpVtkRenderer.h

@@ -393 +393 @@
 
     void setGlyphsShape(const DataSetId& id, Glyphs::GlyphShape shape);
+
+    void setGlyphsOrient(const DataSetId& id, bool state);
 
     void setGlyphsColorMode(const DataSetId& id,

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -2361 +2361 @@
 
 static int
+GlyphsOrientGlyphsOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                     Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setGlyphsOrient(name, state);
+    } else {
+        g_renderer->setGlyphsOrient("all", state);
+    }
+    return TCL_OK;
+}
+
+static int
 GlyphsPositionOp(ClientData clientData, Tcl_Interp *interp, int objc, 
                  Tcl_Obj *const *objv)
@@ -2527 +2544 @@
     {"delete",    1, GlyphsDeleteOp, 2, 3, "?dataSetName?"},
     {"edges",     1, GlyphsEdgeVisibilityOp, 3, 4, "bool ?dataSetName?"},
-    {"gscale",    1, GlyphsScaleFactorOp, 3, 4, "scaleFactor ?dataSetName?"},
+    {"gorient",   2, GlyphsOrientGlyphsOp, 3, 4, "bool ?dataSetName?"},
+    {"gscale",    2, GlyphsScaleFactorOp, 3, 4, "scaleFactor ?dataSetName?"},
     {"lighting",  3, GlyphsLightingOp, 3, 4, "bool ?dataSetName?"},
     {"linecolor", 5, GlyphsLineColorOp, 5, 6, "r g b ?dataSetName?"},

trunk/packages/vizservers/vtkvis/RpVtkRendererGraphicsObjs.cpp

@@ -698 +698 @@
 
 /**
+ * \brief Controls if glyphs are oriented from a vector field for the 
+ * given DataSet
+ */
+void Renderer::setGlyphsOrient(const DataSetId& id, bool state)
+{
+    GlyphsHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _glyphs.begin();
+        doAll = true;
+    } else {
+        itr = _glyphs.find(id);
+    }
+    if (itr == _glyphs.end()) {
+        ERROR("Glyphs not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setOrient(state);
+    } while (doAll && ++itr != _glyphs.end());
+
+    _renderer->ResetCameraClippingRange();
+    _needsRedraw = true;
+}
+
+/**
  * \brief Set the shape of Glyphs for the given DataSet
  */

trunk/packages/vizservers/vtkvis/protocol.txt

@@ -204 +204 @@
 glyphs delete <?dataSetName?>
 glyphs edges <bool> <?datasetName?>
+glyphs gorient <bool> <?datasetName?>
 glyphs gscale <scaleFactor> <?datasetName?>
        Set glyph scaling factor