Changeset 4815

Timestamp:

Dec 2, 2014, 6:03:53 PM (10 years ago)

Author:

ldelgass

Message:

merge r4814 from trunk

Location:

vtkvis/branches/1.8

Files:

• . (modified) (1 prop)
• Renderer.h (modified) (1 diff)
• RendererCmd.cpp (modified) (2 diffs)
• RendererGraphicsObjs.cpp (modified) (1 diff)

vtkvis/branches/1.8/Renderer.h

@@ -773 +773 @@
     void setImageWindow(const DataSetId& id, double window);
 
+    void setImageSliceInterp(const DataSetId& id, bool state);
+
     void setImageSlicePlane(const DataSetId& id, double normal[3], double origin[3]);
 

vtkvis/branches/1.8/RendererCmd.cpp

@@ -7181 +7181 @@
 
 static int
+ImageSliceInterpOp(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->setImageSliceInterp(name, state);
+    } else {
+        g_renderer->setImageSliceInterp("all", state);
+    }
+    return TCL_OK;
+}
+
+static int
 ImageSlicePlaneOp(ClientData clientData, Tcl_Interp *interp, int objc, 
                   Tcl_Obj *const *objv)
@@ -7268 +7285 @@
     {"pos",          1, ImagePositionOp, 5, 6, "x y z ?dataSetName?"},
     {"scale",        2, ImageScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
+    {"sinterp",      2, ImageSliceInterpOp, 3, 4, "bool ?dataSetName?"},
     {"slice",        2, ImageSlicePlaneOp, 8, 9, "nx ny nz ox oy oz ?dataSetName?"},
     {"visible",      1, ImageVisibleOp, 3, 4, "bool ?dataSetName?"},

vtkvis/branches/1.8/RendererGraphicsObjs.cpp

@@ -2408 +2408 @@
 }
 
+void Renderer::setImageSliceInterp(const DataSetId& id, bool state)
+{
+    ImageHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _images.begin();
+        if (itr == _images.end())
+            return;
+        doAll = true;
+    } else {
+        itr = _images.find(id);
+    }
+    if (itr == _images.end()) {
+        ERROR("Image not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setJumpToNearestSlice(!state);
+    } while (doAll && ++itr != _images.end());
+
+    _needsRedraw = true;
+}
+
 void Renderer::setImageSlicePlane(const DataSetId& id, double normal[3], double origin[3])
 {