Changeset 1929 for trunk/gui/scripts/unirect2d.tcl

Timestamp:

Oct 22, 2010, 4:06:10 PM (14 years ago)

Author:

gah

Message:

 

File:

• trunk/gui/scripts/unirect2d.tcl (modified) (12 diffs)

trunk/gui/scripts/unirect2d.tcl

@@ -48 +48 @@
 itcl::body Rappture::Unirect2d::constructor {xmlobj field cname {extents 1}} {
     if {![Rappture::library isvalid $xmlobj]} {
-        error "bad value \"$xmlobj\": should be Rappture::library"
+        error "bad value \"$xmlobj\": should be Rappture::library"
     }
     set path [$field get $cname.mesh]
@@ -61 +61 @@
     set _compNum $extents
     foreach {key path} {
-        group   about.group
-        label   about.label
-        color   about.color
-        style   about.style
-        type    about.type
-        xlabel  xaxis.label
-        xdesc   xaxis.description
-        xunits  xaxis.units
-        xscale  xaxis.scale
-        xmin    xaxis.min
-        xmax    xaxis.max
-        ylabel  yaxis.label
-        ydesc   yaxis.description
-        yunits  yaxis.units
-        yscale  yaxis.scale
-        ymin    yaxis.min
-        ymax    yaxis.max
+        group   about.group
+        label   about.label
+        color   about.color
+        style   about.style
+        type    about.type
+        xlabel  xaxis.label
+        xdesc   xaxis.description
+        xunits  xaxis.units
+        xscale  xaxis.scale
+        xmin    xaxis.min
+        xmax    xaxis.max
+        ylabel  yaxis.label
+        ydesc   yaxis.description
+        yunits  yaxis.units
+        yscale  yaxis.scale
+        ymin    yaxis.min
+        ymax    yaxis.max
     } {
-        set str [$m get $path]
-        if {"" != $str} {
-            set _hints($key) $str
-        }
+        set str [$m get $path]
+        if {"" != $str} {
+            set _hints($key) $str
+        }
     }
     foreach {key} { axisorder } {
-        set str [$field get $cname.$key]
-        if {"" != $str} {
-            set _hints($key) $str
-        }
+        set str [$field get $cname.$key]
+        if {"" != $str} {
+            set _hints($key) $str
+        }
     }
     itcl::delete object $m
@@ -95 +95 @@
     set values [$field get "$cname.values"]
     if { $values == "" } {
-        set values [$field get "$cname.zvalues"]
+        set values [$field get "$cname.zvalues"]
     }
     $_values set $values
     set n [expr $_xNum * $_yNum * $_compNum]
     if { [$_values length] != $n } {
-        error "wrong \# of values in \"$cname.values\": expected $n values"
+        error "wrong \# of values in \"$cname.values\": expected $n values"
     }
 }
@@ -109 +109 @@
 itcl::body Rappture::Unirect2d::destructor {} {
     if { $_values != "" } {
-        blt::vector destroy $_values
+        blt::vector destroy $_values
     }
 }
@@ -125 +125 @@
     lappend data "xmin" $_xMin "ymin" $_yMin "xmax" $_xMax "ymax" $_yMax
     foreach key { axisorder xunits yunits units } {
-        set hint [hints $key]
-        if { $hint != "" } {
-            lappend data $key $hint
-        }
+        set hint [hints $key]
+        if { $hint != "" } {
+            lappend data $key $hint
+        }
     }
     if { [$_values length] > 0 } {
-        lappend data "values" [$_values range 0 end]
+        lappend data "values" [$_values range 0 end]
     }
     return [Rappture::encoding::encode -as zb64 "$data"]
@@ -146 +146 @@
     set dy [expr {($_yMax - $_yMin) / double($_yNum)}]
     for { set i 0 } { $i < $_xNum } { incr i } {
-        set x [expr {$_xMin + (double($i) * $dx)}]
-        for { set j 0 } { $j < $_yNum } { incr j } {
-            set y [expr {$_yMin + (double($i) * $dy)}]
-            lappend data $x $y
-        }
+        set x [expr {$_xMin + (double($i) * $dx)}]
+        for { set j 0 } { $j < $_yNum } { incr j } {
+            set y [expr {$_yMin + (double($i) * $dy)}]
+            lappend data $x $y
+        }
     }
     return $data
@@ -163 +163 @@
 itcl::body Rappture::Unirect2d::values {} {
     if { [$_values length] > 0 } {
-        return [$_values range 0 end]
+        return [$_values range 0 end]
     }
     return ""
@@ -178 +178 @@
 
     switch -- $which {
-        x - xlin - xlog {
-            set min $_xMin
-            set max $_xMax
-            set axis "xaxis"
-        }
-        y - ylin - ylog {
-            set min $_yMin
-            set max $_yMax
-            set axis "yaxis"
-        }
-        v - vlin - vlog - z - zlin - zlog {
-            if { [$_values length] > 0 } {
-               set min [blt::vector expr min($_values)]
-               set max [blt::vector expr max($_values)]
-            } else {
-                set min 0.0
-                set max 1.0
-            }
-            set axis "zaxis"
-        }
-        default {
-            error "unknown axis description \"$which\""
-        }
+        x - xlin - xlog {
+            set min $_xMin
+            set max $_xMax
+            set axis "xaxis"
+        }
+        y - ylin - ylog {
+            set min $_yMin
+            set max $_yMax
+            set axis "yaxis"
+        }
+        v - vlin - vlog - z - zlin - zlog {
+            if { [$_values length] > 0 } {
+               set min [blt::vector expr min($_values)]
+               set max [blt::vector expr max($_values)]
+            } else {
+                set min 0.0
+                set max 1.0
+            }
+            set axis "zaxis"
+        }
+        default {
+            error "unknown axis description \"$which\""
+        }
     }
 #     set val [$_field get $axis.min]
@@ -230 +230 @@
 itcl::body Rappture::Unirect2d::hints { {keyword ""} } {
     if {[info exists _hints(xlabel)] && "" != $_hints(xlabel)
-        && [info exists _hints(xunits)] && "" != $_hints(xunits)} {
-        set _hints(xlabel) "$_hints(xlabel) ($_hints(xunits))"
+        && [info exists _hints(xunits)] && "" != $_hints(xunits)} {
+        set _hints(xlabel) "$_hints(xlabel) ($_hints(xunits))"
     }
     if {[info exists _hints(ylabel)] && "" != $_hints(ylabel)
-        && [info exists _hints(yunits)] && "" != $_hints(yunits)} {
-        set _hints(ylabel) "$_hints(ylabel) ($_hints(yunits))"
+        && [info exists _hints(yunits)] && "" != $_hints(yunits)} {
+        set _hints(ylabel) "$_hints(ylabel) ($_hints(yunits))"
     }
     
     if {[info exists _hints(group)] && [info exists _hints(label)]} {
-        # pop-up help for each curve
-        set _hints(tooltip) $_hints(label)
+        # pop-up help for each curve
+        set _hints(tooltip) $_hints(label)
     }
     if {$keyword != ""} {
-        if {[info exists _hints($keyword)]} {
-            return $_hints($keyword)
-        }
-        return ""
+        if {[info exists _hints($keyword)]} {
+            return $_hints($keyword)
+        }
+        return ""
     }
     return [array get _hints]
@@ -255 +255 @@
     set string [$obj get $path]
     if { [scan $string "%d" value] != 1 || $value < 0 } {
-        puts stderr "can't get size \"$string\" of \"$path\""
-        return
+        puts stderr "can't get size \"$string\" of \"$path\""
+        return
     }
     upvar $varName size
@@ -265 +265 @@
     set string [$obj get $path]
     if { [scan $string "%g" value] != 1 } {
-        return
+        return
     }
     upvar $varName number
@@ -274 +274 @@
     set string [$obj get $path]
     if { $string == "" } {
-        puts stderr "can't get string \"$string\" of \"$path\""
-        return
+        puts stderr "can't get string \"$string\" of \"$path\""
+        return
     }
     upvar $varName str