Changeset 3677

Timestamp:

Jun 5, 2013 12:02:23 AM (11 years ago)

Author:

ldelgass

Message:

Add simple point source to glyphs as alternative way of rendering point clouds.

Location:

trunk/packages/vizservers/vtkvis

Files:

• Glyphs.cpp (modified) (2 diffs)
• Glyphs.h (modified) (1 diff)
• RendererCmd.cpp (modified) (7 diffs)
• protocol.txt (modified) (1 diff)

trunk/packages/vizservers/vtkvis/Glyphs.cpp

@@ -22 +22 @@
 #include <vtkCylinderSource.h>
 #include <vtkPlatonicSolidSource.h>
+#include <vtkPointSource.h>
 #include <vtkSphereSource.h>
 #include <vtkTransform.h>
@@ -145 +146 @@
         _glyphSource = vtkSmartPointer<vtkPlatonicSolidSource>::New();
         vtkPlatonicSolidSource::SafeDownCast(_glyphSource)->SetSolidTypeToOctahedron();
+        break;
+    case POINT:
+        _glyphSource = vtkSmartPointer<vtkPointSource>::New();
+        vtkPointSource::SafeDownCast(_glyphSource)->SetNumberOfPoints(1);
+        vtkPointSource::SafeDownCast(_glyphSource)->SetCenter(0, 0, 0);
+        vtkPointSource::SafeDownCast(_glyphSource)->SetRadius(0);
+        vtkPointSource::SafeDownCast(_glyphSource)->SetDistributionToUniform();
         break;
     case SPHERE: {

trunk/packages/vizservers/vtkvis/Glyphs.h

@@ -40 +40 @@
         LINE,
         OCTAHEDRON,
+        POINT,
         SPHERE,
         TETRAHEDRON

trunk/packages/vizservers/vtkvis/RendererCmd.cpp

@@ -4919 +4919 @@
     } else if (shapeOpt[0] == 'o' && strcmp(shapeOpt, "octahedron") == 0) {
         shape = Glyphs::OCTAHEDRON;
+    } else if (shapeOpt[0] == 'p' && strcmp(shapeOpt, "point") == 0) {
+        shape = Glyphs::POINT;
     } else if (shapeOpt[0] == 's' && strcmp(shapeOpt, "sphere") == 0) {
         shape = Glyphs::SPHERE;
@@ -4925 +4927 @@
     } else {
         Tcl_AppendResult(interp, "bad shape option \"", shapeOpt,
-                         "\": should be one of: 'arrow', 'cone', 'cube', 'cylinder', 'dodecahedron', 'icosahedron', 'octahedron', 'sphere', 'tetrahedron'", (char*)NULL);
+                         "\": should be one of: 'arrow', 'cone', 'cube', 'cylinder', 'dodecahedron', 'icosahedron', 'octahedron', 'point', 'sphere', 'tetrahedron'", (char*)NULL);
         return TCL_ERROR;
     }
@@ -5164 +5166 @@
     } else {
         g_renderer->setGlyphsOrientMode("all", state, fieldName);
+    }
+    return TCL_OK;
+}
+
+static int
+GlyphsPointSizeOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                  Tcl_Obj *const *objv)
+{
+    float size;
+    if (GetFloatFromObj(interp, objv[2], &size) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setGraphicsObjectPointSize<Glyphs>(name, size);
+    } else {
+        g_renderer->setGraphicsObjectPointSize<Glyphs>("all", size);
     }
     return TCL_OK;
@@ -5275 +5294 @@
     } else if (shapeOpt[0] == 'o' && strcmp(shapeOpt, "octahedron") == 0) {
         shape = Glyphs::OCTAHEDRON;
+    } else if (shapeOpt[0] == 'p' && strcmp(shapeOpt, "point") == 0) {
+        shape = Glyphs::POINT;
     } else if (shapeOpt[0] == 's' && strcmp(shapeOpt, "sphere") == 0) {
         shape = Glyphs::SPHERE;
@@ -5281 +5302 @@
     } else {
         Tcl_AppendResult(interp, "bad shape option \"", shapeOpt,
-                         "\": should be one of: 'arrow', 'cone', 'cube', 'cylinder', 'dodecahedron', 'icosahedron', 'line', 'octahedron', 'sphere', 'tetrahedron'", (char*)NULL);
+                         "\": should be one of: 'arrow', 'cone', 'cube', 'cylinder', 'dodecahedron', 'icosahedron', 'line', 'octahedron', 'point', 'sphere', 'tetrahedron'", (char*)NULL);
         return TCL_ERROR;
     }
@@ -5343 +5364 @@
     {"opacity",      2, GlyphsOpacityOp, 3, 4, "value ?dataSetName?"},
     {"orient",       2, GlyphsOrientOp, 6, 7, "qw qx qy qz ?dataSetName?"},
-    {"pos",          1, GlyphsPositionOp, 5, 6, "x y z ?dataSetName?"},
+    {"pos",          2, GlyphsPositionOp, 5, 6, "x y z ?dataSetName?"},
+    {"ptsize",       2, GlyphsPointSizeOp, 3, 4, "size ?dataSetName?"},
     {"scale",        2, GlyphsScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
     {"shape",        2, GlyphsShapeOp, 3, 4, "shapeVal ?dataSetName?"},
@@ -6610 +6632 @@
     return TCL_OK;
 }
-
 
 static int

trunk/packages/vizservers/vtkvis/protocol.txt

@@ -461 +461 @@
 glyphs orient <qw> <qx> <qy> <qz> <?dataSetName?>
 glyphs pos <x> <y> <z> <?dataSetName?>
+glyphs ptsize <size> <?dataSetName?>
 glyphs scale <sx> <sy> <sz> <?dataSetName?>
-glyphs shape <arrow|cone|cube|cylinder|dodecahedron|icosahedron|line|octahedron|sphere|tetrahedron> <?datasetName?>
+glyphs shape <arrow|cone|cube|cylinder|dodecahedron|icosahedron|line|octahedron|point|sphere|tetrahedron> <?datasetName?>
 glyphs smode <scalar|vmag|vcomp|off> <fieldName> <?dataSetName?>
        Set the scaling mode: use the scalar field, vector magnitude