Changeset 3771

Timestamp:

Jul 10, 2013 5:14:25 PM (10 years ago)

Author:

ldelgass

Message:

Add protocol for setting max. number of glyphs

Location:

trunk/packages/vizservers/vtkvis

Files:

• GraphicsObject.cpp (modified) (1 diff)
• Renderer.h (modified) (1 diff)
• RendererCmd.cpp (modified) (10 diffs)
• RendererGraphicsObjs.cpp (modified) (1 diff)

trunk/packages/vizservers/vtkvis/GraphicsObject.cpp

@@ -13 +13 @@
 
 void GraphicsObject::setDataSet(DataSet *dataSet,
-                                   Renderer *renderer)
+                                Renderer *renderer)
 {
     if (_dataSet != dataSet) {

trunk/packages/vizservers/vtkvis/Renderer.h

@@ -699 +699 @@
     void setGlyphsScaleFactor(const DataSetId& id, double scale);
 
+    void setGlyphsMaximumNumberOfGlyphs(const DataSetId& id, int max,
+                                        bool random = true,
+                                        int offset = 0, int ratio = 1);
+
     // Groups
 

trunk/packages/vizservers/vtkvis/RendererCmd.cpp

@@ -2049 +2049 @@
     {"orient",    4, BoxOrientOp, 6, 7, "qw qx qy qz ?name?"},
     {"origin",    4, BoxOriginOp, 5, 6, "x y z ?name?"},
-    {"pos",       2, BoxPositionOp, 5, 6, "x y z ?name?"},
+    {"pos",       1, BoxPositionOp, 5, 6, "x y z ?name?"},
     {"scale",     2, BoxScaleOp, 5, 6, "sx sy sz ?name?"},
     {"shading",   2, BoxShadingOp, 3, 4, "val ?name?"},
@@ -2891 +2891 @@
     {"orient",    4, ConeOrientOp, 6, 7, "qw qx qy qz ?name?"},
     {"origin",    4, ConeOriginOp, 5, 6, "x y z ?name?"},
-    {"pos",       2, ConePositionOp, 5, 6, "x y z ?name?"},
+    {"pos",       1, ConePositionOp, 5, 6, "x y z ?name?"},
     {"resolution",1, ConeResolutionOp, 3, 4, "res ?name?"},
     {"scale",     2, ConeScaleOp, 5, 6, "sx sy sz ?name?"},
@@ -4518 +4518 @@
     {"orient",    4, CylinderOrientOp, 6, 7, "qw qx qy qz ?name?"},
     {"origin",    4, CylinderOriginOp, 5, 6, "x y z ?name?"},
-    {"pos",       2, CylinderPositionOp, 5, 6, "x y z ?name?"},
+    {"pos",       1, CylinderPositionOp, 5, 6, "x y z ?name?"},
     {"resolution",1, CylinderResolutionOp, 3, 4, "res ?name?"},
     {"scale",     2, CylinderScaleOp, 5, 6, "sx sy sz ?name?"},
@@ -5334 +5334 @@
     {"orient",    4, DiskOrientOp, 6, 7, "qw qx qy qz ?name?"},
     {"origin",    4, DiskOriginOp, 5, 6, "x y z ?name?"},
-    {"pos",       2, DiskPositionOp, 5, 6, "x y z ?name?"},
+    {"pos",       1, DiskPositionOp, 5, 6, "x y z ?name?"},
     {"resolution",1, DiskResolutionOp, 4, 5, "resRadial resCircum ?name?"},
     {"scale",     2, DiskScaleOp, 5, 6, "sx sy sz ?name?"},
@@ -5560 +5560 @@
 
 static int
+GlyphsMaxNumberOfGlyphsOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                          Tcl_Obj *const *objv)
+{
+    int max;
+    bool random = true;
+    int offset = 0;
+    int ratio = 1;
+    if (Tcl_GetIntFromObj(interp, objv[2], &max) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc > 3) {
+        if (GetBooleanFromObj(interp, objv[3], &random) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        if (Tcl_GetIntFromObj(interp, objv[4], &offset) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        if (Tcl_GetIntFromObj(interp, objv[5], &ratio) != TCL_OK) {
+            return TCL_ERROR;
+        }
+    }
+    if (objc == 7) {
+        const char *name = Tcl_GetString(objv[6]);
+        g_renderer->setGlyphsMaximumNumberOfGlyphs(name, max, random, offset, ratio);
+    } else {
+        g_renderer->setGlyphsMaximumNumberOfGlyphs("all", max, random, offset, ratio);
+    }
+    return TCL_OK;
+}
+
+static int
 GlyphsNormalizeScaleOp(ClientData clientData, Tcl_Interp *interp, int objc, 
                        Tcl_Obj *const *objv)
@@ -5839 +5870 @@
     {"linecolor",    5, GlyphsLineColorOp, 5, 6, "r g b ?dataSetName?"},
     {"linewidth",    5, GlyphsLineWidthOp, 3, 4, "width ?dataSetName?"},
-    {"normscale",    1, GlyphsNormalizeScaleOp, 3, 4, "bool ?dataSetName?"},
+    {"normscale",    2, GlyphsNormalizeScaleOp, 3, 4, "bool ?dataSetName?"},
+    {"numglyphs",    2, GlyphsMaxNumberOfGlyphsOp, 3, 7, "max ?random? ?offset? ?ratio? ?dataSetName?"},
     {"opacity",      2, GlyphsOpacityOp, 3, 4, "value ?dataSetName?"},
     {"orient",       2, GlyphsOrientOp, 6, 7, "qw qx qy qz ?dataSetName?"},
@@ -6024 +6056 @@
     {"pos",       1, GroupPositionOp, 5, 6, "x y z ?name?"},
     {"remove",    1, GroupRemoveChildOp, 3, 4, "nodeList ?name?"},
-    {"scale",     2, GroupScaleOp, 5, 6, "sx sy sz ?name?"},
+    {"scale",     1, GroupScaleOp, 5, 6, "sx sy sz ?name?"},
     {"visible",   1, GroupVisibleOp, 3, 4, "bool ?name?"},
 };
@@ -7271 +7303 @@
     {"orient",    4, LineOrientOp, 6, 7, "qw qx qy qz ?name?"},
     {"origin",    4, LineOriginOp, 5, 6, "x y z ?name?"},
-    {"pos",       2, LinePositionOp, 5, 6, "x y z ?name?"},
-    {"scale",     2, LineScaleOp, 5, 6, "sx sy sz ?name?"},
+    {"pos",       1, LinePositionOp, 5, 6, "x y z ?name?"},
+    {"scale",     1, LineScaleOp, 5, 6, "sx sy sz ?name?"},
     {"visible",   1, LineVisibleOp, 3, 4, "bool ?name?"}
 };
@@ -8019 +8051 @@
     {"opacity",   2, OutlineOpacityOp, 3, 4, "value ?dataSetName?"},
     {"orient",    2, OutlineOrientOp, 6, 7, "qw qx qy qz ?dataSetName?"},
-    {"pos",       2, OutlinePositionOp, 5, 6, "x y z ?dataSetName?"},
-    {"scale",     2, OutlineScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
+    {"pos",       1, OutlinePositionOp, 5, 6, "x y z ?dataSetName?"},
+    {"scale",     1, OutlineScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
     {"visible",   1, OutlineVisibleOp, 3, 4, "bool ?dataSetName?"}
 };
@@ -11158 +11190 @@
     {"preinterp",    2, WarpPreInterpOp, 3, 4, "bool ?dataSetName?"},
     {"ptsize",       2, WarpPointSizeOp, 3, 4, "size ?dataSetName?"},
-    {"scale",        2, WarpScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
+    {"scale",        1, WarpScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
     {"visible",      1, WarpVisibleOp, 3, 4, "bool ?dataSetName?"},
     {"warpscale",    2, WarpWarpScaleOp, 3, 4, "value ?dataSetName?"},

trunk/packages/vizservers/vtkvis/RendererGraphicsObjs.cpp

@@ -1561 +1561 @@
 
 /**
+ * \brief Limit the number of glyphs displayed
+ *
+ * The choice of glyphs to display can be based on sampling every
+ * n-th point (ratio) or by random sample
+ *
+ * \param max Maximum number of glyphs to display, negative means display all
+ * \param random Flag to enable/disable random sampling
+ * \param offset If random is false, this controls the first sample point
+ * \param ratio If random is false, this ratio controls every n-th point sampling
+ */
+void Renderer::setGlyphsMaximumNumberOfGlyphs(const DataSetId& id, int max,
+                                              bool random, int offset, int ratio)
+{
+    GlyphsHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _glyphs.begin();
+        if (itr == _glyphs.end())
+            return;
+        doAll = true;
+    } else {
+        itr = _glyphs.find(id);
+    }
+    if (itr == _glyphs.end()) {
+        ERROR("Glyphs not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setMaximumNumberOfGlyphs(max, random, offset, ratio);
+    } while (doAll && ++itr != _glyphs.end());
+
+    sceneBoundsChanged();
+    _needsRedraw = true;
+}
+
+/**
  * \brief Controls if field data range is normalized to [0,1] before
  * applying scale factor for the given DataSet