Changeset 3095 for trunk/packages/vizservers

Timestamp:

Jul 16, 2012 11:37:07 AM (12 years ago)

Author:

ldelgass

Message:

Add ability to specify field used for orienting glyphs

Location:

trunk/packages/vizservers/vtkvis

Files:

• RpGlyphs.cpp (modified) (1 diff)
• RpGlyphs.h (modified) (1 diff)
• RpVtkRenderer.h (modified) (1 diff)
• RpVtkRendererCmd.cpp (modified) (2 diffs)
• RpVtkRendererGraphicsObjs.cpp (modified) (3 diffs)

trunk/packages/vizservers/vtkvis/RpGlyphs.cpp

@@ -298 +298 @@
 
 #ifdef HAVE_GLYPH3D_MAPPER
+/**
+ * \brief Turn on/off orienting glyphs from a vector field
+ */
+void Glyphs::setOrientMode(bool mode, const char *name)
+{
+    if (_glyphMapper != NULL) {
+        _glyphMapper->SetOrient(mode ? 1 : 0);
+        if (name != NULL && strlen(name) > 0) {
+            _glyphMapper->SetOrientationArray(name);
+        } else {
+            _glyphMapper->SetOrientationArray(vtkDataSetAttributes::VECTORS);
+        }
+    }
+}
+
 /**
  * \brief Control how glyphs are scaled

trunk/packages/vizservers/vtkvis/RpGlyphs.h

@@ -80 +80 @@
 
 #ifdef HAVE_GLYPH3D_MAPPER
+    void setOrientMode(bool mode, const char *name);
+
     void setScalingMode(ScalingMode mode, const char *name, double range[2]);
 

trunk/packages/vizservers/vtkvis/RpVtkRenderer.h

@@ -394 +394 @@
     void setGlyphsShape(const DataSetId& id, Glyphs::GlyphShape shape);
 
-    void setGlyphsOrient(const DataSetId& id, bool state);
+    void setGlyphsOrientMode(const DataSetId& id, bool state, const char *name);
 
     void setGlyphsColorMode(const DataSetId& id,

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -2368 +2368 @@
         return TCL_ERROR;
     }
-    if (objc == 4) {
-        const char *name = Tcl_GetString(objv[3]);
-        g_renderer->setGlyphsOrient(name, state);
-    } else {
-        g_renderer->setGlyphsOrient("all", state);
+    const char *fieldName = Tcl_GetString(objv[3]);
+    if (objc == 5) {
+        const char *name = Tcl_GetString(objv[4]);
+        g_renderer->setGlyphsOrientMode(name, state, fieldName);
+    } else {
+        g_renderer->setGlyphsOrientMode("all", state, fieldName);
     }
     return TCL_OK;
@@ -2544 +2545 @@
     {"delete",    1, GlyphsDeleteOp, 2, 3, "?dataSetName?"},
     {"edges",     1, GlyphsEdgeVisibilityOp, 3, 4, "bool ?dataSetName?"},
-    {"gorient",   2, GlyphsOrientGlyphsOp, 3, 4, "bool ?dataSetName?"},
+    {"gorient",   2, GlyphsOrientGlyphsOp, 4, 5, "bool fieldName ?dataSetName?"},
     {"gscale",    2, GlyphsScaleFactorOp, 3, 4, "scaleFactor ?dataSetName?"},
     {"lighting",  3, GlyphsLightingOp, 3, 4, "bool ?dataSetName?"},

trunk/packages/vizservers/vtkvis/RpVtkRendererGraphicsObjs.cpp

@@ -701 +701 @@
  * given DataSet
  */
-void Renderer::setGlyphsOrient(const DataSetId& id, bool state)
+void Renderer::setGlyphsOrientMode(const DataSetId& id, bool state,
+                                   const char *name)
 {
     GlyphsHashmap::iterator itr;
@@ -719 +720 @@
 
     do {
+#ifdef HAVE_GLYPH3D_MAPPER
+        itr->second->setOrientMode(state, name);
+#else
+        if (name != NULL && strlen(name) > 0) {
+            WARN("Glyphs orient mode doesn't support named fields for VTK < 5.8.0");
+        }
         itr->second->setOrient(state);
+#endif
     } while (doAll && ++itr != _glyphs.end());
 
@@ -904 +912 @@
      } while (doAll && ++itr != _heightMaps.end());
 
-    initCamera();
+    _renderer->ResetCameraClippingRange();
+    resetAxes();
     _needsRedraw = true;
 }