Changeset 2115 for trunk/packages

Timestamp:

Mar 2, 2011, 8:03:02 AM (13 years ago)

Author:

ldelgass

Message:

Add option to change color of axes. Install files owner writable to allow
rebuild/reinstall.

Location:

trunk/packages/vizservers/vtkvis

Files:

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

trunk/packages/vizservers/vtkvis/Makefile.in

@@ -18 +18 @@
 
 INSTALL         = @INSTALL@
-INSTALL_PROGRAM = ${INSTALL} -m 555
-INSTALL_DATA    = ${INSTALL} -m 444
-INSTALL_SCRIPT  = ${INSTALL} -m 444
+INSTALL_PROGRAM = ${INSTALL} -m 0755
+INSTALL_DATA    = ${INSTALL} -m 0644
+INSTALL_SCRIPT  = ${INSTALL} -m 0644
 MKDIR_P         = @MKDIR_P@
 

trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -24 +24 @@
 #include <vtkPolyDataMapper.h>
 #include <vtkProperty.h>
+#include <vtkProperty2D.h>
 #include <vtkPointData.h>
 #include <vtkLookupTable.h>
@@ -319 +320 @@
         _cubeAxesActor2D = vtkSmartPointer<vtkCubeAxesActor2D>::New();
 #endif
+
     _cubeAxesActor2D->SetCamera(_renderer->GetActiveCamera());
     _cubeAxesActor2D->ZAxisVisibilityOff();
@@ -364 +366 @@
         if (!_renderer->HasViewProp(_cubeAxesActor))
             _renderer->AddActor(_cubeAxesActor);
+    }
+}
+
+/**
+ * \brief Set color of axes, ticks, labels, titles
+ */
+void Renderer::setAxesColor(double color[3])
+{
+    if (_cubeAxesActor != NULL) {
+        _cubeAxesActor->GetProperty()->SetColor(color);
+        _needsRedraw = true;
+    }
+    if (_cubeAxesActor2D != NULL) {
+        _cubeAxesActor2D->GetProperty()->SetColor(color);
+#ifdef USE_CUSTOM_AXES
+        _cubeAxesActor2D->GetXAxisActor2D()->GetTitleTextProperty()->SetColor(color);
+        _cubeAxesActor2D->GetXAxisActor2D()->GetLabelTextProperty()->SetColor(color);
+        _cubeAxesActor2D->GetYAxisActor2D()->GetTitleTextProperty()->SetColor(color);
+        _cubeAxesActor2D->GetYAxisActor2D()->GetLabelTextProperty()->SetColor(color);
+#else
+        _cubeAxesActor2D->GetAxisTitleTextProperty()->SetColor(color);
+        _cubeAxesActor2D->GetAxisLabelTextProperty()->SetColor(color);
+#endif
+        _needsRedraw = true;
     }
 }

trunk/packages/vizservers/vtkvis/RpVtkRenderer.h

@@ -119 +119 @@
 
     void setAxesVisibility(bool state);
+
+    void setAxesColor(double color[3]);
 
     void setAxisGridVisibility(Axis axis, bool state);

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -56 +56 @@
     }
     *valuePtr = (float)value;
+    return TCL_OK;
+}
+
+static int
+AxisColorOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+            Tcl_Obj *const *objv)
+{
+    double color[3];
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &color[0]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &color[1]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &color[2]) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    g_renderer->setAxesColor(color);
     return TCL_OK;
 }
@@ -154 +168 @@
 
 static Rappture::CmdSpec axisOps[] = {
+    {"color", 1, AxisColorOp, 5, 5, "r g b"},
     {"grid", 1, AxisGridOp, 4, 4, "axis bool"},
     {"name", 1, AxisNameOp, 4, 4, "axis title"},

trunk/packages/vizservers/vtkvis/protocol.txt

@@ -8 +8 @@
 screen size <width> <height>
 
+axis color <r> <g> <b>
+     Set color of axis lines, labels, titles, ticks
 axis grid <bool>
 axis name <axis> <title>