Changeset 5457 for branches/1.3

Timestamp:

May 7, 2015, 4:13:49 AM (9 years ago)

Author:

ldelgass

Message:

fix mismerge issue in flowvis

Location:

branches/1.3/gui/scripts

Files:

• field.tcl (modified) (2 diffs)
• flowvisviewer.tcl (modified) (1 diff)

branches/1.3/gui/scripts/field.tcl

@@ -1142 +1142 @@
 # extents --
 #
-# Returns if the field is a unirect2d object.
+# Returns the extents of the named component
 #
 itcl::body Rappture::Field::extents {{cname -overall}} {
@@ -1148 +1148 @@
         set max 0
         foreach cname [$_field children -type component] {
-            if { ![info exists _comp2unirect3d($cname)] &&
-                 ![info exists _comp2extents($cname)] } {
+            if { ![info exists _comp2extents($cname)] } {
                 continue
             }

branches/1.3/gui/scripts/flowvisviewer.tcl

@@ -1102 +1102 @@
     set dataobj [lindex $parts 0]
     set _serverDatasets($tag) 0
-    set _limits($tag-min)  $values(min);  # Minimum value of the volume.
-    set _limits($tag-max)  $values(max);  # Maximum value of the volume.
+    set _limits($tag-min)  $info(min);  # Minimum value of the volume.
+    set _limits($tag-max)  $info(max);  # Maximum value of the volume.
 
     unset _recvdDatasets($tag)