Changeset 3883

Timestamp:

Aug 22, 2013, 7:30:02 PM (11 years ago)

Author:

ldelgass

Message:

Add cutplane visibility flag to nanovis. Will be used to add cutplanes button
in client

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (1 diff)
• Volume.cpp (modified) (1 diff)
• Volume.h (modified) (2 diffs)
• VolumeRenderer.cpp (modified) (1 diff)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -766 +766 @@
 }
 
+static int
+CutplaneVisibleOp(ClientData clientData, Tcl_Interp *interp, int objc,
+                  Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+
+    std::vector<Volume *> ivol;
+    if (GetVolumes(interp, objc - 4, objv + 4, &ivol) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    std::vector<Volume *>::iterator iter;
+    for (iter = ivol.begin(); iter != ivol.end(); iter++) {
+        (*iter)->cutplanesVisible(state);
+    }
+    return TCL_OK;
+}
+
 static Rappture::CmdSpec cutplaneOps[] = {
     {"position", 1, CutplanePositionOp, 4, 0, "relval axis ?indices?",},
     {"state",    1, CutplaneStateOp,    4, 0, "bool axis ?indices?",},
+    {"visible",  1, CutplaneVisibleOp,  3, 0, "bool ?indices?",},
 };
 static int nCutplaneOps = NumCmdSpecs(cutplaneOps);

trunk/packages/vizservers/nanovis/Volume.cpp

@@ -48 +48 @@
     _numComponents(n),
     _nonZeroMin(nonZeroMin),
+    _cutplanesVisible(true),
     _tex(NULL),
     _position(0,0,0),

trunk/packages/vizservers/nanovis/Volume.h

@@ -155 +155 @@
     void disableCutplane(int index);
 
+    void cutplanesVisible(bool state)
+    {
+        _cutplanesVisible = state;
+    }
+
+    bool cutplanesVisible() const
+    {
+        return _cutplanesVisible;
+    }
+
     void setCutplanePosition(int index, float location);
 
@@ -387 +397 @@
     double _nonZeroMin;
 
+    bool _cutplanesVisible;
     std::vector<CutPlane> _plane; ///< cut planes
 

trunk/packages/vizservers/nanovis/VolumeRenderer.cpp

@@ -281 +281 @@
 
         for (int j = 0; j < volume->getCutplaneCount(); j++) {
-            if (!volume->isCutplaneEnabled(j)) {
+            if (!volume->cutplanesVisible() || !volume->isCutplaneEnabled(j)) {
                 continue;
             }