Changeset 5655 for branches/1.4

Timestamp:

Jun 4, 2015 10:46:25 AM (9 years ago)

Author:

ldelgass

Message:

merge from trunk

Location:

branches/1.4

Files:

• . (modified) (1 prop)
• gui/scripts/field.tcl (modified) (2 diffs)
• gui/scripts/flowvisviewer.tcl (modified) (2 diffs)
• gui/scripts/nanovisviewer.tcl (modified) (6 diffs)

branches/1.4/gui/scripts/field.tcl

@@ -385 +385 @@
 #
 # Returns a list {min max} representing the limits for the specified
-# axis.
+# axis over all components.
 # ----------------------------------------------------------------------
 itcl::body Rappture::Field::limits {which} {
@@ -503 +503 @@
 # USAGE: fieldlimits
 #
-# Returns a list {min max} representing the limits for the specified
-# axis.
+# This method is for use with VTK components that have multiple fields.
+# It really makes no sense to have multiple fields in a field, but this
+# is here until we add a proper dataset object to hold multiple fields.
+#
+# Returns an array mapping fieldname => list {min max} representing the
+# limits over all components for the given fieldname.  This assumes that
+# all components have the same set of fields.
 # ----------------------------------------------------------------------
 itcl::body Rappture::Field::fieldlimits {} {

branches/1.4/gui/scripts/flowvisviewer.tcl

@@ -989 +989 @@
     }
 
+    if {$tag == "" || ![info exists _dataset2style($tag)]} {
+        return
+    }
     # Display the markers used by the current transfer function.
     set tf $_dataset2style($tag)
@@ -998 +1001 @@
     $c coords vmax [expr {$w-$lx}] $ly
 
+    if { $_first == "" } {
+        return
+    }
     set title [$_first hints label]
     set units [$_first hints units]

branches/1.4/gui/scripts/nanovisviewer.tcl

@@ -779 +779 @@
     # Display the markers used by the current transfer function.
     HideAllMarkers
+    if {$cname == "" || ![info exists _transferFunctionEditors($cname)]} {
+        return
+    }
     $_transferFunctionEditors($cname) showMarkers $_limits($cname)
 
@@ -788 +791 @@
     $c coords vmax [expr {$w-$lx}] $ly
 
+    if { $_first == "" } {
+        return
+    }
     set title [$_first hints label]
     set units [$_first hints units]
@@ -795 +801 @@
     $c itemconfigure title -text $title
     $c coords title [expr {$w/2}] $ly
-
-    # The colormap may have changed. Resync the slicers with the colormap.
-    InitSettings -cutplanesvisible -xcutplanevisible -ycutplanevisible \
-        -zcutplanevisible
 }
 
@@ -906 +908 @@
                 SendData $data
                 set _datasets($tag) 1
-            }
-            SetObjectStyle $dataobj $cname
+                SetObjectStyle $dataobj $cname
+            }
             if { [info exists _obj2ovride($dataobj-raise)] } {
                 SendCmd "volume state 1 $tag"
@@ -913 +915 @@
         }
     }
-    # Outline seems to need to be reset every update.
-    InitSettings -outlinevisible -cutplanesvisible
+
+    # Turn off cutplanes for all volumes
+    foreach axis {x y z} {
+        SendCmd "cutplane state 0 $axis"
+    }
+
+    InitSettings -outlinevisible -cutplanesvisible \
+        -xcutplanevisible -ycutplanevisible -zcutplanevisible \
+        -xcutplaneposition -ycutplaneposition -zcutplaneposition
+
     if { $_reset } {
-        # Turn off cutplanes for all volumes
-        foreach axis {x y z} {
-            SendCmd "cutplane state 0 $axis"
-        }
-
         InitSettings -axesvisible -gridvisible \
-            -light2side -isosurfaceshading -opacity \
+            -opacity -light2side -isosurfaceshading \
             -light \
-            -xcutplanevisible -ycutplanevisible -zcutplanevisible \
             -current
 
@@ -960 +964 @@
         updateTransferFunctions
     }
+
     # Actually write the commands to the server socket.  If it fails, we don't
     # care.  We're finished here.