Changeset 2329 for trunk

Timestamp:

Aug 3, 2011 6:10:59 AM (13 years ago)

Author:

ldelgass

Message:

Add option to position ticks inside, outside or both locations to 3D axes

Location:

trunk/packages/vizservers/vtkvis

Files:

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

trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -898 +898 @@
     setAxisTickVisibility(Y_AXIS, state);
     setAxisTickVisibility(Z_AXIS, state);
+}
+
+/**
+ * \brief Control position of ticks on 3D axes
+ */
+void Renderer::setAxesTickPosition(AxesTickPosition pos)
+{
+    if (_cubeAxesActor == NULL)
+        return;
+
+    switch (pos) {
+    case TICKS_BOTH:
+        _cubeAxesActor->SetTickLocationToBoth();
+        break;
+    case TICKS_OUTSIDE:
+        _cubeAxesActor->SetTickLocationToOutside();
+        break;
+    case TICKS_INSIDE:
+    default:
+        _cubeAxesActor->SetTickLocationToInside();
+        break;
+    }
+    _needsRedraw = true;
 }
 

trunk/packages/vizservers/vtkvis/RpVtkRenderer.h

@@ -67 +67 @@
         FLY_STATIC_EDGES,
         FLY_STATIC_TRIAD
+    };
+
+    enum AxesTickPosition {
+        TICKS_INSIDE,
+        TICKS_OUTSIDE,
+        TICKS_BOTH
     };
 
@@ -185 +191 @@
 
     void setAxesTickVisibility(bool state);
+
+    void setAxesTickPosition(AxesTickPosition pos);
 
     void setAxesColor(double color[3]);

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -199 +199 @@
 
 static int
+AxisTickPositionOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                   Tcl_Obj *const *objv)
+{
+    const char *string = Tcl_GetString(objv[2]);
+    char c = string[0];
+    if ((c == 'i') && (strcmp(string, "inside") == 0)) {
+        g_renderer->setAxesTickPosition(Renderer::TICKS_INSIDE);
+    } else if ((c == 'o') && (strcmp(string, "outside") == 0)) {
+        g_renderer->setAxesTickPosition(Renderer::TICKS_OUTSIDE);
+    } else if ((c == 'b') && (strcmp(string, "both") == 0)) {
+        g_renderer->setAxesTickPosition(Renderer::TICKS_BOTH);
+    } else {
+        Tcl_AppendResult(interp, "bad axis option \"", string,
+                         "\": should be inside, outside or both", (char*)NULL);
+        return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
+static int
 AxisUnitsOp(ClientData clientData, Tcl_Interp *interp, int objc, 
             Tcl_Obj *const *objv)
@@ -251 +271 @@
     {"labels",  1, AxisLabelsVisibleOp, 4, 4, "axis bool"},
     {"name",    1, AxisNameOp, 4, 4, "axis title"},
-    {"ticks",   1, AxisTicksVisibleOp, 4, 4, "axis bool"},
+    {"tickpos", 2, AxisTickPositionOp, 3, 3, "position"},
+    {"ticks",   2, AxisTicksVisibleOp, 4, 4, "axis bool"},
     {"units",   1, AxisUnitsOp, 4, 4, "axis units"},
     {"visible", 1, AxisVisibleOp, 4, 4, "axis bool"}

trunk/packages/vizservers/vtkvis/protocol.txt

@@ -15 +15 @@
 renderer depthpeel <bool>
          Set use of depth peeling algorithm for transparency
+renderer render
+         Force a new image to be rendered - use for advancing animation
 
 axis color <r> <g> <b>
@@ -25 +27 @@
      <axis> = x|y|z|all
 axis name <axis> <title>
+axis tickpos <position>
+     Set position of ticks on 3D axes (not implemented for 2D axes)
+     <position> = inside|outside|both
 axis ticks <axis> <bool>
      Toggle visibility of axis tick marks