Changeset 3428 for trunk/gui/scripts/vtkheightmapviewer.tcl

Timestamp:

Mar 3, 2013, 6:19:57 PM (12 years ago)

Author:

gah

Message:

fix for sequence of contours

File:

• trunk/gui/scripts/vtkheightmapviewer.tcl (modified) (11 diffs)

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -58 +58 @@
     public method get {args}
     public method isconnected {}
-    public method limits { dataobj }
+    public method limits3 { dataobj }
     public method parameters {title args} { 
         # do nothing 
@@ -608 +608 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkHeightmapViewer::scale {args} {
-    array unset _limits
     foreach dataobj $args {
-        array set bounds [limits $dataobj]
-        foreach axis { x y v } {
-            foreach {min max} $bounds($axis) break
+        foreach axis { x y } {
+            set lim [$dataobj limits $axis]
             if { ![info exists _limits($axis)] } {
-                set _limits($axis) $bounds($axis)
+                set _limits($axis) $lim
                 continue
             }
+            foreach {min max} $lim break
             foreach {amin amax} $_limits($axis) break
             if { $amin > $min } {
@@ -625 +624 @@
             }
             set _limits($axis) [list $amin $amax]
+        }
+        foreach { fname lim } [$dataobj limits2] {
+            if { ![info exists _limits($fname)] } {
+                set _limits($fname) $lim
+                continue
+            }
+            foreach {min max} $lim break
+            foreach {fmin fmax} $_limits($fname) break
+            if { $fmin > $min } {
+                set fmin $min
+            }
+            if { $fmax < $max } {
+                set fmax $max
+            }
+            set _limits($fname) [list $fmin $fmax]
         }
     }
@@ -1610 +1624 @@
 #
 itcl::body Rappture::VtkHeightmapViewer::ResetAxes {} {
-    if { ![info exists _limits(v)] || ![info exists _fields($_curFldName)]} {
+    if { ![info exists _fields($_curFldName)]} {
         SendCmd "dataset maprange all"
         SendCmd "axis autorange z on"
@@ -1618 +1632 @@
     foreach { xmin xmax } $_limits(x) break
     foreach { ymin ymax } $_limits(y) break
-    foreach { vmin vmax } $_limits(v) break
+    foreach { vmin vmax } $_limits($_curFldName) break
     set dataRange   [expr $vmax - $vmin]
     set boundsRange [expr $xmax - $xmin]
@@ -1633 +1647 @@
     set bMin [expr $heightScale * $dataScale * $vmin]
     set bMax [expr $heightScale * $dataScale * $vmax]
-    SendCmd "dataset maprange explicit $_limits(v) $_curFldName"
+    SendCmd "dataset maprange explicit $_limits($_curFldName) $_curFldName"
     SendCmd "axis bounds z $bMin $bMax"
-    SendCmd "axis range z $_limits(v)"
+    SendCmd "axis range z $_limits($_curFldName)"
 }
 
@@ -1717 +1731 @@
 }
 
-itcl::body Rappture::VtkHeightmapViewer::limits { dataobj } {
+itcl::body Rappture::VtkHeightmapViewer::limits3 { dataobj } {
     lappend limits x [$dataobj limits x]
     lappend limits y [$dataobj limits y] 
@@ -2250 +2264 @@
 
     # Draw the isolines on the legend.
-    if { $color != "none"  && 
+    if { $color != "none"  && [info exists _limits($_curFldName)] && 
          $_settings(isolinesVisible) && $_settings(numIsolines) > 0 } {
         set pixels [blt::vector create \#auto]
@@ -2265 +2279 @@
         $pixels expr {round($pixels + $offset)}
         # Order of values is min to max.
-        foreach { vmin vmax } $_limits(v) break
+        foreach { vmin vmax } $_limits($_curFldName) break
         $values seq $vmin $vmax $_settings(numIsolines)
         set tags "isoline legend"
@@ -2281 +2295 @@
     $c bind title <Leave> [itcl::code $this Combo deactivate]
     # Reset the item coordinates according the current size of the plot.
-    if { [info exists _limits(v)] } {
-        foreach { vmin vmax } $_limits(v) break
+    if { [info exists _limits($_curFldName)] } {
+        foreach { vmin vmax } $_limits($_curFldName) break
         $c itemconfigure vmin -text [format %g $vmin]
         $c itemconfigure vmax -text [format %g $vmax]
@@ -2393 +2407 @@
 
     # Compute the value of the point
-    if { [info exists _limits(v)] } {
-        foreach { vmin vmax } $_limits(v) break
+    if { [info exists _limits($_curFldName)] } {
+        foreach { vmin vmax } $_limits($_curFldName) break
         set t [expr 1.0 - (double($iy) / double($ih-1))]
         set value [expr $t * ($vmax - $vmin) + $vmin]