Changeset 3365

Timestamp:

Feb 26, 2013 2:47:04 PM (10 years ago)

Author:

gah

Message:

fix for old unirect2d blob method, field limits for unirect2d

Location:

trunk/gui/scripts

Files:

• field.tcl (modified) (3 diffs)
• flowvisviewer.tcl (modified) (3 diffs)
• nanovisviewer.tcl (modified) (1 diff)

trunk/gui/scripts/field.tcl

@@ -322 +322 @@
     }
     if {[info exists _comp2unirect2d($cname)]} {
-        return [$_comp2unirect2d($cname) blob]
+        set blob [$_comp2unirect2d($cname) blob]
+        lappend blob "values" $_values
+        return $blob
     }
     if {[info exists _comp2unirect3d($cname)]} {
@@ -391 +393 @@
             }
             2D - 3D {
-                if {[info exists _comp2unirect2d($cname)]} {
-                    set limits [$_comp2unirect2d($cname) limits $which]
-                    foreach {axisMin axisMax} $limits break
-                    set axis v
-                } elseif {[info exists _comp2unirect3d($cname)]} {
+                if {[info exists _comp2unirect3d($cname)]} {
                     set limits [$_comp2unirect3d($cname) limits $which]
                     foreach {axisMin axisMax} $limits break
@@ -1193 +1191 @@
         set _comp2flowhints($cname) \
             [Rappture::FlowHints ::\#auto $_field $cname $_units]
-        set _values [$_field element $cname.values]
+        set _values [$_field get $cname.values]
+        set limits {}
+        foreach axis { x y } {
+            lappend limits $axis [$_comp2unirect2d($cname) limits $axis]
+        }
+        set xv [blt::vector create \#auto]
+        $xv set $_values
+        lappend limits "v" [$xv limits]
+        blt::vector destroy $xv
+        set _comp2limits($cname) $limits
         incr _counter
         return

trunk/gui/scripts/flowvisviewer.tcl

@@ -339 +339 @@
     set _image(legend) [image create photo]
     itk_component add legend {
-        canvas $itk_component(plotarea).legend -height 50 -highlightthickness 0
+        canvas $itk_component(plotarea).legend \
+            -height 50 -highlightthickness 0 -background black
     } {
         usual
@@ -729 +730 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::FlowvisViewer::scale {args} {
-    foreach val {xmin xmax ymin ymax zmin zmax vmin vmax} {
+    foreach val {xmin xmax ymin ymax vmin vmax} {
         set _limits($val) ""
     }
     foreach obj $args {
-        foreach axis {x y z v} {
+        foreach axis {x y v} {
 
             foreach { min max } [$obj limits $axis] break
@@ -1105 +1106 @@
     set h [winfo height $c]
     set lx 10
+    # FIXME:  I don't know what I have to do this for the 2D flow
+    #         example.  Otherwise the canvas background is white.
+    #         I'll get to this when we add background changes into
+    #         nanvis.
+    $c configure -background black
     set ly [expr {$h - 1}]
     if {"" == [$c find withtag transfunc]} {

trunk/gui/scripts/nanovisviewer.tcl

@@ -691 +691 @@
             # The volume hasn't reached the server yet.  How did we get 
             # here?
-            puts stderr "Don't have $vol in _serverVols"
+            puts stderr "Don't have $tag in _serverDatasets"
             continue
         }