Changeset 3894 for branches

Timestamp:

Aug 26, 2013, 11:49:42 AM (11 years ago)

Author:

ldelgass

Message:

Sync mergeinfo and merge field fix from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/field.tcl (modified) (5 diffs)
• packages/vizservers/nanovis/Command.cpp (modified) (1 diff)
• packages/vizservers/nanovis/Volume.cpp (modified) (1 diff)
• packages/vizservers/nanovis/Volume.h (modified) (2 diffs)
• packages/vizservers/nanovis/VolumeRenderer.cpp (modified) (1 diff)

branches/1.3/gui/scripts/field.tcl

@@ -763 +763 @@
             global env
             if { [info exists env(VTKVOLUME)] } {
-                set viewer "vtkvolume"
-                if { $viewer != "" } {
-                    set _viewer $viewer
-                }
+                set _viewer "vtkvolume"
             } 
             set type "opendx"
@@ -772 +769 @@
             global env
             if { [info exists env(VTKVOLUME)] } {
-                set viewer "vtkvolume"
-                if { $viewer != "" } {
-                    set _viewer $viewer
-                }
+                set _viewer "vtkvolume"
             }
             set type "dx"
@@ -872 +866 @@
             # off to the NanoVis visualizer.
             #
-            set _viewer "nanovis"
+            set viewer [$_field get "about.view"]
+            if { $viewer != "" } {
+                set _viewer $viewer
+            }
+            if { $_viewer == "" } {
+                set _viewer "nanovis"
+            }
             set _dim 3
             set _comp2dims($cname) "3D"
-            if 0 {
+            if { $_viewer != "nanovis" } {
                 set vtkdata  [$_field get -decode yes $cname.$type]
                 if { $vtkdata == "" } {
@@ -881 +881 @@
                     continue;               # Ignore this component
                 }
+                if 0 {
+                    set f [open /tmp/$_path.$cname.dx "w"]
+                    puts -nonewline $f $vtkdata
+                    close $f
+                }
                 set vtkdata  [Rappture::DxToVtk $vtkdata]
                 if 0 {
                     set f [open /tmp/$_path.$cname.vtk "w"]
-                    puts $f $vtkdata
+                    puts -nonewline $f $vtkdata
                     close $f
                 }
@@ -898 +903 @@
                 set _type "dx"
                 set _comp2dx($cname) $contents
-            }
-            set viewer [$_field get "about.view"]
-            if { $viewer != "" } {
-                set _viewer $viewer
             }
             set _comp2style($cname) [$_field get $cname.style]

branches/1.3/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 - 3, objv + 3, &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);

branches/1.3/packages/vizservers/nanovis/Volume.cpp

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

branches/1.3/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
 

branches/1.3/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;
             }