Changeset 64 for trunk/gui/scripts/field.tcl

Timestamp:

Sep 25, 2005, 12:40:17 PM (19 years ago)

Author:

mmc

Message:

Lots of fixes for app-pntoy and other tools:

• Fixed plotting to recognize "-color name" in the style section, and to use auto colors for overlayed plots.
• Fixed x-y plotting to keep axes instead of resetting when flipping back and forth between plots.
• Fixed 1D fields to support new lin/log limits queries, so it plots properly.
• Added support for <string> output values.
• Fixed molecular viewer so that 3D rotation is unconstrained and more intuitive.
• Fixed Rappture::exec to handle newlines properly. Sometimes output would get all mixed together without newlines. Works better now.

File:

• trunk/gui/scripts/field.tcl (modified) (1 diff)

trunk/gui/scripts/field.tcl

@@ -180 +180 @@
 # axis.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Field::limits {axis} {
-    foreach val {xmin xmax ymin ymax zmin zmax vmin vmax} {
-        set results($val) ""
-    }
+itcl::body Rappture::Field::limits {which} {
+    set min ""
+    set max ""
+
+    blt::vector create tmp zero
     foreach comp [array names _comp2dims] {
         switch -- $_comp2dims($comp) {
             1D {
-                foreach {xv yv} $_comp2xy($comp) break
-
-                $xv variable x
-                set lims(xmin) $x(min)
-                set lims(xmax) $x(max)
-
-                set lims(ymin) 0
-                set lims(ymax) 0
-                set lims(zmin) 0
-                set lims(zmax) 0
-
-                $yv variable v
-                set lims(vmin) $v(min)
-                set lims(vmax) $v(max)
+                switch -- $which {
+                    x - xlin { set pos 0; set log 0; set axis xaxis }
+                    xlog { set pos 0; set log 1; set axis xaxis }
+                    y - ylin - v - vlin { set pos 1; set log 0; set axis yaxis }
+                    ylog - vlog { set pos 1; set log 1; set axis yaxis }
+                    default {
+                        error "bad option \"$which\": should be x, xlin, xlog, y, ylin, ylog, v, vlin, vlog"
+                    }
+                }
+
+                set vname [lindex $_comp2xy($comp) $pos]
+                $vname variable vec
+
+                if {$log} {
+                    # on a log scale, use abs value and ignore 0's
+                    $vname dup tmp
+                    $vname dup zero
+                    zero expr {tmp == 0}            ;# find the 0's
+                    tmp expr {abs(tmp)}             ;# get the abs value
+                    tmp expr {tmp + zero*max(tmp)}  ;# replace 0's with abs max
+                    set vmin [blt::vector expr min(tmp)]
+                    set vmax [blt::vector expr max(tmp)]
+                } else {
+                    set vmin $vec(min)
+                    set vmax $vec(max)
+                }
+
+                if {"" == $min} {
+                    set min $vmin
+                } elseif {$vmin < $min} {
+                    set min $vmin
+                }
+                if {"" == $max} {
+                    set max $vmax
+                } elseif {$vmax > $max} {
+                    set max $vmax
+                }
             }
             2D - 3D {
                 foreach {xv yv} $_comp2vtk($comp) break
-
-                foreach {lims(xmin) lims(xmax)} [$xv limits x] break
-                foreach {lims(ymin) lims(ymax)} [$xv limits y] break
-                foreach {lims(zmin) lims(zmax)} [$xv limits z] break
-                foreach {lims(vmin) lims(vmax)} [$yv GetRange] break
-            }
-        }
-        foreach val {xmin ymin zmin vmin} {
-            if {"" == $results($val) || $lims($val) < $results($val)} {
-                set results($val) $lims($val)
-            }
-        }
-        foreach val {xmax ymax zmax vmax} {
-            if {"" == $results($val) || $lims($val) > $results($val)} {
-                set results($val) $lims($val)
-            }
-        }
-    }
-    return [list $results(${axis}min) $results(${axis}max)]
+                switch -- $which {
+                    x - xlin - xlog {
+                        foreach {vmin vmax} [$xv limits x] break
+                        set axis xaxis
+                    }
+                    y - ylin - ylog {
+                        foreach {vmin vmax} [$xv limits y] break
+                        set axis yaxis
+                    }
+                    z - zlin - zlog {
+                        foreach {vmin vmax} [$xv limits z] break
+                        set axis zaxis
+                    }
+                    v - vlin - vlog {
+                        foreach {vmin vmax} [$yv GetRange] break
+                        set axis vaxis
+                    }
+                    default {
+                        error "bad option \"$which\": should be x, xlin, xlog, y, ylin, ylog, v, vlin, vlog"
+                    }
+                }
+            }
+        }
+        if {"" == $min} {
+            set min $vmin
+        } elseif {$vmin < $min} {
+            set min $vmin
+        }
+        if {"" == $max} {
+            set max $vmax
+        } elseif {$vmax > $max} {
+            set max $vmax
+        }
+    }
+    blt::vector destroy tmp zero
+
+    set val [$_field get $axis.min]
+    if {"" != $val && "" != $min} {
+        if {$val > $min} {
+            # tool specified this min -- don't go any lower
+            set min $val
+        }
+    }
+
+    set val [$_field get $axis.max]
+    if {"" != $val && "" != $max} {
+        if {$val < $max} {
+            # tool specified this max -- don't go any higher
+            set max $val
+        }
+    }
+
+    return [list $min $max]
 }