Changeset 4089 for trunk/packages/vizservers/vtkvis

Timestamp:

Dec 18, 2013 2:24:13 PM (10 years ago)

Author:

ldelgass

Message:

Add window/level commands for imgcutplane

Location:

trunk/packages/vizservers/vtkvis

Files:

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

trunk/packages/vizservers/vtkvis/Renderer.h

@@ -780 +780 @@
     void setImageCutplaneSliceVisibility(const DataSetId& id, Axis axis, bool state);
 
+    void setImageCutplaneLevel(const DataSetId& id, double level);
+
+    void setImageCutplaneWindow(const DataSetId& id, double window);
+
     // Lines
 

trunk/packages/vizservers/vtkvis/RendererCmd.cpp

@@ -7178 +7178 @@
 
 static int
+ImageCutplaneLevelOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                     Tcl_Obj *const *objv)
+{
+    double level;
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &level) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setImageCutplaneLevel(name, level);
+    } else {
+        g_renderer->setImageCutplaneLevel("all", level);
+    }
+    return TCL_OK;
+}
+
+static int
 ImageCutplaneMaterialOp(ClientData clientData, Tcl_Interp *interp, int objc, 
                         Tcl_Obj *const *objv)
@@ -7369 +7386 @@
 }
 
+static int
+ImageCutplaneWindowOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                      Tcl_Obj *const *objv)
+{
+    double window;
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &window) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setImageCutplaneWindow(name, window);
+    } else {
+        g_renderer->setImageCutplaneWindow("all", window);
+    }
+    return TCL_OK;
+}
+
 static CmdSpec imageCutplaneOps[] = {
     {"add",          2, ImageCutplaneAddOp, 2, 3, "?dataSetName?"},
@@ -7375 +7409 @@
     {"colormap",     6, ImageCutplaneColorMapOp, 3, 4, "colorMapName ?dataSetName?"},
     {"delete",       1, ImageCutplaneDeleteOp, 2, 3, "?dataSetName?"},
+    {"level",        1, ImageCutplaneLevelOp, 3, 4, "level ?dataSetName?"},
     {"material",     1, ImageCutplaneMaterialOp, 4, 5, "ambientCoeff diffuseCoeff ?dataSetName?"},
     {"opacity",      2, ImageCutplaneOpacityOp, 3, 4, "value ?dataSetName?"},
@@ -7382 +7417 @@
     {"scale",        2, ImageCutplaneScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
     {"slice",        2, ImageCutplaneVolumeSliceOp, 4, 5, "axis ratio ?dataSetName?"},
-    {"visible",      1, ImageCutplaneVisibleOp, 3, 4, "bool ?dataSetName?"}
+    {"visible",      1, ImageCutplaneVisibleOp, 3, 4, "bool ?dataSetName?"},
+    {"window",       1, ImageCutplaneWindowOp, 3, 4, "window ?dataSetName?"}
 };
 static int nImageCutplaneOps = NumCmdSpecs(imageCutplaneOps);

trunk/packages/vizservers/vtkvis/RendererGraphicsObjs.cpp

@@ -2496 +2496 @@
 }
 
+void Renderer::setImageCutplaneLevel(const DataSetId& id, double level)
+{
+    ImageCutplaneHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _imageCutplanes.begin();
+        if (itr == _imageCutplanes.end())
+            return;
+        doAll = true;
+    } else {
+        itr = _imageCutplanes.find(id);
+    }
+    if (itr == _imageCutplanes.end()) {
+        ERROR("Image not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setLevel(level);
+    } while (doAll && ++itr != _imageCutplanes.end());
+
+    _needsRedraw = true;
+}
+
+void Renderer::setImageCutplaneWindow(const DataSetId& id, double window)
+{
+    ImageCutplaneHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _imageCutplanes.begin();
+        if (itr == _imageCutplanes.end())
+            return;
+        doAll = true;
+    } else {
+        itr = _imageCutplanes.find(id);
+    }
+    if (itr == _imageCutplanes.end()) {
+        ERROR("Image not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setWindow(window);
+    } while (doAll && ++itr != _imageCutplanes.end());
+
+    _needsRedraw = true;
+}
+
 /**
  * \brief Create a new Line and associate it with an ID