Changeset 2230

Timestamp:

Apr 26, 2011 10:12:48 PM (13 years ago)

Author:

ldelgass

Message:

Add axis flymode command, use all graphics objects (including invisible) to set
the camera distance and axes bounds, so scrolling through multiple results
doesn't change camera distance. We may want to add an option to set the
camera distance by visible objects similar to the scalar range option.

Location:

trunk/packages/vizservers/vtkvis

Files:

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

trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -374 +374 @@
         }
         double bounds[6];
-        collectBounds(bounds, true);
+        collectBounds(bounds, false);
         _cubeAxesActor->SetBounds(bounds);
     }
@@ -449 +449 @@
 
 /**
+ * \brief Set Fly mode of axes
+ */
+void Renderer::setAxesFlyMode(AxesFlyMode mode)
+{
+    if (_cubeAxesActor == NULL)
+        initAxes();
+    switch (mode) {
+    case FLY_STATIC_EDGES:
+        _cubeAxesActor->SetFlyModeToStaticEdges();
+        break;
+    case FLY_STATIC_TRIAD:
+        _cubeAxesActor->SetFlyModeToStaticTriad();
+        break;
+    case FLY_OUTER_EDGES:
+        _cubeAxesActor->SetFlyModeToOuterEdges();
+        break;
+    case FLY_FURTHEST_TRIAD:
+        _cubeAxesActor->SetFlyModeToFurthestTriad();
+        break;
+    case FLY_CLOSEST_TRIAD:
+    default:
+        _cubeAxesActor->SetFlyModeToClosestTriad();
+        break;
+    }
+    _needsRedraw = true;
+}
+
+/**
  * \brief Set color of axes, ticks, labels, titles
  */
@@ -1654 +1682 @@
     camera->SetViewUp(0, 1, 0);
     camera->SetViewAngle(30);
-    _renderer->ResetCamera();
+    double bounds[6];
+    collectBounds(bounds, false);
+    _renderer->ResetCamera(bounds);
     camera->GetFocalPoint(_cameraFocalPoint);
     trans->Translate(+_cameraFocalPoint[0], +_cameraFocalPoint[1], +_cameraFocalPoint[2]);
@@ -1742 +1772 @@
         }
         camera->SetViewAngle(30);
-        _renderer->ResetCamera();
+        double bounds[6];
+        collectBounds(bounds, false);
+        _renderer->ResetCamera(bounds);
         _renderer->ResetCameraClippingRange();
         computeScreenWorldCoords();
@@ -2235 +2267 @@
 {
     double bounds[6];
-    collectBounds(bounds, true);
+    collectBounds(bounds, false);
     _imgWorldOrigin[0] = bounds[0];
     _imgWorldOrigin[1] = bounds[2];
@@ -2245 +2277 @@
 
     if (_cameraMode == IMAGE) {
-        _renderer->ResetCamera();
+        _renderer->ResetCamera(bounds);
         setCameraZoomRegion(_imgWorldOrigin[0], _imgWorldOrigin[1],
                             _imgWorldDims[0], _imgWorldDims[1]);
@@ -2252 +2284 @@
         _renderer->GetActiveCamera()->ParallelProjectionOn();
         resetAxes();
-        _renderer->ResetCamera();
+        _renderer->ResetCamera(bounds);
         computeScreenWorldCoords();
     } else if (_cameraMode == PERSPECTIVE) {
         _renderer->GetActiveCamera()->ParallelProjectionOff();
         resetAxes();
-        _renderer->ResetCamera();
+        _renderer->ResetCamera(bounds);
         computeScreenWorldCoords();
     }

trunk/packages/vizservers/vtkvis/RpVtkRenderer.h

@@ -50 +50 @@
     };
 
+    enum AxesFlyMode {
+        FLY_OUTER_EDGES = 0,
+        FLY_CLOSEST_TRIAD,
+        FLY_FURTHEST_TRIAD,
+        FLY_STATIC_EDGES,
+        FLY_STATIC_TRIAD
+    };
+
     enum CameraMode {
         PERSPECTIVE,
@@ -133 +141 @@
 
     // Axes
+
+    void setAxesFlyMode(AxesFlyMode mode);
 
     void setAxesGridVisibility(bool state);

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -70 +70 @@
     }
     g_renderer->setAxesColor(color);
+    return TCL_OK;
+}
+
+static int
+AxisFlyModeOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+              Tcl_Obj *const *objv)
+{
+    const char *string = Tcl_GetString(objv[2]);
+    char c = string[0];
+    Renderer::AxesFlyMode mode;
+    if ((c == 's') && (strcmp(string, "static_edges") == 0)) {
+        mode = Renderer::FLY_STATIC_EDGES;
+    } else if ((c == 's') && (strcmp(string, "static_triad") == 0)) {
+        mode = Renderer::FLY_STATIC_TRIAD;
+    } else if ((c == 'o') && (strcmp(string, "outer_edges") == 0)) {
+        mode = Renderer::FLY_OUTER_EDGES;
+    } else if ((c == 'f') && (strcmp(string, "furthest_triad") == 0)) {
+        mode = Renderer::FLY_FURTHEST_TRIAD;
+    } else if ((c == 'c') && (strcmp(string, "closest_triad") == 0)) {
+        mode = Renderer::FLY_CLOSEST_TRIAD;
+    } else {
+        Tcl_AppendResult(interp, "bad axis flymode option \"", string,
+                         "\": should be static_edges, static_triad, outer_edges, furthest_triad, or closest_triad", (char*)NULL);
+        return TCL_ERROR;
+    }
+    g_renderer->setAxesFlyMode(mode);
     return TCL_OK;
 }
@@ -169 +195 @@
 static Rappture::CmdSpec axisOps[] = {
     {"color",   1, AxisColorOp, 5, 5, "r g b"},
+    {"flymode", 1, AxisFlyModeOp, 3, 3, "mode"},
     {"grid",    1, AxisGridOp, 4, 4, "axis bool"},
     {"name",    1, AxisNameOp, 4, 4, "axis title"},
@@ -204 +231 @@
     } else {
         Tcl_AppendResult(interp, "bad camera mode option \"", string,
-                         "\": should be perspective, ortho or image", (char*)NULL);
+                         "\": should be persp, ortho or image", (char*)NULL);
         return TCL_ERROR;
     }

trunk/packages/vizservers/vtkvis/protocol.txt

@@ -10 +10 @@
 axis color <r> <g> <b>
      Set color of axis lines, labels, titles, ticks
+axis flymode <mode>
+     <mode> = static_edges|static_triad|outer_edges|furthest_triad|closest_triad
 axis grid <bool>
 axis name <axis> <title>