Changeset 4494 for branches/1.3/gui/scripts/field.tcl

Timestamp:

Jul 13, 2014, 10:12:30 PM (10 years ago)

Author:

ldelgass

Message:

merge flow fixes from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/field.tcl (modified) (16 diffs)

branches/1.3/gui/scripts/field.tcl

@@ -157 +157 @@
 
     private method VerifyVtkDataSet { contents } 
+    private method VectorLimits { vector vectorsize {comp -1} }
     private variable _values ""
 }
@@ -317 +318 @@
     }
     if {[info exists _comp2dx($cname)]} {
-        return ""  ;# no mesh -- it's embedded in the value data
+        return ""  ;# no mesh -- it's embedded in the blob data
     }
     if {[info exists _comp2mesh($cname)]} {
@@ -461 +462 @@
             }
             2D - 3D {
-                if {[info exists _comp2unirect3d($cname)]} {
-                    set limits [$_comp2unirect3d($cname) limits $which]
-                    foreach {axisMin axisMax} $limits break
-                    set axis v
-                } elseif {[info exists _comp2limits($cname)]} {
+                if {[info exists _comp2limits($cname)]} {
                     array set limits $_comp2limits($cname) 
                     switch -- $which {
@@ -1248 +1245 @@
     set numArrays [$dataAttrs GetNumberOfArrays]
     if { $numArrays > 0 } {
-        set array [$dataAttrs GetArray 0]
-        # Calling GetRange with component set to -1 will return 
-        # either the scalar range or vector magnitude range
-        foreach {vmin vmax} [$array GetRange -1] break
-
         for {set i 0} {$i < [$dataAttrs GetNumberOfArrays] } {incr i} {
             set array [$dataAttrs GetArray $i]
             set fname  [$dataAttrs GetArrayName $i]
             foreach {min max} [$array GetRange -1] break
+            if {$i == 0} {
+                set vmin $min
+                set vmax $max
+            }
             lappend limits $fname [list $min $max]
             set _fld2Units($fname) ""
@@ -1397 +1393 @@
             set vectorsize 1 
         }
+        set _type unirect3d
         set _dim 3
         if { $_viewer == "" } {
@@ -1405 +1402 @@
             [Rappture::Unirect3d \#auto $_xmlobj $_field $cname $vectorsize]
         set _comp2style($cname) [$_field get $cname.style]
+        set limits {}
+        foreach axis { x y z } {
+            lappend limits $axis [$_comp2unirect3d($cname) limits $axis]
+        }
+        # Get the data limits 
+        set vector [$_comp2unirect3d($cname) valuesObj]
+        set minmax [VectorLimits $vector $vectorsize]
+        lappend limits $cname $minmax
+        lappend limits v      $minmax
+        set _comp2limits($cname) $limits
         if {[$_field element $cname.flow] != ""} {
             set _comp2flowhints($cname) \
@@ -1419 +1426 @@
             set vectorsize 1 
         }
+        set _type unirect2d
         set _dim 2
         if { $_viewer == "" } {
@@ -1436 +1444 @@
         set xv [blt::vector create \#auto]
         $xv set $_values
-        lappend limits $cname [$xv limits]
-        lappend limits v [$xv limits]
+        set minmax [VectorLimits $xv $vectorsize]
+        lappend limits $cname $minmax
+        lappend limits v $minmax
         blt::vector destroy $xv
         set _comp2limits($cname) $limits
@@ -1446 +1455 @@
         "cloud" {
             set mesh [Rappture::Cloud::fetch $_xmlobj $path]
+            set _type cloud
         }
         "mesh" {
             set mesh [Rappture::Mesh::fetch $_xmlobj $path]
+            set _type mesh
         }           
         "unirect2d" {
@@ -1455 +1466 @@
             }
             set mesh [Rappture::Unirect2d::fetch $_xmlobj $path]
+            set _type unirect2d
         }
     }
@@ -1504 +1516 @@
     if {$_dim == 2} {
         # 2D data: By default surface or contour plot using heightmap widget.
-        set _type "heightmap"
         set v [blt::vector create \#auto]
         $v set [$_field get $cname.values]
@@ -1536 +1547 @@
         set _comp2mesh($cname) [list $mesh $v]
         set _comp2style($cname) [$_field get $cname.style]
+        if {[$_field element $cname.flow] != ""} {
+            set _comp2flowhints($cname) \
+                [Rappture::FlowHints ::\#auto $_field $cname $_units]
+        }
         incr _counter
         array unset _comp2limits $cname
@@ -1541 +1556 @@
             lappend _comp2limits($cname) $axis [$mesh limits $axis]
         }
-        lappend _comp2limits($cname) $cname [$v limits]
-        lappend _comp2limits($cname) v [$v limits]
+        set minmax [VectorLimits $v $_comp2size($cname)]
+        lappend _comp2limits($cname) $cname $minmax
+        lappend _comp2limits($cname) v $minmax
         return 1
     } 
@@ -1550 +1566 @@
             set _viewer "isosurface"
         }
-        set _type "isosurface"
         set v [blt::vector create \#auto]
         $v set [$_field get $cname.values]
@@ -1579 +1594 @@
         set _comp2mesh($cname) [list $mesh $v]
         set _comp2style($cname) [$_field get $cname.style]
+        if {[$_field element $cname.flow] != ""} {
+            set _comp2flowhints($cname) \
+                [Rappture::FlowHints ::\#auto $_field $cname $_units]
+        }
         incr _counter
         foreach axis { x y z } {
             lappend _comp2limits($cname) $axis [$mesh limits $axis]
         }
-        lappend _comp2limits($cname) $cname [$v limits]
-        lappend _comp2limits($cname) v [$v limits]
+        set minmax [VectorLimits $v $_comp2size($cname)]
+        lappend _comp2limits($cname) $cname $minmax
+        lappend _comp2limits($cname) v $minmax
         return 1
     }
@@ -1663 +1683 @@
     }
 }
+
+#
+# Compute the per-component limits or limits of vector magnitudes
+#
+itcl::body Rappture::Field::VectorLimits {vector vectorsize {comp -1}} {
+    if {$vectorsize == 1} {
+        set minmax [$vector limits]
+    } else {
+        set len [$vector length]
+        if {[expr $len % $vectorsize] != 0} {
+            error "Invalid vectorsize: $vectorsize"
+        }
+        if {$comp > $vectorsize-1} {
+            error "Invalid vector component: $comp"
+        }
+        set numTuples [expr ($len/$vectorsize)]
+        for {set i 0} {$i < $numTuples} {incr i} {
+            if {$comp >= 0} {
+                set idx [expr ($i * $vectorsize + $comp)]
+                set val [$vector index $idx]
+            } else {
+                set idx [expr ($i * $vectorsize)]
+                set mag 0
+                for {set j 0} {$j < $vectorsize} {incr j} {
+                    set val [$vector index $idx]
+                    set mag [expr ($mag + $val * $val)]
+                    incr idx
+                }
+                set val [expr (sqrt($mag))]
+            }
+            if (![info exists minmax]) {
+                set minmax [list $val $val]
+            } else {
+                if {$val < [lindex $minmax 0]} {
+                    lset minmax 0 $val
+                }
+                if {$val > [lindex $minmax 1]} {
+                    lset minmax 1 $val
+                }
+            }
+        }
+    }
+    return $minmax
+}