Changeset 4797 for branches/uq/gui/scripts/field.tcl

Timestamp:

Nov 26, 2014, 4:45:43 PM (10 years ago)

Author:

gah

Message:

sync with 1.4-pre

File:

• branches/uq/gui/scripts/field.tcl (modified) (7 diffs)

branches/uq/gui/scripts/field.tcl

@@ -427 +427 @@
     set min ""
     set max ""
-    blt::vector tmp zero
 
     foreach cname [array names _comp2dims] {
@@ -453 +452 @@
 
                 if {$log} {
-                    # on a log scale, use abs value and ignore 0's
+                    blt::vector tmp zero
+                    # on a log scale, use abs value and ignore zeros
                     $vname dup tmp
                     $vname dup zero
-                    zero expr {tmp == 0}            ;# find the 0's
+                    zero expr {tmp == 0}            ;# find the zeros
                     tmp expr {abs(tmp)}             ;# get the abs value
-                    tmp expr {tmp + zero*max(tmp)}  ;# replace 0's with abs max
+                    tmp expr {tmp + zero*max(tmp)}  ;# replace 0s with abs max
                     set axisMin [blt::vector expr min(tmp)]
                     set axisMax [blt::vector expr max(tmp)]
+                    blt::vector destroy tmp zero
                 } else {
                     set axisMin [$vname min]
@@ -477 +478 @@
                 }
             }
-            2D - 3D {
+            default {
                 if {[info exists _comp2limits($cname)]} {
                     array set limits $_comp2limits($cname) 
@@ -519 +520 @@
         }
     }
-    blt::vector destroy tmp zero
     set val [$_field get "${axis}axis.min"]
     if {"" != $val && "" != $min} {
@@ -536 +536 @@
     return [list $min $max]
 }
-
 
 # ----------------------------------------------------------------------
@@ -1513 +1512 @@
         set dim 0 
         foreach axis {x y z} {
-            foreach {min max} [$mesh limits $axis] { 
+            foreach {min max} [$mesh limits $axis] {
                 if { $min < $max } {
                     incr dim
@@ -1702 +1701 @@
     }
 
-    foreach key [array names data] {
-        if {$key == "vtkdata"} {
-            if {1} {
-                set f [open /tmp/$cname.vtk "w"]
-                fconfigure $f -translation binary -encoding binary
-                puts -nonewline $f $data(vtkdata)
-                close $f
-            }
-        } else {
-            puts stderr "$key = \"$data($key)\""
+    if 0 {
+        foreach key [array names data] {
+            if {$key == "vtkdata"} {
+                if 0 {
+                    set f [open /tmp/$cname.vtk "w"]
+                    fconfigure $f -translation binary -encoding binary
+                    puts -nonewline $f $data(vtkdata)
+                    close $f
+                }
+            } else {
+                puts stderr "$key = \"$data($key)\""
+            }
         }
     }