Changeset 3221 for branches

Timestamp:

Dec 21, 2012, 1:09:54 PM (12 years ago)

Author:

ldelgass

Message:

Add protocol to control axis title/label fonts and format (some require fixes
in VTK to function)

Location:

branches/Rappture 1.2/packages/vizservers/vtkvis

Files:

• RpTypes.h (modified) (2 diffs)
• RpVtkRenderer.cpp (modified) (6 diffs)
• RpVtkRenderer.h (modified) (2 diffs)
• RpVtkRendererCmd.cpp (modified) (7 diffs)
• protocol.txt (modified) (3 diffs)

branches/Rappture 1.2/packages/vizservers/vtkvis/RpTypes.h

@@ -13 +13 @@
 
     enum Axis {
-        X_AXIS,
+        X_AXIS = 0,
         Y_AXIS,
         Z_AXIS
@@ -19 +19 @@
 
     enum PrincipalPlane {
-        PLANE_XY,
+        PLANE_XY = 0,
         PLANE_ZY,
         PLANE_XZ

branches/Rappture 1.2/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -102 +102 @@
         _activeClipPlanes->AddItem(_cameraClipPlanes[3]);
     _renderer = vtkSmartPointer<vtkRenderer>::New();
+
+    // Global ambient (defaults to 1,1,1)
+    //_renderer->SetAmbient(.2, .2, .2);
+
     vtkSmartPointer<vtkLight> headlight = vtkSmartPointer<vtkLight>::New();
     headlight->SetLightTypeToHeadlight();
     headlight->PositionalOff();
+    // Light ambient color defaults to 0,0,0
     //headlight->SetAmbientColor(1, 1, 1);
-    //_renderer->SetAmbient(.2, .2, .2);
     _renderer->AddLight(headlight);
     vtkSmartPointer<vtkLight> skylight = vtkSmartPointer<vtkLight>::New();
@@ -113 +117 @@
     skylight->SetFocalPoint(0, 0, 0);
     skylight->PositionalOff();
+    // Light ambient color defaults to 0,0,0
     //skylight->SetAmbientColor(1, 1, 1);
     _renderer->AddLight(skylight);
@@ -457 +462 @@
     }
 
+    double unscaledBounds[6];
+    collectUnscaledBounds(unscaledBounds, false);
+
     if (bounds == NULL) {
         double newBounds[6];
         collectBounds(newBounds, false);
-        double unscaledBounds[6];
-        collectUnscaledBounds(unscaledBounds, false);
-        _cubeAxesActor->SetXAxisRange(unscaledBounds[0], unscaledBounds[1]);
-        _cubeAxesActor->SetYAxisRange(unscaledBounds[2], unscaledBounds[3]);
-        _cubeAxesActor->SetZAxisRange(unscaledBounds[4], unscaledBounds[5]);
-        TRACE("Axis ranges: %g %g %g %g %g %g",
-              unscaledBounds[0],
-              unscaledBounds[1],
-              unscaledBounds[2],
-              unscaledBounds[3],
-              unscaledBounds[4],
-              unscaledBounds[5]);
-        _cubeAxesActor->SetBounds(newBounds);
-        TRACE("Bounds (computed): %g %g %g %g %g %g",
-              newBounds[0],
-              newBounds[1],
-              newBounds[2],
-              newBounds[3],
-              newBounds[4],
-              newBounds[5]);
+
+        double sx = (newBounds[1] == newBounds[0]) ? 1.0 : (unscaledBounds[1] - unscaledBounds[0]) / (newBounds[1] - newBounds[0]);
+        double sy = (newBounds[3] == newBounds[2]) ? 1.0 : (unscaledBounds[3] - unscaledBounds[2]) / (newBounds[3] - newBounds[2]);
+        double sz = (newBounds[5] == newBounds[4]) ? 1.0 : (unscaledBounds[5] - unscaledBounds[4]) / (newBounds[5] - newBounds[4]);
+
+        setAxisBounds(newBounds);
+        setAxisScale(sx, sy, sz);
     } else {
-        double unscaledBounds[6];
-        collectUnscaledBounds(unscaledBounds, false);
-        _cubeAxesActor->SetXAxisRange(unscaledBounds[0], unscaledBounds[1]);
-        _cubeAxesActor->SetYAxisRange(unscaledBounds[2], unscaledBounds[3]);
-        _cubeAxesActor->SetZAxisRange(unscaledBounds[4], unscaledBounds[5]);
-        TRACE("Axis ranges: %g %g %g %g %g %g",
-              unscaledBounds[0],
-              unscaledBounds[1],
-              unscaledBounds[2],
-              unscaledBounds[3],
-              unscaledBounds[4],
-              unscaledBounds[5]);
-        _cubeAxesActor->SetBounds(bounds);
-        TRACE("Bounds (supplied): %g %g %g %g %g %g",
+        double sx = (bounds[1] == bounds[0]) ? 1.0 : (unscaledBounds[1] - unscaledBounds[0]) / (bounds[1] - bounds[0]);
+        double sy = (bounds[3] == bounds[2]) ? 1.0 : (unscaledBounds[3] - unscaledBounds[2]) / (bounds[3] - bounds[2]);
+        double sz = (bounds[5] == bounds[4]) ? 1.0 : (unscaledBounds[5] - unscaledBounds[4]) / (bounds[5] - bounds[4]);
+
+        setAxisBounds(bounds);
+        setAxisScale(sx, sy, sz);
+    }
+}
+
+/**
+ * \brief Explicitly set world coordinate bounds of axes
+ *
+ * This determines the region in world coordinates around which
+ * the axes are drawn
+ */
+void Renderer::setAxisBounds(double bounds[6])
+{
+    _cubeAxesActor->SetBounds(bounds);
+    TRACE("Axis bounds: %g %g %g %g %g %g",
               bounds[0],
               bounds[1],
@@ -501 +501 @@
               bounds[4],
               bounds[5]);
-    }
+}
+
+/**
+ * \brief Set scaling factors to convert world coordinates to axis 
+ * label values in X, Y, Z
+ */
+void Renderer::setAxisScale(double sx, double sy, double sz)
+{
+    double bounds[6];
+    _cubeAxesActor->GetBounds(bounds);
+    double ranges[6];
+    ranges[0] = bounds[0] * sx;
+    ranges[1] = bounds[1] * sx;
+    ranges[2] = bounds[2] * sy;
+    ranges[3] = bounds[3] * sy;
+    ranges[4] = bounds[4] * sz;
+    ranges[5] = bounds[5] * sz;
+    _cubeAxesActor->SetXAxisRange(&bounds[0]);
+    _cubeAxesActor->SetYAxisRange(&bounds[2]);
+    _cubeAxesActor->SetZAxisRange(&bounds[4]);
+    TRACE("Setting axis scale to: %g, %g, %g", sx, sy, sz);
+    TRACE("Axis ranges: %g %g %g %g %g %g",
+          ranges[0],
+          ranges[1],
+          ranges[2],
+          ranges[3],
+          ranges[4],
+          ranges[5]);
 }
 
@@ -782 +809 @@
 
 /**
+ * \brief Controls label scaling by power of 10
+ */
+void Renderer::setAxesLabelScaling(bool autoScale, int xpow, int ypow, int zpow)
+{
+    if (_cubeAxesActor != NULL) {
+        _cubeAxesActor->SetLabelScaling(autoScale, xpow, ypow, zpow);
+        _needsRedraw = true;
+    }
+}
+
+/**
+ * \brief Set axes title/label font size in pixels
+ */
+void Renderer::setAxesPixelFontSize(double screenSize)
+{
+    if (_cubeAxesActor != NULL) {
+        TRACE("Setting axes font size to: %g px", screenSize);
+        _cubeAxesActor->SetScreenSize(screenSize);
+        _needsRedraw = true;
+    }
+}
+
+/**
+ * \brief Set axis title font family
+ */
+void Renderer::setAxesTitleFont(const char *fontName)
+{
+    setAxisTitleFont(X_AXIS, fontName);
+    setAxisTitleFont(Y_AXIS, fontName);
+    setAxisTitleFont(Z_AXIS, fontName);
+}
+
+/**
+ * \brief Set axis title font size
+ */
+void Renderer::setAxesTitleFontSize(int sz)
+{
+    setAxisTitleFontSize(X_AXIS, sz);
+    setAxisTitleFontSize(Y_AXIS, sz);
+    setAxisTitleFontSize(Z_AXIS, sz);
+}
+
+/**
+ * \brief Set orientation (as rotation in degrees) of axis title
+ */
+void Renderer::setAxesTitleOrientation(double orientation)
+{
+    setAxisTitleOrientation(X_AXIS, orientation);
+    setAxisTitleOrientation(Y_AXIS, orientation);
+    setAxisTitleOrientation(Z_AXIS, orientation);
+}
+
+/**
+ * \brief Set axis label font family
+ */
+void Renderer::setAxesLabelFont(const char *fontName)
+{
+    setAxisLabelFont(X_AXIS, fontName);
+    setAxisLabelFont(Y_AXIS, fontName);
+    setAxisLabelFont(Z_AXIS, fontName);
+}
+
+/**
+ * \brief Set axis label font size
+ */
+void Renderer::setAxesLabelFontSize(int sz)
+{
+    setAxisLabelFontSize(X_AXIS, sz);
+    setAxisLabelFontSize(Y_AXIS, sz);
+    setAxisLabelFontSize(Z_AXIS, sz);
+}
+
+/**
+ * \brief Set orientation (as rotation in degrees) of axis labels
+ */
+void Renderer::setAxesLabelOrientation(double orientation)
+{
+    setAxisLabelOrientation(X_AXIS, orientation);
+    setAxisLabelOrientation(Y_AXIS, orientation);
+    setAxisLabelOrientation(Z_AXIS, orientation);
+}
+
+/**
+ * \brief Set printf style label format string
+ */
+void Renderer::setAxesLabelFormat(const char *format)
+{
+    setAxisLabelFormat(X_AXIS, format);
+    setAxisLabelFormat(Y_AXIS, format);
+    setAxisLabelFormat(Z_AXIS, format);
+}
+
+/**
  * \brief Turn on/off rendering of the specified axis
  */
@@ -929 +1049 @@
         _needsRedraw = true;
     }
-#ifdef notdef
-    if (_cubeAxesActor2D != NULL) {
+}
+
+/**
+ * \brief Set axis title font family
+ */
+void Renderer::setAxisTitleFont(Axis axis, const char *fontName)
+{
+    if (_cubeAxesActor != NULL) {
+        TRACE("Setting %d axis title font to: '%s'", axis, fontName);
+        _cubeAxesActor->GetTitleTextProperty(axis)->SetFontFamilyAsString(fontName);
+        _needsRedraw = true;
+    }
+}
+
+/**
+ * \brief Set axis title font size (and optionally pixel size)
+ */
+void Renderer::setAxisTitleFontSize(Axis axis, int sz)
+{
+    if (_cubeAxesActor != NULL) {
+        TRACE("Setting %d axis title font size to: %d", axis, sz);
+        _cubeAxesActor->GetTitleTextProperty(axis)->SetFontSize(sz);
+        _needsRedraw = true;
+    }
+}
+
+/**
+ * \brief Set orientation (as rotation in degrees) of axis titles
+ */
+void Renderer::setAxisTitleOrientation(Axis axis, double orientation)
+{
+    if (_cubeAxesActor != NULL) {
+        TRACE("Setting %d axis title orientation to: %g", axis, orientation);
+        _cubeAxesActor->GetTitleTextProperty(axis)->SetOrientation(orientation);
+        _needsRedraw = true;
+    }
+}
+
+/**
+ * \brief Set axis label font family
+ */
+void Renderer::setAxisLabelFont(Axis axis, const char *fontName)
+{
+    if (_cubeAxesActor != NULL) {
+        TRACE("Setting %d axis label font to: '%s'", axis, fontName);
+        _cubeAxesActor->GetLabelTextProperty(axis)->SetFontFamilyAsString(fontName);
+        _needsRedraw = true;
+    }
+}
+
+/**
+ * \brief Set axis label font size (and optionally pixel size)
+ */
+void Renderer::setAxisLabelFontSize(Axis axis, int sz)
+{
+    if (_cubeAxesActor != NULL) {
+        TRACE("Setting %d axis label font size to: %d", axis, sz);
+        _cubeAxesActor->GetLabelTextProperty(axis)->SetFontSize(sz);
+        _needsRedraw = true;
+    }
+}
+
+/**
+ * \brief Set orientation (as rotation in degrees) of axis labels
+ */
+void Renderer::setAxisLabelOrientation(Axis axis, double orientation)
+{
+    if (_cubeAxesActor != NULL) {
+        TRACE("Setting %d axis label orientation to: %g", axis, orientation);
+        _cubeAxesActor->GetLabelTextProperty(axis)->SetOrientation(orientation);
+        _needsRedraw = true;
+    }
+}
+
+/**
+ * \brief Set printf style label format string
+ */
+void Renderer::setAxisLabelFormat(Axis axis, const char *format)
+{
+    if (_cubeAxesActor != NULL) {
+        TRACE("Setting %d axis label format to: '%s'", axis, format);
         if (axis == X_AXIS) {
-            _cubeAxesActor2D->SetXUnits(units);
+            _cubeAxesActor->SetXLabelFormat(format);
         } else if (axis == Y_AXIS) {
-            _cubeAxesActor2D->SetYUnits(units);
+            _cubeAxesActor->SetYLabelFormat(format);
         } else if (axis == Z_AXIS) {
-            _cubeAxesActor2D->SetZUnits(units);
+            _cubeAxesActor->SetZLabelFormat(format);
         }
         _needsRedraw = true;
     }
-#endif
 }
 

branches/Rappture 1.2/packages/vizservers/vtkvis/RpVtkRenderer.h

@@ -239 +239 @@
     void setAxesColor(double color[3]);
 
+    void setAxesLabelScaling(bool autoScale, int xpow, int ypow, int zpow);
+
+    void setAxesPixelFontSize(double screenSize);
+
+    void setAxesTitleFont(const char *fontName);
+
+    void setAxesTitleFontSize(int sz);
+
+    void setAxesTitleOrientation(double orientation);
+
+    void setAxesLabelFont(const char *fontName);
+
+    void setAxesLabelFontSize(int sz);
+
+    void setAxesLabelOrientation(double orientation);
+
+    void setAxesLabelFormat(const char *format);
+
     void setAxisVisibility(Axis axis, bool state);
 
@@ -250 +268 @@
 
     void setAxisUnits(Axis axis, const char *units);
+
+    void setAxisTitleFont(Axis axis, const char *fontName);
+
+    void setAxisTitleFontSize(Axis axis, int sz);
+
+    void setAxisTitleOrientation(Axis axis, double orientation);
+
+    void setAxisLabelFont(Axis axis, const char *fontName);
+
+    void setAxisLabelFontSize(Axis axis, int sz);
+
+    void setAxisLabelOrientation(Axis axis, double orientation);
+
+    void setAxisLabelFormat(Axis axis, const char *format);
+
+    void setAxisBounds(double bounds[6]);
+
+    void setAxisScale(double sx, double sy, double sz);
 
     // Colormaps

branches/Rappture 1.2/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -675 +675 @@
 
 static int
+AxisFontSizeOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+               Tcl_Obj *const *objv)
+{
+    double screenSize;
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &screenSize)) {
+        return TCL_ERROR;
+    }
+
+    g_renderer->setAxesPixelFontSize(screenSize);
+    return TCL_OK;
+}
+
+static int
 AxisGridOp(ClientData clientData, Tcl_Interp *interp, int objc, 
            Tcl_Obj *const *objv)
@@ -694 +707 @@
     } else {
         Tcl_AppendResult(interp, "bad axis option \"", string,
-                         "\": should be axisName visible", (char*)NULL);
-        return TCL_ERROR;
-    }
+                         "\": should be axisName", (char*)NULL);
+        return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
+static int
+AxisLabelFontOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                Tcl_Obj *const *objv)
+{
+    const char *fontName = Tcl_GetString(objv[3]);
+
+    const char *string = Tcl_GetString(objv[2]);
+    char c = string[0];
+    if ((c == 'x') && (strcmp(string, "x") == 0)) {
+        g_renderer->setAxisLabelFont(X_AXIS, fontName);
+    } else if ((c == 'y') && (strcmp(string, "y") == 0)) {
+        g_renderer->setAxisLabelFont(Y_AXIS, fontName);
+    } else if ((c == 'z') && (strcmp(string, "z") == 0)) {
+        g_renderer->setAxisLabelFont(Z_AXIS, fontName);
+    } else if ((c == 'a') && (strcmp(string, "all") == 0)) {
+        g_renderer->setAxesLabelFont(fontName);
+    } else {
+        Tcl_AppendResult(interp, "bad axis option \"", string,
+                         "\": should be axisName", (char*)NULL);
+        return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
+static int
+AxisLabelFormatOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                  Tcl_Obj *const *objv)
+{
+    const char *format = Tcl_GetString(objv[3]);
+
+    const char *string = Tcl_GetString(objv[2]);
+    char c = string[0];
+    if ((c == 'x') && (strcmp(string, "x") == 0)) {
+        g_renderer->setAxisLabelFormat(X_AXIS, format);
+    } else if ((c == 'y') && (strcmp(string, "y") == 0)) {
+        g_renderer->setAxisLabelFormat(Y_AXIS, format);
+    } else if ((c == 'z') && (strcmp(string, "z") == 0)) {
+        g_renderer->setAxisLabelFormat(Z_AXIS, format);
+    } else if ((c == 'a') && (strcmp(string, "all") == 0)) {
+        g_renderer->setAxesLabelFormat(format);
+    } else {
+        Tcl_AppendResult(interp, "bad axis option \"", string,
+                         "\": should be axisName", (char*)NULL);
+        return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
+static int
+AxisLabelFontSizeOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                    Tcl_Obj *const *objv)
+{
+    int fontSize;
+    if (Tcl_GetIntFromObj(interp, objv[3], &fontSize) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    const char *string = Tcl_GetString(objv[2]);
+    char c = string[0];
+    if ((c == 'x') && (strcmp(string, "x") == 0)) {
+        g_renderer->setAxisLabelFontSize(X_AXIS, fontSize);
+    } else if ((c == 'y') && (strcmp(string, "y") == 0)) {
+        g_renderer->setAxisLabelFontSize(Y_AXIS, fontSize);
+    } else if ((c == 'z') && (strcmp(string, "z") == 0)) {
+        g_renderer->setAxisLabelFontSize(Z_AXIS, fontSize);
+    } else if ((c == 'a') && (strcmp(string, "all") == 0)) {
+        g_renderer->setAxesLabelFontSize(fontSize);
+    } else {
+        Tcl_AppendResult(interp, "bad axis option \"", string,
+                         "\": should be axisName", (char*)NULL);
+        return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
+static int
+AxisLabelOrientationOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                       Tcl_Obj *const *objv)
+{
+    double rot;
+    if (Tcl_GetDoubleFromObj(interp, objv[3], &rot) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    const char *string = Tcl_GetString(objv[2]);
+    char c = string[0];
+    if ((c == 'x') && (strcmp(string, "x") == 0)) {
+        g_renderer->setAxisLabelOrientation(X_AXIS, rot);
+    } else if ((c == 'y') && (strcmp(string, "y") == 0)) {
+        g_renderer->setAxisLabelOrientation(Y_AXIS, rot);
+    } else if ((c == 'z') && (strcmp(string, "z") == 0)) {
+        g_renderer->setAxisLabelOrientation(Z_AXIS, rot);
+    } else if ((c == 'a') && (strcmp(string, "all") == 0)) {
+        g_renderer->setAxesLabelOrientation(rot);
+    } else {
+        Tcl_AppendResult(interp, "bad axis option \"", string,
+                         "\": should be axisName", (char*)NULL);
+        return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
+static int
+AxisLabelScaleOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                 Tcl_Obj *const *objv)
+{
+    bool autoScale;
+    int xpow, ypow, zpow;
+    if (GetBooleanFromObj(interp, objv[3], &autoScale) != TCL_OK ||
+        Tcl_GetIntFromObj(interp, objv[4], &xpow) != TCL_OK ||
+        Tcl_GetIntFromObj(interp, objv[5], &ypow) != TCL_OK ||
+        Tcl_GetIntFromObj(interp, objv[6], &zpow) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    g_renderer->setAxesLabelScaling(autoScale, xpow, ypow, zpow);
     return TCL_OK;
 }
@@ -720 +851 @@
     } else {
         Tcl_AppendResult(interp, "bad axis option \"", string,
-                         "\": should be axisName visible", (char*)NULL);
+                         "\": should be axisName", (char*)NULL);
         return TCL_ERROR;
     }
@@ -793 +924 @@
         Tcl_AppendResult(interp, "bad axis option \"", string,
                          "\": should be inside, outside or both", (char*)NULL);
+        return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
+static int
+AxisTitleFontOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                Tcl_Obj *const *objv)
+{
+    const char *fontName = Tcl_GetString(objv[3]);
+
+    const char *string = Tcl_GetString(objv[2]);
+    char c = string[0];
+    if ((c == 'x') && (strcmp(string, "x") == 0)) {
+        g_renderer->setAxisTitleFont(X_AXIS, fontName);
+    } else if ((c == 'y') && (strcmp(string, "y") == 0)) {
+        g_renderer->setAxisTitleFont(Y_AXIS, fontName);
+    } else if ((c == 'z') && (strcmp(string, "z") == 0)) {
+        g_renderer->setAxisTitleFont(Z_AXIS, fontName);
+    } else if ((c == 'a') && (strcmp(string, "all") == 0)) {
+        g_renderer->setAxesTitleFont(fontName);
+    } else {
+        Tcl_AppendResult(interp, "bad axis option \"", string,
+                         "\": should be axisName", (char*)NULL);
+        return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
+static int
+AxisTitleFontSizeOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                    Tcl_Obj *const *objv)
+{
+    int fontSize;
+    if (Tcl_GetIntFromObj(interp, objv[3], &fontSize) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    const char *string = Tcl_GetString(objv[2]);
+    char c = string[0];
+    if ((c == 'x') && (strcmp(string, "x") == 0)) {
+        g_renderer->setAxisTitleFontSize(X_AXIS, fontSize);
+    } else if ((c == 'y') && (strcmp(string, "y") == 0)) {
+        g_renderer->setAxisTitleFontSize(Y_AXIS, fontSize);
+    } else if ((c == 'z') && (strcmp(string, "z") == 0)) {
+        g_renderer->setAxisTitleFontSize(Z_AXIS, fontSize);
+    } else if ((c == 'a') && (strcmp(string, "all") == 0)) {
+        g_renderer->setAxesTitleFontSize(fontSize);
+    } else {
+        Tcl_AppendResult(interp, "bad axis option \"", string,
+                         "\": should be axisName", (char*)NULL);
+        return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
+static int
+AxisTitleOrientationOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                       Tcl_Obj *const *objv)
+{
+    double rot;
+    if (Tcl_GetDoubleFromObj(interp, objv[3], &rot) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    const char *string = Tcl_GetString(objv[2]);
+    char c = string[0];
+    if ((c == 'x') && (strcmp(string, "x") == 0)) {
+        g_renderer->setAxisTitleOrientation(X_AXIS, rot);
+    } else if ((c == 'y') && (strcmp(string, "y") == 0)) {
+        g_renderer->setAxisTitleOrientation(Y_AXIS, rot);
+    } else if ((c == 'z') && (strcmp(string, "z") == 0)) {
+        g_renderer->setAxisTitleOrientation(Z_AXIS, rot);
+    } else if ((c == 'a') && (strcmp(string, "all") == 0)) {
+        g_renderer->setAxesTitleOrientation(rot);
+    } else {
+        Tcl_AppendResult(interp, "bad axis option \"", string,
+                         "\": should be axisName", (char*)NULL);
         return TCL_ERROR;
     }
@@ -822 +1030 @@
     } else {
         Tcl_AppendResult(interp, "bad axis option \"", string,
-                         "\": should be axisName units", (char*)NULL);
+                         "\": should be axisName", (char*)NULL);
         return TCL_ERROR;
     }
@@ -848 +1056 @@
     } else {
         Tcl_AppendResult(interp, "bad axis option \"", string,
-                         "\": should be axisName visible", (char*)NULL);
+                         "\": should be axisName", (char*)NULL);
         return TCL_ERROR;
     }
@@ -856 +1064 @@
 static Rappture::CmdSpec axisOps[] = {
     {"color",   1, AxisColorOp, 5, 5, "r g b"},
-    {"flymode", 1, AxisFlyModeOp, 3, 3, "mode"},
+    {"flymode", 2, AxisFlyModeOp, 3, 3, "mode"},
+    {"fontsz",  2, AxisFontSizeOp, 3, 3, "fontPixelSize"},
     {"grid",    1, AxisGridOp, 4, 4, "axis bool"},
-    {"labels",  1, AxisLabelsVisibleOp, 4, 4, "axis bool"},
+    {"labels",  2, AxisLabelsVisibleOp, 4, 4, "axis bool"},
+    {"lfont",   4, AxisLabelFontOp, 4, 4, "axis font"},
+    {"lformat", 4, AxisLabelFormatOp, 4, 4, "axis format"},
+    {"lfsize",  3, AxisLabelFontSizeOp, 4, 4, "axis fontSize"},
+    {"lrot",    2, AxisLabelOrientationOp, 4, 4, "axis rot"},
+    {"lscale",  2, AxisLabelScaleOp, 7, 7, "axis bool xpow ypow zpow"},
     {"name",    1, AxisNameOp, 4, 4, "axis title"},
-    {"tickpos", 2, AxisTickPositionOp, 3, 3, "position"},
-    {"ticks",   2, AxisTicksVisibleOp, 4, 4, "axis bool"},
+    {"tfont",   3, AxisTitleFontOp, 4, 4, "axis font"},
+    {"tfsize",  3, AxisTitleFontSizeOp, 4, 4, "axis fontSize"},
+    {"tickpos", 5, AxisTickPositionOp, 3, 3, "position"},
+    {"ticks",   5, AxisTicksVisibleOp, 4, 4, "axis bool"},
+    {"trot",    3, AxisTitleOrientationOp, 4, 4, "axis rot"},
     {"units",   1, AxisUnitsOp, 4, 4, "axis units"},
     {"visible", 1, AxisVisibleOp, 4, 4, "axis bool"}

branches/Rappture 1.2/packages/vizservers/vtkvis/protocol.txt

@@ -46 +46 @@
 axis flymode <mode>
      <mode> = static_edges|static_triad|outer_edges|furthest_triad|closest_triad
+axis fontsz <fontPixelSize>
+     Controls size of labels and text in 3D mode
 axis grid <axis> <bool>
      <axis> = x|y|z|all
@@ -51 +53 @@
      Toggle visibility of axis labels
      <axis> = x|y|z|all
+axis lfont <axis> <fontName>
+     Set label font family
+     <axis> = x|y|z|all
+     <fontName> = Arial|Courier|Times
+axis lformat <axis> <formatString>
+     <axis> = x|y|z|all
+     <formatString> = printf style format string
+axis lfsize <axis> <fontSizePts>
+     Set font size of labels in 2D mode
+     <axis> = x|y|z|all
+     <fontSizePts> = Font size in points
+axis lrot <axis> <rotation>
+     <axis> = x|y|z|all
+     <rotation> = rotation angle in degrees
+axis lscale <axis> <boolAuto> <xpow> <ypow> <zpow>
+     Control (auto-)scaling of labels with powers of 10
+     <axis> = x|y|z|all
+     <boolAuto> = Enable/disable automatic scaling with powers of 10
+     <xpow> = Explicitly set power on X axis
+     <ypow> = Explicitly set power on Y axis
+     <zpow> = Explicitly set power on Z axis
 axis name <axis> <title>
 axis tickpos <position>
@@ -58 +81 @@
      Toggle visibility of axis tick marks
      <axis> = x|y|z|all
+axis tfont <axis> <fontName>
+     Set title font family
+     <axis> = x|y|z|all
+     <fontName> = Arial|Courier|Times
+axis tfsize <axis> <fontSizePts>
+     Set font size of title in 2D mode
+     <axis> = x|y|z|all
+     <fontSizePts> = Font size in points
+axis trot <axis> <rotation>
+     <axis> = x|y|z|all
+     <rotation> = rotation angle in degrees
 axis units <axis> <units>
      Currently only supported when camera mode is not image mode