Changeset 4783 for vtkvis/branches/1.7/RendererCmd.cpp

Timestamp:

Nov 23, 2014 7:40:56 PM (8 years ago)

Author:

ldelgass

Message:

Merge some changes from trunk, including 2 new (currently unused) commands for
the image (slice) object

File:

• vtkvis/branches/1.7/RendererCmd.cpp (modified) (10 diffs)

vtkvis/branches/1.7/RendererCmd.cpp

@@ -2077 +2077 @@
     Renderer::Aspect aspect;
     const char *string = Tcl_GetString(objv[2]);
-    if ((strcmp(string, "native") == 0)) {
+    if (string[0] == 'n' && (strcmp(string, "native") == 0)) {
         aspect = Renderer::ASPECT_NATIVE;
-    } else if ((strcmp(string, "square") == 0)) {
+    } else if (string[0] == 's' && (strcmp(string, "square") == 0)) {
         aspect = Renderer::ASPECT_SQUARE;
-    } else if ((strcmp(string, "window") == 0)) {
+    } else if (string[0] == 'w' && (strcmp(string, "window") == 0)) {
         aspect = Renderer::ASPECT_WINDOW;
     } else {
@@ -2098 +2098 @@
     Renderer::CameraMode mode;
     const char *string = Tcl_GetString(objv[2]);
-    if ((strcmp(string, "persp") == 0)) {
+    if (string[0] == 'p' && (strcmp(string, "persp") == 0)) {
         mode = Renderer::PERSPECTIVE;
-    } else if ((strcmp(string, "ortho") == 0)) {
+    } else if (string[0] == 'o' && (strcmp(string, "ortho") == 0)) {
         mode = Renderer::ORTHO;
-    } else if ((strcmp(string, "image") == 0)) {
+    } else if (string[0] == 'i' && (strcmp(string, "image") == 0)) {
         mode = Renderer::IMAGE;
     } else {
@@ -2283 +2283 @@
 
 static CmdSpec cameraOps[] = {
-    {"aspect", 1, CameraAspectOp, 3, 3, "aspect"},
-    {"get",    1, CameraGetOp, 2, 2, ""},
-    {"mode",   1, CameraModeOp, 3, 3, "mode"},
-    {"orient", 3, CameraOrientOp, 6, 6, "qw qx qy qz"},
-    {"ortho",  1, CameraOrthoOp, 7, 7, "coordMode x y width height"},
-    {"pan",    1, CameraPanOp, 4, 4, "panX panY"},
-    {"reset",  2, CameraResetOp, 2, 3, "?all?"},
-    {"rotate", 2, CameraRotateOp, 5, 5, "angle angle angle"},
-    {"set",    1, CameraSetOp, 11, 11, "posX posY posZ focalPtX focalPtY focalPtZ viewUpX viewUpY viewUpZ"},
-    {"zoom",   1, CameraZoomOp, 3, 3, "zoomAmount"}
+    {"aspect",  1, CameraAspectOp, 3, 3, "aspect"},
+    {"get",     1, CameraGetOp, 2, 2, ""},
+    {"mode",    1, CameraModeOp, 3, 3, "mode"},
+    {"orient",  3, CameraOrientOp, 6, 6, "qw qx qy qz"},
+    {"ortho",   3, CameraOrthoOp, 7, 7, "coordMode x y width height"},
+    {"pan",     1, CameraPanOp, 4, 4, "panX panY"},
+    {"reset",   2, CameraResetOp, 2, 3, "?all?"},
+    {"rotate",  2, CameraRotateOp, 5, 5, "angle angle angle"},
+    {"set",     1, CameraSetOp, 11, 11, "posX posY posZ focalPtX focalPtY focalPtZ viewUpX viewUpY viewUpZ"},
+    {"zoom",    1, CameraZoomOp, 3, 3, "zoomAmount"}
 };
 static int nCameraOps = NumCmdSpecs(cameraOps);
@@ -2485 +2485 @@
     if (Tcl_GetIntFromObj(interp, objv[2], &numEntries) != TCL_OK) {
         const char *str = Tcl_GetString(objv[2]);
-        if (strcmp(str, "default") == 0) {
+        if (str[0] == 'd' && strcmp(str, "default") == 0) {
             numEntries = -1;
         } else {
@@ -4831 +4831 @@
 {
     const char *value = Tcl_GetString(objv[2]);
-    if (strcmp(value, "all") == 0) {
+    if (value[0] == 'a' && strcmp(value, "all") == 0) {
         g_renderer->setUseCumulativeDataRange(true);
-    } else if (strcmp(value, "explicit") == 0) {
+    } else if (value[0] == 'e' && strcmp(value, "explicit") == 0) {
         if (objc < 6 || objc > 9) {
             Tcl_AppendResult(interp, "wrong number of arguments for explicit maprange", (char*)NULL);
@@ -4850 +4850 @@
         if (objc > 6) {
             const char *fieldType = Tcl_GetString(objv[6]);
-            if (strcmp(fieldType, "point_data") == 0) {
+            if (fieldType[0] == 'p' && strcmp(fieldType, "point_data") == 0) {
                 type = DataSet::POINT_DATA;
-            } else if (strcmp(fieldType, "cell_data") == 0) {
+            } else if (fieldType[0] == 'c' && strcmp(fieldType, "cell_data") == 0) {
                 type = DataSet::CELL_DATA;
-            } else if (strcmp(fieldType, "field_data") == 0) {
+            } else if (fieldType[0] == 'f' && strcmp(fieldType, "field_data") == 0) {
                 type = DataSet::FIELD_DATA;
             } else {
@@ -4873 +4873 @@
         }
         g_renderer->setCumulativeDataRange(range, fieldName, type, numComponents, component);
-    } else if (strcmp(value, "separate") == 0) {
+    } else if (value[0] == 's' && strcmp(value, "separate") == 0) {
         g_renderer->setUseCumulativeDataRange(false);
-    } else if (strcmp(value, "visible") == 0) {
+    } else if (value[0] == 'v' && strcmp(value, "visible") == 0) {
         g_renderer->setUseCumulativeDataRange(true, true);
     } else {
@@ -6937 +6937 @@
 
 static int
+ImageFollowCameraOp(ClientData clientData, Tcl_Interp *interp, int objc,
+                    Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setImageSliceFollowsCamera(name, state);
+    } else {
+        g_renderer->setImageSliceFollowsCamera("all", state);
+    }
+    return TCL_OK;
+}
+
+static int
 ImageLevelOp(ClientData clientData, Tcl_Interp *interp, int objc, 
              Tcl_Obj *const *objv)
@@ -7024 +7041 @@
     } else {
         g_renderer->setGraphicsObjectScale<Image>("all", scale);
+    }
+    return TCL_OK;
+}
+
+static int
+ImageSlicePlaneOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                  Tcl_Obj *const *objv)
+{
+    double normal[3], origin[3];
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &normal[0]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &normal[1]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &normal[2]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[5], &origin[0]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[6], &origin[1]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[7], &origin[2]) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[8]);
+        g_renderer->setImageSlicePlane(name, normal, origin);
+    } else {
+        g_renderer->setImageSlicePlane("all", normal, origin);
     }
     return TCL_OK;
@@ -7088 +7127 @@
     {"delete",       1, ImageDeleteOp, 2, 3, "?dataSetName?"},
     {"extents",      1, ImageExtentsOp, 8, 9, "xmin xmax ymin ymax zmin zmax ?dataSetName?"},
+    {"follow",       1, ImageFollowCameraOp, 3, 4, "bool ?dataSetName?"},
     {"level",        1, ImageLevelOp, 3, 4, "val ?dataSetName?"},
     {"opacity",      2, ImageOpacityOp, 3, 4, "value ?dataSetName?"},
     {"orient",       2, ImageOrientOp, 6, 7, "qw qx qy qz ?dataSetName?"},
     {"pos",          1, ImagePositionOp, 5, 6, "x y z ?dataSetName?"},
-    {"scale",        1, ImageScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
+    {"scale",        2, ImageScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
+    {"slice",        2, ImageSlicePlaneOp, 8, 9, "nx ny nz ox oy oz ?dataSetName?"},
     {"visible",      1, ImageVisibleOp, 3, 4, "bool ?dataSetName?"},
     {"window",       1, ImageWindowOp, 3, 4, "val ?dataSetName?"},