Changeset 3440 for trunk/gui

Timestamp:

Mar 4, 2013 6:51:12 AM (11 years ago)

Author:

gah

Message:

reassert outline on/off after every rebuild

Location:

trunk/gui/scripts

Files:

• nanovisviewer.tcl (modified) (3 diffs)
• vtkisosurfaceviewer.tcl (modified) (4 diffs)

trunk/gui/scripts/nanovisviewer.tcl

@@ -861 +861 @@
         DoResize
         if { $_reportClientInfo }  {
-            # Tell the server the name of the tool, the version, and
-            # dataset that we are rendering.  Have to do it here because
-            # we don't know what data objects are using the renderer until
-            # be get here.
             global env
 
@@ -936 +932 @@
         PanCamera
         SendCmd "camera zoom $_view(zoom)"
-        InitSettings light2side light transp isosurface grid axes outline
+        InitSettings light2side light transp isosurface grid axes 
         
         foreach axis {x y z} {
@@ -953 +949 @@
         }
     }
+    # Outline seems to need to be reset every update.
+    InitSettings outline
     # nothing to send -- activate the proper ivol
     SendCmd "volume state 0"

trunk/gui/scripts/vtkisosurfaceviewer.tcl

@@ -664 +664 @@
 itcl::body Rappture::VtkIsosurfaceViewer::scale { args } {
     foreach dataobj $args {
-        set string [limits $dataobj]
-        if { $string == "" } {
-            continue
-        }
-        array set lim $string
-        foreach axis { x y z v } {
-            set min ${axis}min
-            set max ${axis}max
-            if {![info exists _limits($min)] || $_limits($min) > $lim($min)} {
-                set _limits($min) $lim($min)
-            }
-            if {![info exists _limits($max)] || $_limits($max) < $lim($max)} {
-                set _limits($max) $lim($max)
-            }
-        }
+        foreach axis { x y z } {
+            set lim [$dataobj limits $axis]
+            if { ![info exists _limits($axis)] } {
+                set _limits($axis) $lim
+                continue
+            }
+            foreach {min max} $lim break
+            foreach {amin amax} $_limits($axis) break
+            if { $amin > $min } {
+                set amin $min
+            }
+            if { $amax < $max } {
+                set amax $max
+            }
+            set _limits($axis) [list $amin $amax]
+        }
+        foreach { fname lim } [$dataobj fieldlimits] {
+            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]
+        }
     }
 }
@@ -2204 +2220 @@
 
     # Compute the value of the point
-    if { [info exists _limits(vmax)] && [info exists _limits(vmin)] } {
+    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 * ($_limits(vmax) - $_limits(vmin)) + $_limits(vmin)]
+        set value [expr $t * ($vmax - $vmin) + $vmin]
     } else {
         set value 0.0
@@ -2347 +2364 @@
             incr offset $lineht
         }
-        $pixels expr {round($pixels + $offset)}
         # Order of values is min to max.
-        $values seq $_limits(zmin) $_limits(zmax) $_numContours
-        set tags "isoline legend"
-        foreach pos [$pixels range 0 end] value [$values range end 0] {
-            set y1 [expr int($pos)]
-            set id [$c create line $x1 $y1 $x2 $y1 -fill $color -tags $tags]
-            $c bind $id <Enter> [itcl::code $this EnterIsoline %x %y $value]
-            $c bind $id <Leave> [itcl::code $this LeaveIsoline]
-        }
-        blt::vector destroy $pixels $values
+        if { [info exists _limits($_curFldName)] } {
+            $pixels expr {round($pixels + $offset)}
+            foreach { vmin vmax } $_limits(_$curFldName) break
+            $values seq $vmin $vmax $_numContours
+            set tags "isoline legend"
+            foreach pos [$pixels range 0 end] value [$values range end 0] {
+                set y1 [expr int($pos)]
+                set id [$c create line $x1 $y1 $x2 $y1 -fill $color -tags $tags]
+                $c bind $id <Enter> [itcl::code $this EnterIsoline %x %y $value]
+                $c bind $id <Leave> [itcl::code $this LeaveIsoline]
+            }
+            blt::vector destroy $pixels $values
+        }
     }
 
@@ -2365 +2385 @@
     # Reset the item coordinates according the current size of the plot.
     $c itemconfigure title -text $title
-    if { [info exists _limits(zmin)] && $_limits(zmin) != "" } {
-        $c itemconfigure zmin -text [format %g $_limits(zmin)]
-    }
-    if { [info exists _limits(zmax)] && $_limits(zmax) != "" } {
-        $c itemconfigure zmax -text [format %g $_limits(zmax)]
+    if { [info exists _limits($_curFldName)] } {
+        foreach { vmin vmax } $_limits($_curFldName) break
+        $c itemconfigure zmin -text [format %g $vmin]
+        $c itemconfigure zmax -text [format %g $vmax]
     }
     set y 2