Changeset 1527

Timestamp:

Jun 22, 2009 12:38:49 PM (15 years ago)

Author:

dkearney

Message:

various code cleanups, mainly tabs. adding units ohms and amps, adding appendf interface to the simple buffer so we can append formatted strings.

Location:

trunk

Files:

• gui/scripts/curve.tcl (modified) (11 diffs)
• gui/scripts/numberentry.tcl (modified) (10 diffs)
• gui/scripts/xyresult.tcl (modified) (32 diffs)
• lang/python/Rappture/PyRpLibrary.cc (modified) (18 diffs)
• src/core/RpBuffer.cc (modified) (11 diffs)
• src/core/RpBuffer.h (modified) (1 diff)
• src/core/RpLibrary.cc (modified) (10 diffs)
• src/core/RpSimpleBuffer.h (modified) (8 diffs)
• src/core/RpUnits.cc (modified) (6 diffs)
• src/core/RpUnits.h (modified) (4 diffs)

trunk/gui/scripts/curve.tcl

@@ -50 +50 @@
 itcl::body Rappture::Curve::constructor {xmlobj path} {
     if {![Rappture::library isvalid $xmlobj]} {
-        error "bad value \"$xmlobj\": should be LibraryObj"
+        error "bad value \"$xmlobj\": should be LibraryObj"
     }
     set _xmlobj $xmlobj
@@ -67 +67 @@
 
     foreach name [array names _comp2xy] {
-        eval blt::vector destroy $_comp2xy($name)
+        eval blt::vector destroy $_comp2xy($name)
     }
 }
@@ -81 +81 @@
     set rlist ""
     foreach name [array names _comp2xy] {
-        if {[string match $pattern $name]} {
-            lappend rlist $name
-        }
+        if {[string match $pattern $name]} {
+            lappend rlist $name
+        }
     }
     return $rlist
@@ -97 +97 @@
 itcl::body Rappture::Curve::mesh {{what -overall}} {
     if {[info exists _comp2xy($what)]} {
-        return [lindex $_comp2xy($what) 0]  ;# return xv
+        return [lindex $_comp2xy($what) 0]  ;# return xv
     }
     error "bad option \"$what\": should be [join [lsort [array names _comp2xy]] {, }]"
@@ -111 +111 @@
 itcl::body Rappture::Curve::values {{what -overall}} {
     if {[info exists _comp2xy($what)]} {
-        return [lindex $_comp2xy($what) 1]  ;# return yv
+        return [lindex $_comp2xy($what) 1]  ;# return yv
     }
     error "bad option \"$what\": should be [join [lsort [array names _comp2xy]] {, }]"
@@ -125 +125 @@
     set 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"
-        }
+        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"
+        }
     }
 
     blt::vector create tmp zero
     foreach comp [array names _comp2xy] {
-        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
-        }
+        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
+        }
     }
     blt::vector destroy tmp zero
@@ -168 +168 @@
     set val [$_curve get $axis.min]
     if {"" != $val && "" != $min} {
-        if {$val > $min} {
-            # tool specified this min -- don't go any lower
-            set min $val
-        }
+        if {$val > $min} {
+            # tool specified this min -- don't go any lower
+            set min $val
+        }
     }
 
     set val [$_curve get $axis.max]
     if {"" != $val && "" != $max} {
-        if {$val < $max} {
-            # tool specified this max -- don't go any higher
-            set max $val
-        }
+        if {$val < $max} {
+            # tool specified this max -- don't go any higher
+            set max $val
+        }
     }
 
@@ -194 +194 @@
 itcl::body Rappture::Curve::hints {{keyword ""}} {
     if {![info exists _hints]} {
-        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
-        } {
-            set str [$_curve get $path]
-            if {"" != $str} {
-                set _hints($key) $str
-            }
-        }
-
-        if {[info exists _hints(xlabel)] && "" != $_hints(xlabel)
-              && [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))"
-        }
-
-        if {[info exists _hints(group)] && [info exists _hints(label)]} {
-            # pop-up help for each curve
-            set _hints(tooltip) $_hints(label)
-        }
+        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
+        } {
+            set str [$_curve get $path]
+            if {"" != $str} {
+                set _hints($key) $str
+            }
+        }
+
+        if {[info exists _hints(xlabel)] && "" != $_hints(xlabel)
+              && [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))"
+        }
+
+        if {[info exists _hints(group)] && [info exists _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]
@@ -254 +254 @@
     # discard any existing data
     foreach name [array names _comp2xy] {
-        eval blt::vector destroy $_comp2xy($name)
+        eval blt::vector destroy $_comp2xy($name)
     }
     catch {unset _comp2xy}
@@ -263 +263 @@
     #
     foreach cname [$_curve children -type component] {
-        set xv ""
-        set yv ""
-
-        set xydata [$_curve get $cname.xy]
-        if {"" != $xydata} {
-            set xv [blt::vector create \#auto]
-            set yv [blt::vector create \#auto]
-            set tmp [blt::vector create \#auto]
-            $tmp set $xydata
-            $tmp split $xv $yv
-            blt::vector destroy $tmp
-        }
-
-        if {$xv != "" && $yv != ""} {
-            set _comp2xy($cname) [list $xv $yv]
-            incr _counter
-        }
+        set xv ""
+        set yv ""
+
+        set xydata [$_curve get $cname.xy]
+        if {"" != $xydata} {
+            set xv [blt::vector create \#auto]
+            set yv [blt::vector create \#auto]
+            set tmp [blt::vector create \#auto]
+            $tmp set $xydata
+            $tmp split $xv $yv
+            blt::vector destroy $tmp
+        }
+
+        if {$xv != "" && $yv != ""} {
+            set _comp2xy($cname) [list $xv $yv]
+            incr _counter
+        }
     }
     # Creates lists of x and y marker data.
@@ -285 +285 @@
     set _ymarkers {}
     foreach cname [$_curve children -type "marker" xaxis] {
-        set at     [$_curve get "xaxis.$cname.at"]
-        set label  [$_curve get "xaxis.$cname.label"]
-        set styles [$_curve get "xaxis.$cname.style"]
-        set data [list $at $label $styles]
-        lappend _xmarkers $data
+        set at     [$_curve get "xaxis.$cname.at"]
+        set label  [$_curve get "xaxis.$cname.label"]
+        set styles [$_curve get "xaxis.$cname.style"]
+        set data [list $at $label $styles]
+        lappend _xmarkers $data
     }
     foreach cname [$_curve children -type "marker" yaxis] {
-        set at     [$_curve get "yaxis.$cname.at"]
-        set label  [$_curve get "yaxis.$cname.label"]
-        set styles [$_curve get "yaxis.$cname.style"]
-        set data [list $at $label $styles]
-        lappend _xmarkers $data
+        set at     [$_curve get "yaxis.$cname.at"]
+        set label  [$_curve get "yaxis.$cname.label"]
+        set styles [$_curve get "yaxis.$cname.style"]
+        set data [list $at $label $styles]
+        lappend _xmarkers $data
     }
 }

trunk/gui/scripts/numberentry.tcl

@@ -43 +43 @@
 itcl::body Rappture::NumberEntry::constructor {owner path args} {
     if {[catch {$owner isa Rappture::ControlOwner} valid] != 0 || !$valid} {
-        error "bad object \"$owner\": should be Rappture::ControlOwner"
+        error "bad object \"$owner\": should be Rappture::ControlOwner"
     }
     set _owner $owner
@@ -53 +53 @@
     set presets ""
     foreach pre [$_owner xml children -type preset $path] {
-        lappend presets \
-            [$_owner xml get $path.$pre.value] \
-            [$_owner xml get $path.$pre.label]
+        lappend presets \
+            [$_owner xml get $path.$pre.value] \
+            [$_owner xml get $path.$pre.label]
     }
 
@@ -61 +61 @@
     set units [$_owner xml get $path.units]
     if {$units != ""} {
-        set desc [Rappture::Units::description $units]
-        if {[string match temperature* $desc]} {
-            set class Rappture::TemperatureGauge
-        }
+        set desc [Rappture::Units::description $units]
+        if {[string match temperature* $desc]} {
+            set class Rappture::TemperatureGauge
+        }
     }
 
@@ -72 +72 @@
     #
     itk_component add gauge {
-        $class $itk_interior.gauge -units $units -presets $presets
+        $class $itk_interior.gauge -units $units -presets $presets
     }
     pack $itk_component(gauge) -expand yes -fill both
@@ -84 +84 @@
 
     if {$class == "Rappture::Gauge" && "" != $min && "" != $max} {
-        set color [$_owner xml get $path.about.color]
-        if {$color == ""} {
-            # deprecated.  Color should be in "about"
-            set color [$_owner xml get $path.color]
-        }
-        if {$color != ""}  {
-            if {$units != ""} {
-                set min [Rappture::Units::convert $min -to $units -units off]
-                set max [Rappture::Units::convert $max -to $units -units off]
-            }
-            # For compatibility. If only one color use white for min
-            if {[llength $color] == 1} {
-                set color [list $min white $max $color]
-            }
-            $itk_component(gauge) configure \
-                -spectrum [Rappture::Spectrum ::#auto $color -units $units]
-        }
+        set color [$_owner xml get $path.about.color]
+        if {$color == ""} {
+            # deprecated.  Color should be in "about"
+            set color [$_owner xml get $path.color]
+        }
+        if {$color != ""}  {
+            if {$units != ""} {
+                set min [Rappture::Units::convert $min -to $units -units off]
+                set max [Rappture::Units::convert $max -to $units -units off]
+            }
+            # For compatibility. If only one color use white for min
+            if {[llength $color] == 1} {
+                set color [list $min white $max $color]
+            }
+            $itk_component(gauge) configure \
+                -spectrum [Rappture::Spectrum ::#auto $color -units $units]
+        }
     }
 
@@ -106 +106 @@
     set str [$_owner xml get $path.about.icon]
     if {$str != ""} {
-        $itk_component(gauge) configure -image [image create photo -data $str]
+        $itk_component(gauge) configure -image [image create photo -data $str]
     }
 
@@ -131 +131 @@
     set i [lsearch -exact $args -check]
     if {$i >= 0} {
-        set onlycheck 1
-        set args [lreplace $args $i $i]
+        set onlycheck 1
+        set args [lreplace $args $i $i]
     }
 
     if {[llength $args] == 1} {
-        if {$onlycheck} {
-            # someday we may add validation...
-            return
-        }
-        set newval [lindex $args 0]
-        $itk_component(gauge) value $newval
-        return $newval
+        if {$onlycheck} {
+            # someday we may add validation...
+            return
+        }
+        set newval [lindex $args 0]
+        $itk_component(gauge) value $newval
+        return $newval
 
     } elseif {[llength $args] != 0} {
-        error "wrong # args: should be \"value ?-check? ?newval?\""
+        error "wrong # args: should be \"value ?-check? ?newval?\""
     }
 
@@ -163 +163 @@
     set label [$_owner xml get $_path.about.label]
     if {"" == $label} {
-        set label "Number"
+        set label "Number"
     }
     return $label
@@ -184 +184 @@
 
     if {$units != "" || $min != "" || $max != ""} {
-        append str "\n\nEnter a number"
-
-        if {$min != "" && $max != ""} {
-            append str " between $min and $max"
-        } elseif {$min != ""} {
-            append str " greater than $min"
-        } elseif {$max != ""} {
-            append str " less than $max"
-        }
-
-        if {$units != ""} {
-            set desc [Rappture::Units::description $units]
-            append str " with units of $desc"
-        }
+        append str "\n\nEnter a number"
+
+        if {$min != "" && $max != ""} {
+            append str " between $min and $max"
+        } elseif {$min != ""} {
+            append str " greater than $min"
+        } elseif {$max != ""} {
+            append str " less than $max"
+        }
+
+        if {$units != ""} {
+            set desc [Rappture::Units::description $units]
+            append str " with units of $desc"
+        }
     }
     return [string trim $str]
@@ -218 +218 @@
     set valid {normal disabled}
     if {[lsearch -exact $valid $itk_option(-state)] < 0} {
-        error "bad value \"$itk_option(-state)\": should be [join $valid {, }]"
+        error "bad value \"$itk_option(-state)\": should be [join $valid {, }]"
     }
     $itk_component(gauge) configure -state $itk_option(-state)

trunk/gui/scripts/xyresult.tcl

@@ -117 +117 @@
     private variable initialized_ 0
 }
-                                                                                
+                                                                                
 itk::usual XyResult {
     keep -background -foreground -cursor -font
@@ -135 +135 @@
 
     array set _downloadPopup {
-        format csv
+        format csv
     }
 
@@ -148 +148 @@
 
     itk_component add reset {
-        button $f.reset -borderwidth 1 -padx 1 -pady 1 \
+        button $f.reset -borderwidth 1 -padx 1 -pady 1 \
             -highlightthickness 0 \
-            -image [Rappture::icon reset-view] \
-            -command [itcl::code $this _zoom reset]
+            -image [Rappture::icon reset-view] \
+            -command [itcl::code $this _zoom reset]
     } {
-        usual
-        ignore -borderwidth -highlightthickness
+        usual
+        ignore -borderwidth -highlightthickness
     }
     pack $itk_component(reset) -padx 4 -pady 2 -anchor e
     Rappture::Tooltip::for $itk_component(reset) \
-        "Reset the view to the default zoom level"
+        "Reset the view to the default zoom level"
 
     set f [$itk_component(main) component frame]
     itk_component add plot {
-        blt::graph $f.plot \
-            -highlightthickness 0 -plotpadx 0 -plotpady 0 \
-            -rightmargin 10
+        blt::graph $f.plot \
+            -highlightthickness 0 -plotpadx 0 -plotpady 0 \
+            -rightmargin 10
     } {
-        keep -background -foreground -cursor -font
+        keep -background -foreground -cursor -font
     }
     pack $itk_component(plot) -expand yes -fill both
 
     $itk_component(plot) pen configure activeLine \
-        -symbol square -pixels 3 -linewidth 2 \
-        -outline black -fill red -color black
+        -symbol square -pixels 3 -linewidth 2 \
+        -outline black -fill red -color black
 
     #
@@ -178 +178 @@
     #
     bind $itk_component(plot) <Motion> \
-        [itcl::code $this _hilite at %x %y]
+        [itcl::code $this _hilite at %x %y]
     bind $itk_component(plot) <Leave> \
-        [itcl::code $this _hilite off %x %y]
+        [itcl::code $this _hilite off %x %y]
 
     #
@@ -206 +206 @@
     Rappture::Combobox $inner.format -width 15 -editable no
     $inner.format choices insert end \
-        "%.3g"  "Auto"         \
-        "%.0f"  "X"          \
-        "%.1f"  "X.X"          \
-        "%.2f"  "X.XX"         \
-        "%.3f"  "X.XXX"        \
-        "%.6f"  "X.XXXXXX"     \
-        "%.1e"  "X.Xe+XX"      \
-        "%.2e"  "X.XXe+XX"     \
-        "%.3e"  "X.XXXe+XX"    \
-        "%.6e"  "X.XXXXXXe+XX"
+        "%.3g"  "Auto"         \
+        "%.0f"  "X"          \
+        "%.1f"  "X.X"          \
+        "%.2f"  "X.XX"         \
+        "%.3f"  "X.XXX"        \
+        "%.6f"  "X.XXXXXX"     \
+        "%.1e"  "X.Xe+XX"      \
+        "%.2e"  "X.XXe+XX"     \
+        "%.3e"  "X.XXXe+XX"    \
+        "%.6e"  "X.XXXXXXe+XX"
     grid $inner.formatl -row 4 -column 0 -sticky e
     grid $inner.format -row 4 -column 1 -sticky ew -pady 4
@@ -222 +222 @@
     frame $inner.scales
     radiobutton $inner.scales.linear -text "Linear" \
-        -variable [itcl::scope _axisPopup(scale)] -value "linear"
+        -variable [itcl::scope _axisPopup(scale)] -value "linear"
     pack $inner.scales.linear -side left
     radiobutton $inner.scales.log -text "Logarithmic" \
-        -variable [itcl::scope _axisPopup(scale)] -value "log"
+        -variable [itcl::scope _axisPopup(scale)] -value "log"
     pack $inner.scales.log -side left
     grid $inner.scalel -row 5 -column 0 -sticky e
@@ -231 +231 @@
 
     foreach axis {x y} {
-        set _axisPopup(format-$axis) "%.3g"
+        set _axisPopup(format-$axis) "%.3g"
     }
     _axis scale x linear
@@ -247 +247 @@
 
     itk_component add legend {
-        Rappture::XyLegend $inner.legend $itk_component(plot)
+        Rappture::XyLegend $inner.legend $itk_component(plot)
     }
     pack $itk_component(legend) -expand yes -fill both
 
     after idle [subst {
-        update idletasks
-        $itk_component(legend) reset 
+        update idletasks
+        $itk_component(legend) reset 
     }]
 
@@ -278 +278 @@
 itcl::body Rappture::XyResult::add {curve {settings ""}} {
     array set params {
-        -color auto
-        -brightness 0
-        -width 1
-        -type "line"
-        -raise 0
-        -linestyle solid
-        -description ""
-        -param ""
+        -color auto
+        -brightness 0
+        -width 1
+        -type "line"
+        -raise 0
+        -linestyle solid
+        -description ""
+        -param ""
     }
     foreach {opt val} $settings {
-        if {![info exists params($opt)]} {
-            error "bad setting \"$opt\": should be [join [lsort [array names params]] {, }]"
-        }
-        set params($opt) $val
+        if {![info exists params($opt)]} {
+            error "bad setting \"$opt\": should be [join [lsort [array names params]] {, }]"
+        }
+        set params($opt) $val
     }
 
     # if type is set to "scatter", then override the width
     if {"scatter" == $params(-type)} {
-        set params(-width) 0
+        set params(-width) 0
     }
 
     # if the color is "auto", then select a color from -autocolors
     if {$params(-color) == "auto" || $params(-color) == "autoreset"} {
-        if {$params(-color) == "autoreset"} {
-            set _autoColorI 0
-        }
-        set color [lindex $itk_option(-autocolors) $_autoColorI]
-        if {"" == $color} { set color black }
-        set params(-color) $color
-
-        # set up for next auto color
-        if {[incr _autoColorI] >= [llength $itk_option(-autocolors)]} {
-            set _autoColorI 0
-        }
+        if {$params(-color) == "autoreset"} {
+            set _autoColorI 0
+        }
+        set color [lindex $itk_option(-autocolors) $_autoColorI]
+        if {"" == $color} { set color black }
+        set params(-color) $color
+
+        # set up for next auto color
+        if {[incr _autoColorI] >= [llength $itk_option(-autocolors)]} {
+            set _autoColorI 0
+        }
     }
 
     # convert -linestyle to BLT -dashes
     switch -- $params(-linestyle) {
-        dashed { set params(-linestyle) {4 4} }
-        dotted { set params(-linestyle) {2 4} }
-        default { set params(-linestyle) {} }
+        dashed { set params(-linestyle) {4 4} }
+        dotted { set params(-linestyle) {2 4} }
+        default { set params(-linestyle) {} }
     }
 
     # if -brightness is set, then update the color
     if {$params(-brightness) != 0} {
-        set params(-color) [Rappture::color::brightness \
-            $params(-color) $params(-brightness)]
-
-        set bg [$itk_component(plot) cget -plotbackground]
-        foreach {h s v} [Rappture::color::RGBtoHSV $bg] break
-        if {$v > 0.5} {
-            set params(-color) [Rappture::color::brightness_max \
-                $params(-color) 0.8]
-        } else {
-            set params(-color) [Rappture::color::brightness_min \
-                $params(-color) 0.2]
-        }
+        set params(-color) [Rappture::color::brightness \
+            $params(-color) $params(-brightness)]
+
+        set bg [$itk_component(plot) cget -plotbackground]
+        foreach {h s v} [Rappture::color::RGBtoHSV $bg] break
+        if {$v > 0.5} {
+            set params(-color) [Rappture::color::brightness_max \
+                $params(-color) 0.8]
+        } else {
+            set params(-color) [Rappture::color::brightness_min \
+                $params(-color) 0.2]
+        }
     }
 
     set pos [lsearch -exact $curve $_clist]
     if {$pos < 0} {
-        lappend _clist $curve
-        set _curve2color($curve) $params(-color)
-        set _curve2width($curve) $params(-width)
-        set _curve2dashes($curve) $params(-linestyle)
-        set _curve2raise($curve) $params(-raise)
-        set _curve2desc($curve) $params(-description)
-
-        $_dispatcher event -idle !rebuild
+        lappend _clist $curve
+        set _curve2color($curve) $params(-color)
+        set _curve2width($curve) $params(-width)
+        set _curve2dashes($curve) $params(-linestyle)
+        set _curve2raise($curve) $params(-raise)
+        set _curve2desc($curve) $params(-description)
+
+        $_dispatcher event -idle !rebuild
     }
 }
@@ -360 +360 @@
     set clist $_clist
     foreach obj $clist {
-        if {[info exists _curve2raise($obj)] && $_curve2raise($obj)} {
-            set i [lsearch -exact $clist $obj]
-            if {$i >= 0} {
-                set clist [lreplace $clist $i $i]
-                lappend clist $obj
-            }
-        }
+        if {[info exists _curve2raise($obj)] && $_curve2raise($obj)} {
+            set i [lsearch -exact $clist $obj]
+            if {$i >= 0} {
+                set clist [lreplace $clist $i $i]
+                lappend clist $obj
+            }
+        }
     }
     return $clist
@@ -379 +379 @@
 itcl::body Rappture::XyResult::delete {args} {
     if {[llength $args] == 0} {
-        set args $_clist
+        set args $_clist
     }
 
@@ -385 +385 @@
     set changed 0
     foreach curve $args {
-        set pos [lsearch -exact $_clist $curve]
-        if {$pos >= 0} {
-            set _clist [lreplace $_clist $pos $pos]
-            catch {unset _curve2color($curve)}
-            catch {unset _curve2width($curve)}
-            catch {unset _curve2dashes($curve)}
-            catch {unset _curve2raise($curve)}
-            foreach elem [array names _elem2curve] {
-                if {$_elem2curve($elem) == $curve} {
-                    unset _elem2curve($elem)
-                }
-            }
-            set changed 1
-        }
+        set pos [lsearch -exact $_clist $curve]
+        if {$pos >= 0} {
+            set _clist [lreplace $_clist $pos $pos]
+            catch {unset _curve2color($curve)}
+            catch {unset _curve2width($curve)}
+            catch {unset _curve2dashes($curve)}
+            catch {unset _curve2raise($curve)}
+            foreach elem [array names _elem2curve] {
+                if {$_elem2curve($elem) == $curve} {
+                    unset _elem2curve($elem)
+                }
+            }
+            set changed 1
+        }
     }
 
     # If anything changed, then rebuild the plot
     if {$changed} {
-        $_dispatcher event -idle !rebuild
+        $_dispatcher event -idle !rebuild
     }
 
     # Nothing left? then start over with auto colors
     if {[llength $_clist] == 0} {
-        set _autoColorI 0
+        set _autoColorI 0
     }
 }
@@ -425 +425 @@
     lappend allx x  ;# fix main x-axis too
     foreach axis $allx {
-        _axis scale $axis linear
+        _axis scale $axis linear
     }
 
@@ -431 +431 @@
     lappend ally y  ;# fix main y-axis too
     foreach axis $ally {
-        _axis scale $axis linear
+        _axis scale $axis linear
     }
 
     catch {unset _limits}
     foreach xydata $args {
-        # find the axes for this curve (e.g., {x y2})
-        foreach {map(x) map(y)} [_getAxes $xydata] break
-
-        foreach axis {x y} {
-            # get defaults for both linear and log scales
-            foreach type {lin log} {
-                # store results -- ex: _limits(x2log-min)
-                set id $map($axis)$type
-                foreach {min max} [$xydata limits $axis$type] break
-                if {"" != $min && "" != $max} {
-                    if {![info exists _limits($id-min)]} {
-                        set _limits($id-min) $min
-                        set _limits($id-max) $max
-                    } else {
-                        if {$min < $_limits($id-min)} {
-                            set _limits($id-min) $min
-                        }
-                        if {$max > $_limits($id-max)} {
-                            set _limits($id-max) $max
-                        }
-                    }
-                }
-            }
-
-            if {[$xydata hints ${axis}scale] == "log"} {
-                _axis scale $map($axis) log
-            }
-        }
+        # find the axes for this curve (e.g., {x y2})
+        foreach {map(x) map(y)} [_getAxes $xydata] break
+
+        foreach axis {x y} {
+            # get defaults for both linear and log scales
+            foreach type {lin log} {
+                # store results -- ex: _limits(x2log-min)
+                set id $map($axis)$type
+                foreach {min max} [$xydata limits $axis$type] break
+                if {"" != $min && "" != $max} {
+                    if {![info exists _limits($id-min)]} {
+                        set _limits($id-min) $min
+                        set _limits($id-max) $max
+                    } else {
+                        if {$min < $_limits($id-min)} {
+                            set _limits($id-min) $min
+                        }
+                        if {$max > $_limits($id-max)} {
+                            set _limits($id-max) $max
+                        }
+                    }
+                }
+            }
+
+            if {[$xydata hints ${axis}scale] == "log"} {
+                _axis scale $map($axis) log
+            }
+        }
     }
     _resetLimits
@@ -480 +480 @@
 itcl::body Rappture::XyResult::download {option args} {
     switch $option {
-        coming {
-            # nothing to do
-        }
-        controls {
-            set popup .xyresultdownload
-            if {![winfo exists .xyresultdownload]} {
-                # if we haven't created the popup yet, do it now
-                Rappture::Balloon $popup -title "[Rappture::filexfer::label downloadWord] as..."
-                set inner [$popup component inner]
-                label $inner.summary -text "" -anchor w
-                pack $inner.summary -side top
-                radiobutton $inner.csv -text "Data as Comma-Separated Values" \
-                    -variable Rappture::XyResult::_downloadPopup(format) \
-                    -value csv
-                pack $inner.csv -anchor w
-                radiobutton $inner.pdf -text "Image as PDF/PostScript" \
-                    -variable Rappture::XyResult::_downloadPopup(format) \
-                    -value pdf
-                pack $inner.pdf -anchor w
-                radiobutton $inner.jpg -text "Image (draft)" \
-                    -variable Rappture::XyResult::_downloadPopup(format) \
-                    -value jpg
-                pack $inner.jpg -anchor w
-                button $inner.go -text [Rappture::filexfer::label download] \
-                    -command [lindex $args 0]
-                pack $inner.go -pady 4
-            } else {
-                set inner [$popup component inner]
-            }
-            set num [llength [get]]
-            set num [expr {($num == 1) ? "1 result" : "$num results"}]
-            $inner.summary configure -text "[Rappture::filexfer::label downloadWord] $num in the following format:"
-            update idletasks ;# fix initial sizes
-            return $popup
-        }
-        now {
-            set popup .xyresultdownload
-            if {[winfo exists .xyresultdownload]} {
-                $popup deactivate
-            }
-            switch -- $_downloadPopup(format) {
-                csv {
-                    # reverse the objects so the selected data appears on top
-                    set dlist ""
-                    foreach dataobj [get] {
-                        set dlist [linsert $dlist 0 $dataobj]
-                    }
-
-                    # generate the comma-separated value data for these objects
-                    set csvdata ""
-                    foreach dataobj $dlist {
-                        append csvdata "[string repeat - 60]\n"
-                        append csvdata " [$dataobj hints label]\n"
-                        if {[info exists _curve2desc($dataobj)]
-                            && [llength [split $_curve2desc($dataobj) \n]] > 1} {
-                            set indent "for:"
-                            foreach line [split $_curve2desc($dataobj) \n] {
-                                append csvdata " $indent $line\n"
-                                set indent "    "
-                            }
-                        }
-                        append csvdata "[string repeat - 60]\n"
-
-                        append csvdata "[$dataobj hints xlabel], [$dataobj hints ylabel]\n"
-                        set first 1
-                        foreach comp [$dataobj components] {
-                            if {!$first} {
-                                # blank line between components
-                                append csvdata "\n"
-                            }
-                            set xv [$dataobj mesh $comp]
-                            set yv [$dataobj values $comp]
-                            foreach x [$xv range 0 end] y [$yv range 0 end] {
-                                append csvdata [format "%20.15g, %20.15g\n" $x $y]
-                            }
-                            set first 0
-                        }
-                        append csvdata "\n"
-                    }
-                    return [list .txt $csvdata]
-                }
-                pdf {
-                    set psdata [$itk_component(plot) postscript output \
-                                    -decorations no -maxpect 1]
-
-                    set cmds {
-                        set fout "xy[pid].pdf"
-                        exec ps2pdf - $fout << $psdata
-                        
-                        set fid [open $fout r]
-                        fconfigure $fid -translation binary -encoding binary
-                        set pdfdata [read $fid]
-                        close $fid
-                        
-                        file delete -force $fout
-                    }
-                    if {[catch $cmds result] == 0} {
-                        return [list .pdf $pdfdata]
-                    }
-                    return [list .ps $psdata]
-                }
-                jpg {
-                    set img [image create photo]
-                    $itk_component(plot) snap $img
-                    set bytes [$img data -format "jpeg -quality 100"]
-                    set bytes [Rappture::encoding::decode -as b64 $bytes]
-                    image delete $img
-                    return [list .jpg $bytes]
-                }
-                png {
-                    set img [image create photo]
-                    $itk_component(plot) snap $img
-                    set bytes [$img data -format "png"]
-                    set bytes [Rappture::encoding::decode -as b64 $bytes]
-                    image delete $img
-                    return [list .png $bytes]
-                }
-            }
-        }
-        default {
-            error "bad option \"$option\": should be coming, controls, now"
-        }
+        coming {
+            # nothing to do
+        }
+        controls {
+            set popup .xyresultdownload
+            if {![winfo exists .xyresultdownload]} {
+                # if we haven't created the popup yet, do it now
+                Rappture::Balloon $popup -title "[Rappture::filexfer::label downloadWord] as..."
+                set inner [$popup component inner]
+                label $inner.summary -text "" -anchor w
+                pack $inner.summary -side top
+                radiobutton $inner.csv -text "Data as Comma-Separated Values" \
+                    -variable Rappture::XyResult::_downloadPopup(format) \
+                    -value csv
+                pack $inner.csv -anchor w
+                radiobutton $inner.pdf -text "Image as PDF/PostScript" \
+                    -variable Rappture::XyResult::_downloadPopup(format) \
+                    -value pdf
+                pack $inner.pdf -anchor w
+                radiobutton $inner.jpg -text "Image (draft)" \
+                    -variable Rappture::XyResult::_downloadPopup(format) \
+                    -value jpg
+                pack $inner.jpg -anchor w
+                button $inner.go -text [Rappture::filexfer::label download] \
+                    -command [lindex $args 0]
+                pack $inner.go -pady 4
+            } else {
+                set inner [$popup component inner]
+            }
+            set num [llength [get]]
+            set num [expr {($num == 1) ? "1 result" : "$num results"}]
+            $inner.summary configure -text "[Rappture::filexfer::label downloadWord] $num in the following format:"
+            update idletasks ;# fix initial sizes
+            return $popup
+        }
+        now {
+            set popup .xyresultdownload
+            if {[winfo exists .xyresultdownload]} {
+                $popup deactivate
+            }
+            switch -- $_downloadPopup(format) {
+                csv {
+                    # reverse the objects so the selected data appears on top
+                    set dlist ""
+                    foreach dataobj [get] {
+                        set dlist [linsert $dlist 0 $dataobj]
+                    }
+
+                    # generate the comma-separated value data for these objects
+                    set csvdata ""
+                    foreach dataobj $dlist {
+                        append csvdata "[string repeat - 60]\n"
+                        append csvdata " [$dataobj hints label]\n"
+                        if {[info exists _curve2desc($dataobj)]
+                            && [llength [split $_curve2desc($dataobj) \n]] > 1} {
+                            set indent "for:"
+                            foreach line [split $_curve2desc($dataobj) \n] {
+                                append csvdata " $indent $line\n"
+                                set indent "    "
+                            }
+                        }
+                        append csvdata "[string repeat - 60]\n"
+
+                        append csvdata "[$dataobj hints xlabel], [$dataobj hints ylabel]\n"
+                        set first 1
+                        foreach comp [$dataobj components] {
+                            if {!$first} {
+                                # blank line between components
+                                append csvdata "\n"
+                            }
+                            set xv [$dataobj mesh $comp]
+                            set yv [$dataobj values $comp]
+                            foreach x [$xv range 0 end] y [$yv range 0 end] {
+                                append csvdata [format "%20.15g, %20.15g\n" $x $y]
+                            }
+                            set first 0
+                        }
+                        append csvdata "\n"
+                    }
+                    return [list .txt $csvdata]
+                }
+                pdf {
+                    set psdata [$itk_component(plot) postscript output \
+                                    -decorations no -maxpect 1]
+
+                    set cmds {
+                        set fout "xy[pid].pdf"
+                        exec ps2pdf - $fout << $psdata
+                        
+                        set fid [open $fout r]
+                        fconfigure $fid -translation binary -encoding binary
+                        set pdfdata [read $fid]
+                        close $fid
+                        
+                        file delete -force $fout
+                    }
+                    if {[catch $cmds result] == 0} {
+                        return [list .pdf $pdfdata]
+                    }
+                    return [list .ps $psdata]
+                }
+                jpg {
+                    set img [image create photo]
+                    $itk_component(plot) snap $img
+                    set bytes [$img data -format "jpeg -quality 100"]
+                    set bytes [Rappture::encoding::decode -as b64 $bytes]
+                    image delete $img
+                    return [list .jpg $bytes]
+                }
+                png {
+                    set img [image create photo]
+                    $itk_component(plot) snap $img
+                    set bytes [$img data -format "png"]
+                    set bytes [Rappture::encoding::decode -as b64 $bytes]
+                    image delete $img
+                    return [list .png $bytes]
+                }
+            }
+        }
+        default {
+            error "bad option \"$option\": should be coming, controls, now"
+        }
     }
 }
@@ -618 +618 @@
     eval $g element delete [$g element names]
     foreach axis [$g axis names] {
-        $g axis configure $axis -hide yes -checklimits no
+        $g axis configure $axis -hide yes -checklimits no
     }
     # Presumably you want at least an X-axis and Y-axis displayed.
@@ -634 +634 @@
     set anum(y) 0
     foreach xydata [get] {
-        foreach ax {x y} {
-            set label [$xydata hints ${ax}label]
-            if {"" != $label} {
-                if {![info exists _label2axis($ax-$label)]} {
-                    switch [incr anum($ax)] {
-                        1 { set axis $ax }
-                        2 { set axis ${ax}2 }
-                        default {
-                            set axis $ax$anum($ax)
-                            catch {$g axis create $axis}
-                        }
-                    }
-                    $g axis configure $axis -title $label -hide no \
-                        -checklimits no
-                    set _label2axis($ax-$label) $axis
-
-                    # if this axis has a description, add it as a tooltip
-                    set desc [string trim [$xydata hints ${ax}desc]]
-                    Rappture::Tooltip::text $g-$axis $desc
-                }
-            }
-        }
+        foreach ax {x y} {
+            set label [$xydata hints ${ax}label]
+            if {"" != $label} {
+                if {![info exists _label2axis($ax-$label)]} {
+                    switch [incr anum($ax)] {
+                        1 { set axis $ax }
+                        2 { set axis ${ax}2 }
+                        default {
+                            set axis $ax$anum($ax)
+                            catch {$g axis create $axis}
+                        }
+                    }
+                    $g axis configure $axis -title $label -hide no \
+                        -checklimits no
+                    set _label2axis($ax-$label) $axis
+
+                    # if this axis has a description, add it as a tooltip
+                    set desc [string trim [$xydata hints ${ax}desc]]
+                    Rappture::Tooltip::text $g-$axis $desc
+                }
+            }
+        }
     }
 
@@ -664 +664 @@
     set all ""
     foreach ax {x y} {
-        lappend all $ax
-
-        set extra ""
-        for {set i 2} {$i <= $anum($ax)} {incr i} {
-            lappend extra ${ax}$i
-        }
-        eval lappend all $extra
-        $g ${ax}2axis use $extra
-        if {$ax == "y"} {
-            $g configure -rightmargin [expr {($extra == "") ? 10 : 0}]
-        }
+        lappend all $ax
+
+        set extra ""
+        for {set i 2} {$i <= $anum($ax)} {incr i} {
+            lappend extra ${ax}$i
+        }
+        eval lappend all $extra
+        $g ${ax}2axis use $extra
+        if {$ax == "y"} {
+            $g configure -rightmargin [expr {($extra == "") ? 10 : 0}]
+        }
     }
 
     foreach axis $all {
-        set _axisPopup(format-$axis) "%.3g"
-
-        $g axis bind $axis <Enter> \
-            [itcl::code $this _axis hilite $axis on]
-        $g axis bind $axis <Leave> \
-            [itcl::code $this _axis hilite $axis off]
-        $g axis bind $axis <ButtonPress> \
-            [itcl::code $this _axis click $axis %x %y]
-        $g axis bind $axis <B1-Motion> \
-            [itcl::code $this _axis drag $axis %x %y]
-        $g axis bind $axis <ButtonRelease> \
-            [itcl::code $this _axis release $axis %x %y]
-        $g axis bind $axis <KeyPress> \
-            [list ::Rappture::Tooltip::tooltip cancel]
+        set _axisPopup(format-$axis) "%.3g"
+
+        $g axis bind $axis <Enter> \
+            [itcl::code $this _axis hilite $axis on]
+        $g axis bind $axis <Leave> \
+            [itcl::code $this _axis hilite $axis off]
+        $g axis bind $axis <ButtonPress> \
+            [itcl::code $this _axis click $axis %x %y]
+        $g axis bind $axis <B1-Motion> \
+            [itcl::code $this _axis drag $axis %x %y]
+        $g axis bind $axis <ButtonRelease> \
+            [itcl::code $this _axis release $axis %x %y]
+        $g axis bind $axis <KeyPress> \
+            [list ::Rappture::Tooltip::tooltip cancel]
     }
 
@@ -699 +699 @@
     set count 0
     foreach xydata $_clist {
-        set label [$xydata hints label]
-        foreach {mapx mapy} [_getAxes $xydata] break
-
-        foreach comp [$xydata components] {
-            set xv [$xydata mesh $comp]
-            set yv [$xydata values $comp]
-
-            if {[info exists _curve2color($xydata)]} {
-                set color $_curve2color($xydata)
-            } else {
-                set color [$xydata hints color]
-                if {"" == $color} {
-                    set color black
-                }
-            }
-
-            if {[info exists _curve2width($xydata)]} {
-                set lwidth $_curve2width($xydata)
-            } else {
-                set lwidth 2
-            }
-
-            if {[info exists _curve2dashes($xydata)]} {
-                set dashes $_curve2dashes($xydata)
-            } else {
-                set dashes ""
-            }
-
-            if {([$xv length] <= 1) || ($lwidth == 0)} {
-                set sym square
-                set pixels 2
-            } else {
-                set sym ""
-                set pixels 6
-            }
-
-            set elem "elem[incr count]"
-            set _elem2curve($elem) $xydata
-
-            $g element create $elem -x $xv -y $yv \
-                -symbol $sym -pixels $pixels -linewidth $lwidth -label $label \
-                -color $color -dashes $dashes \
-                -mapx $mapx -mapy $mapy
-        }
+        set label [$xydata hints label]
+        foreach {mapx mapy} [_getAxes $xydata] break
+
+        foreach comp [$xydata components] {
+            set xv [$xydata mesh $comp]
+            set yv [$xydata values $comp]
+
+            if {[info exists _curve2color($xydata)]} {
+                set color $_curve2color($xydata)
+            } else {
+                set color [$xydata hints color]
+                if {"" == $color} {
+                    set color black
+                }
+            }
+
+            if {[info exists _curve2width($xydata)]} {
+                set lwidth $_curve2width($xydata)
+            } else {
+                set lwidth 2
+            }
+
+            if {[info exists _curve2dashes($xydata)]} {
+                set dashes $_curve2dashes($xydata)
+            } else {
+                set dashes ""
+            }
+
+            if {([$xv length] <= 1) || ($lwidth == 0)} {
+                set sym square
+                set pixels 2
+            } else {
+                set sym ""
+                set pixels 6
+            }
+
+            set elem "elem[incr count]"
+            set _elem2curve($elem) $xydata
+
+            $g element create $elem -x $xv -y $yv \
+                -symbol $sym -pixels $pixels -linewidth $lwidth -label $label \
+                -color $color -dashes $dashes \
+                -mapx $mapx -mapy $mapy
+        }
     }
 
     foreach xydata $_clist {
-        set xmin -Inf
-        set ymin -Inf
-        set xmax Inf
-        set ymax Inf
-        # 
-        # Create text/line markers for each *axis.marker specified. 
-        # 
-        foreach m [$xydata xmarkers] {
-            foreach {at label style} $m break
-            set id [$g marker create line -coords [list $at $ymin $at $ymax]]
-            $g marker bind $id <Enter> \
-                [itcl::code $this _enterMarker $g x-$label $at $ymin $at]
-            $g marker bind $id <Leave> \
-                [itcl::code $this _leaveMarker $g x-$label]
-            set options [_getLineMarkerOptions $style]
-            if { $options != "" } {
-                eval $g marker configure $id $options
-            }
-            if { $label != "" } {
-                set id [$g marker create text -anchor nw \
-                            -text $label -coords [list $at $ymax]]
-                set options [_getTextMarkerOptions $style]
-                if { $options != "" } {
-                    eval $g marker configure $id $options
-                }
-            }
-        }
-        foreach m [$xydata ymarkers] {
-            foreach {at label style} $m break
-            set id [$g marker create line -coords [list $xmin $at $xmax $at]]
-            $g marker bind $id <Enter> \
-                [itcl::code $this _enterMarker $g y-$label $at $xmin $at]
-            $g marker bind $id <Leave> \
-                [itcl::code $this _leaveMarker $g y-$label]
-            set options [_getLineMarkerOptions $style]
-            if { $options != "" } {
-                eval $g marker configure $id $options
-            }
-            if { $label != "" } {
-                set id [$g marker create text -anchor se \
-                        -text $label -coords [list $xmax $at]]
-                set options [_getTextMarkerOptions $style]
-                if { $options != "" } {
-                    eval $g marker configure $id $options
-                }
-            }
-        }
+        set xmin -Inf
+        set ymin -Inf
+        set xmax Inf
+        set ymax Inf
+        # 
+        # Create text/line markers for each *axis.marker specified. 
+        # 
+        foreach m [$xydata xmarkers] {
+            foreach {at label style} $m break
+            set id [$g marker create line -coords [list $at $ymin $at $ymax]]
+            $g marker bind $id <Enter> \
+                [itcl::code $this _enterMarker $g x-$label $at $ymin $at]
+            $g marker bind $id <Leave> \
+                [itcl::code $this _leaveMarker $g x-$label]
+            set options [_getLineMarkerOptions $style]
+            if { $options != "" } {
+                eval $g marker configure $id $options
+            }
+            if { $label != "" } {
+                set id [$g marker create text -anchor nw \
+                            -text $label -coords [list $at $ymax]]
+                set options [_getTextMarkerOptions $style]
+                if { $options != "" } {
+                    eval $g marker configure $id $options
+                }
+            }
+        }
+        foreach m [$xydata ymarkers] {
+            foreach {at label style} $m break
+            set id [$g marker create line -coords [list $xmin $at $xmax $at]]
+            $g marker bind $id <Enter> \
+                [itcl::code $this _enterMarker $g y-$label $at $xmin $at]
+            $g marker bind $id <Leave> \
+                [itcl::code $this _leaveMarker $g y-$label]
+            set options [_getLineMarkerOptions $style]
+            if { $options != "" } {
+                eval $g marker configure $id $options
+            }
+            if { $label != "" } {
+                set id [$g marker create text -anchor se \
+                        -text $label -coords [list $xmax $at]]
+                set options [_getTextMarkerOptions $style]
+                if { $options != "" } {
+                    eval $g marker configure $id $options
+                }
+            }
+        }
     }
     $itk_component(legend) reset 
@@ -814 +814 @@
     #
     foreach axis [$g axis names] {
-        if {[info exists _limits(${axis}lin-min)]} {
-            set log [$g axis cget $axis -logscale]
-            if {$log} {
-                set min $_limits(${axis}log-min)
-                if {$min == 0} { set min 1 }
-                set max $_limits(${axis}log-max)
-                if {$max == 0} { set max 1 }
-
-                if {$min == $max} {
-                    set logmin [expr {floor(log10(abs(0.9*$min)))}]
-                    set logmax [expr {ceil(log10(abs(1.1*$max)))}]
-                } else {
-                    set logmin [expr {floor(log10(abs($min)))}]
-                    set logmax [expr {ceil(log10(abs($max)))}]
-                    if {[string match y* $axis]} {
-                        # add a little padding
-                        set delta [expr {$logmax-$logmin}]
-                        if {$delta == 0} { set delta 1 }
-                        set logmin [expr {$logmin-0.05*$delta}]
-                        set logmax [expr {$logmax+0.05*$delta}]
-                    }
-                }
-                if {$logmin < -300} {
-                    set min 1e-300
-                } elseif {$logmin > 300} {
-                    set min 1e+300
-                } else {
-                    set min [expr {pow(10.0,$logmin)}]
-                }
-
-                if {$logmax < -300} {
-                    set max 1e-300
-                } elseif {$logmax > 300} {
-                    set max 1e+300
-                } else {
-                    set max [expr {pow(10.0,$logmax)}]
-                }
-            } else {
-                set min $_limits(${axis}lin-min)
-                set max $_limits(${axis}lin-max)
-
-                if {[string match y* $axis]} {
-                    # add a little padding
-                    set delta [expr {$max-$min}]
-                    set min [expr {$min-0.05*$delta}]
-                    set max [expr {$max+0.05*$delta}]
-                }
-            }
-            if {$min < $max} {
-                $g axis configure $axis -min $min -max $max
-            } else {
-                $g axis configure $axis -min "" -max ""
-            }
-        } else {
-            $g axis configure $axis -min "" -max ""
-        }
+        if {[info exists _limits(${axis}lin-min)]} {
+            set log [$g axis cget $axis -logscale]
+            if {$log} {
+                set min $_limits(${axis}log-min)
+                if {$min == 0} { set min 1 }
+                set max $_limits(${axis}log-max)
+                if {$max == 0} { set max 1 }
+
+                if {$min == $max} {
+                    set logmin [expr {floor(log10(abs(0.9*$min)))}]
+                    set logmax [expr {ceil(log10(abs(1.1*$max)))}]
+                } else {
+                    set logmin [expr {floor(log10(abs($min)))}]
+                    set logmax [expr {ceil(log10(abs($max)))}]
+                    if {[string match y* $axis]} {
+                        # add a little padding
+                        set delta [expr {$logmax-$logmin}]
+                        if {$delta == 0} { set delta 1 }
+                        set logmin [expr {$logmin-0.05*$delta}]
+                        set logmax [expr {$logmax+0.05*$delta}]
+                    }
+                }
+                if {$logmin < -300} {
+                    set min 1e-300
+                } elseif {$logmin > 300} {
+                    set min 1e+300
+                } else {
+                    set min [expr {pow(10.0,$logmin)}]
+                }
+
+                if {$logmax < -300} {
+                    set max 1e-300
+                } elseif {$logmax > 300} {
+                    set max 1e+300
+                } else {
+                    set max [expr {pow(10.0,$logmax)}]
+                }
+            } else {
+                set min $_limits(${axis}lin-min)
+                set max $_limits(${axis}lin-max)
+
+                if {[string match y* $axis]} {
+                    # add a little padding
+                    set delta [expr {$max-$min}]
+                    set min [expr {$min-0.05*$delta}]
+                    set max [expr {$max+0.05*$delta}]
+                }
+            }
+            if {$min < $max} {
+                $g axis configure $axis -min $min -max $max
+            } else {
+                $g axis configure $axis -min "" -max ""
+            }
+        } else {
+            $g axis configure $axis -min "" -max ""
+        }
     }
 }
@@ -881 +881 @@
 itcl::body Rappture::XyResult::_zoom {option args} {
     switch -- $option {
-        reset {
-            _resetLimits
-        }
+        reset {
+            _resetLimits
+        }
     }
 }
@@ -901 +901 @@
     # middle of a zoom selection.
     if {[info exists ::zoomInfo($g,corner)] && $::zoomInfo($g,corner) == "B" } {
-        return;
+        return;
     }
     set tip ""
     if {$state == "at"} {
-        if {[$g element closest $x $y info -interpolate yes]} {
-            # for dealing with xy line plots
-            set elem $info(name)
-
-            # Some elements are generated dynamically and therefore will
-            # not have a curve object associated with them.
-            set mapx [$g element cget $elem -mapx]
-            set mapy [$g element cget $elem -mapy]
-            if {[info exists _elem2curve($elem)]} {
-                foreach {mapx mapy} [_getAxes $_elem2curve($elem)] break
-            }
-
-            # search again for an exact point -- this time don't interpolate
-            set tip ""
-            array unset info
-            if {[$g element closest $x $y info -interpolate no]
-                  && $info(name) == $elem} {
-
-                set x [$g axis transform $mapx $info(x)]
-                set y [$g axis transform $mapy $info(y)]
-                
-                if {[info exists _elem2curve($elem)]} {
-                    set curve $_elem2curve($elem)
-                    set yunits [$curve hints yunits]
-                    set xunits [$curve hints xunits]
-                } else {
-                    set xunits ""
-                    set yunits ""
-                }
-                set tip [$g element cget $elem -label]
-                set yval [_axis format y dummy $info(y)]
-                append tip "\n$yval$yunits"
-                set xval [_axis format x dummy $info(x)]
-                append tip " @ $xval$xunits"
-                set tip [string trim $tip]
-            }
-            set state 1
-        } elseif {[$g element closest $x $y info -interpolate no]} {
-            # for dealing with xy scatter plot
-            set elem $info(name)
-
-            # Some elements are generated dynamically and therefore will
-            # not have a curve object associated with them.
-            set mapx [$g element cget $elem -mapx]
-            set mapy [$g element cget $elem -mapy]
-            if {[info exists _elem2curve($elem)]} {
-                foreach {mapx mapy} [_getAxes $_elem2curve($elem)] break
-            }
-
-            set tip ""
-            set x [$g axis transform $mapx $info(x)]
-            set y [$g axis transform $mapy $info(y)]
-                
-            if {[info exists _elem2curve($elem)]} {
-                set curve $_elem2curve($elem)
-                set yunits [$curve hints yunits]
-                set xunits [$curve hints xunits]
-            } else {
-                set xunits ""
-                set yunits ""
-            }
-            set tip [$g element cget $elem -label]
-            set yval [_axis format y dummy $info(y)]
-            append tip "\n$yval$yunits"
-            set xval [_axis format x dummy $info(x)]
-            append tip " @ $xval$xunits"
-            set tip [string trim $tip]
-            set state 1
-        } else {
-            set state 0
-        }
+        if {[$g element closest $x $y info -interpolate yes]} {
+            # for dealing with xy line plots
+            set elem $info(name)
+
+            # Some elements are generated dynamically and therefore will
+            # not have a curve object associated with them.
+            set mapx [$g element cget $elem -mapx]
+            set mapy [$g element cget $elem -mapy]
+            if {[info exists _elem2curve($elem)]} {
+                foreach {mapx mapy} [_getAxes $_elem2curve($elem)] break
+            }
+
+            # search again for an exact point -- this time don't interpolate
+            set tip ""
+            array unset info
+            if {[$g element closest $x $y info -interpolate no]
+                  && $info(name) == $elem} {
+
+                set x [$g axis transform $mapx $info(x)]
+                set y [$g axis transform $mapy $info(y)]
+                
+                if {[info exists _elem2curve($elem)]} {
+                    set curve $_elem2curve($elem)
+                    set yunits [$curve hints yunits]
+                    set xunits [$curve hints xunits]
+                } else {
+                    set xunits ""
+                    set yunits ""
+                }
+                set tip [$g element cget $elem -label]
+                set yval [_axis format y dummy $info(y)]
+                append tip "\n$yval$yunits"
+                set xval [_axis format x dummy $info(x)]
+                append tip " @ $xval$xunits"
+                set tip [string trim $tip]
+            }
+            set state 1
+        } elseif {[$g element closest $x $y info -interpolate no]} {
+            # for dealing with xy scatter plot
+            set elem $info(name)
+
+            # Some elements are generated dynamically and therefore will
+            # not have a curve object associated with them.
+            set mapx [$g element cget $elem -mapx]
+            set mapy [$g element cget $elem -mapy]
+            if {[info exists _elem2curve($elem)]} {
+                foreach {mapx mapy} [_getAxes $_elem2curve($elem)] break
+            }
+
+            set tip ""
+            set x [$g axis transform $mapx $info(x)]
+            set y [$g axis transform $mapy $info(y)]
+                
+            if {[info exists _elem2curve($elem)]} {
+                set curve $_elem2curve($elem)
+                set yunits [$curve hints yunits]
+                set xunits [$curve hints xunits]
+            } else {
+                set xunits ""
+                set yunits ""
+            }
+            set tip [$g element cget $elem -label]
+            set yval [_axis format y dummy $info(y)]
+            append tip "\n$yval$yunits"
+            set xval [_axis format x dummy $info(x)]
+            append tip " @ $xval$xunits"
+            set tip [string trim $tip]
+            set state 1
+        } else {
+            set state 0
+        }
     }
 
     if {$state} {
-        #
-        # Highlight ON:
-        # - activate trace
-        # - multiple axes? dim other axes
-        # - pop up tooltip about data
-        #
-        if { [$g element exists $_hilite(elem)] && $_hilite(elem) != $elem } {
-            $g element deactivate $_hilite(elem)
-            $g crosshairs configure -hide yes
-            Rappture::Tooltip::tooltip cancel
-        }
-        $g element activate $elem
-        set _hilite(elem) $elem
-
-        set mapx [$g element cget $elem -mapx]
-        set mapy [$g element cget $elem -mapy]
-        if {[info exists _elem2curve($elem)]} {
-            foreach {mapx mapy} [_getAxes $_elem2curve($elem)] break
-        }
-        set allx [$g x2axis use]
-        if {[llength $allx] > 0} {
-            lappend allx x  ;# fix main x-axis too
-            foreach axis $allx {
-                if {$axis == $mapx} {
-                    $g axis configure $axis -color $itk_option(-foreground) \
-                        -titlecolor $itk_option(-foreground)
-                } else {
-                    $g axis configure $axis -color $itk_option(-dimcolor) \
-                        -titlecolor $itk_option(-dimcolor)
-                }
-            }
-        }
-        set ally [$g y2axis use]
-        if {[llength $ally] > 0} {
-            lappend ally y  ;# fix main y-axis too
-            foreach axis $ally {
-                if {$axis == $mapy} {
-                    $g axis configure $axis -color $itk_option(-foreground) \
-                        -titlecolor $itk_option(-foreground)
-                } else {
-                    $g axis configure $axis -color $itk_option(-dimcolor) \
-                        -titlecolor $itk_option(-dimcolor)
-                }
-            }
-        }
-
-        if {"" != $tip} {
-            $g crosshairs configure -hide no -position @$x,$y
-
-            if {$x > 0.5*[winfo width $g]} {
-                if {$x < 4} {
-                    set tipx "-0"
-                } else {
-                    set tipx "-[expr {$x-4}]"  ;# move tooltip to the left
-                }
-            } else {
-                if {$x < -4} {
-                    set tipx "+0"
-                } else {
-                    set tipx "+[expr {$x+4}]"  ;# move tooltip to the right
-                }
-            }
-            if {$y > 0.5*[winfo height $g]} {
-                if {$y < 4} {
-                    set tipy "-0"
-                } else {
-                    set tipy "-[expr {$y-4}]"  ;# move tooltip to the top
-                }
-            } else {
-                if {$y < -4} {
-                    set tipy "+0"
-                } else {
-                    set tipy "+[expr {$y+4}]"  ;# move tooltip to the bottom
-                }
-            }
-            Rappture::Tooltip::text $g $tip
-            Rappture::Tooltip::tooltip show $g $tipx,$tipy
-        }
+        #
+        # Highlight ON:
+        # - activate trace
+        # - multiple axes? dim other axes
+        # - pop up tooltip about data
+        #
+        if { [$g element exists $_hilite(elem)] && $_hilite(elem) != $elem } {
+            $g element deactivate $_hilite(elem)
+            $g crosshairs configure -hide yes
+            Rappture::Tooltip::tooltip cancel
+        }
+        $g element activate $elem
+        set _hilite(elem) $elem
+
+        set mapx [$g element cget $elem -mapx]
+        set mapy [$g element cget $elem -mapy]
+        if {[info exists _elem2curve($elem)]} {
+            foreach {mapx mapy} [_getAxes $_elem2curve($elem)] break
+        }
+        set allx [$g x2axis use]
+        if {[llength $allx] > 0} {
+            lappend allx x  ;# fix main x-axis too
+            foreach axis $allx {
+                if {$axis == $mapx} {
+                    $g axis configure $axis -color $itk_option(-foreground) \
+                        -titlecolor $itk_option(-foreground)
+                } else {
+                    $g axis configure $axis -color $itk_option(-dimcolor) \
+                        -titlecolor $itk_option(-dimcolor)
+                }
+            }
+        }
+        set ally [$g y2axis use]
+        if {[llength $ally] > 0} {
+            lappend ally y  ;# fix main y-axis too
+            foreach axis $ally {
+                if {$axis == $mapy} {
+                    $g axis configure $axis -color $itk_option(-foreground) \
+                        -titlecolor $itk_option(-foreground)
+                } else {
+                    $g axis configure $axis -color $itk_option(-dimcolor) \
+                        -titlecolor $itk_option(-dimcolor)
+                }
+            }
+        }
+
+        if {"" != $tip} {
+            $g crosshairs configure -hide no -position @$x,$y
+
+            if {$x > 0.5*[winfo width $g]} {
+                if {$x < 4} {
+                    set tipx "-0"
+                } else {
+                    set tipx "-[expr {$x-4}]"  ;# move tooltip to the left
+                }
+            } else {
+                if {$x < -4} {
+                    set tipx "+0"
+                } else {
+                    set tipx "+[expr {$x+4}]"  ;# move tooltip to the right
+                }
+            }
+            if {$y > 0.5*[winfo height $g]} {
+                if {$y < 4} {
+                    set tipy "-0"
+                } else {
+                    set tipy "-[expr {$y-4}]"  ;# move tooltip to the top
+                }
+            } else {
+                if {$y < -4} {
+                    set tipy "+0"
+                } else {
+                    set tipy "+[expr {$y+4}]"  ;# move tooltip to the bottom
+                }
+            }
+            Rappture::Tooltip::text $g $tip
+            Rappture::Tooltip::tooltip show $g $tipx,$tipy
+        }
     } else {
-        #
-        # Highlight OFF:
-        # - deactivate (color back to normal)
-        # - put all axes back to normal color
-        # - take down tooltip
-        #
-        if { [$g element exists $_hilite(elem)] } {
-            $g element deactivate $_hilite(elem)
-        }
-        set allx [$g x2axis use]
-        if {[llength $allx] > 0} {
-            lappend allx x  ;# fix main x-axis too
-            foreach axis $allx {
-                $g axis configure $axis -color $itk_option(-foreground) \
-                    -titlecolor $itk_option(-foreground)
-            }
-        }
-        
-        set ally [$g y2axis use]
-        if {[llength $ally] > 0} {
-            lappend ally y  ;# fix main y-axis too
-            foreach axis $ally {
-                $g axis configure $axis -color $itk_option(-foreground) \
-                    -titlecolor $itk_option(-foreground)
-            }
-        }
-
-        $g crosshairs configure -hide yes
-
-        # only cancel in plotting area or we'll mess up axes
-        if {[$g inside $x $y]} {
-            Rappture::Tooltip::tooltip cancel
-        }
-
-        # There is no currently highlighted element
-        set _hilite(elem) ""
+        #
+        # Highlight OFF:
+        # - deactivate (color back to normal)
+        # - put all axes back to normal color
+        # - take down tooltip
+        #
+        if { [$g element exists $_hilite(elem)] } {
+            $g element deactivate $_hilite(elem)
+        }
+        set allx [$g x2axis use]
+        if {[llength $allx] > 0} {
+            lappend allx x  ;# fix main x-axis too
+            foreach axis $allx {
+                $g axis configure $axis -color $itk_option(-foreground) \
+                    -titlecolor $itk_option(-foreground)
+            }
+        }
+        
+        set ally [$g y2axis use]
+        if {[llength $ally] > 0} {
+            lappend ally y  ;# fix main y-axis too
+            foreach axis $ally {
+                $g axis configure $axis -color $itk_option(-foreground) \
+                    -titlecolor $itk_option(-foreground)
+            }
+        }
+
+        $g crosshairs configure -hide yes
+
+        # only cancel in plotting area or we'll mess up axes
+        if {[$g inside $x $y]} {
+            Rappture::Tooltip::tooltip cancel
+        }
+
+        # There is no currently highlighted element
+        set _hilite(elem) ""
     }
 }
@@ -1118 +1118 @@
 
     switch -- $option {
-        hilite {
-            if {[llength $args] != 2} {
-                error "wrong # args: should be \"_axis hilite axis state\""
-            }
-            set g $itk_component(plot)
-            set axis [lindex $args 0]
-            set state [lindex $args 1]
-
-            if {$state} {
-                $g axis configure $axis \
-                    -color $itk_option(-activecolor) \
-                    -titlecolor $itk_option(-activecolor)
-
-                set x [expr {[winfo pointerx $g]+4}]
-                set y [expr {[winfo pointery $g]+4}]
-                Rappture::Tooltip::tooltip pending $g-$axis @$x,$y
-            } else {
-                $g axis configure $axis \
-                    -color $itk_option(-foreground) \
-                    -titlecolor $itk_option(-foreground)
-                Rappture::Tooltip::tooltip cancel
-            }
-        }
-        click {
-            if {[llength $args] != 3} {
-                error "wrong # args: should be \"_axis click axis x y\""
-            }
-            set axis [lindex $args 0]
-            set x [lindex $args 1]
-            set y [lindex $args 2]
-            set g $itk_component(plot)
-
-            set _axis(moved) 0
-            set _axis(click-x) $x
-            set _axis(click-y) $y
-            foreach {min max} [$g axis limits $axis] break
-            set _axis(min0) $min
-            set _axis(max0) $max
-            Rappture::Tooltip::tooltip cancel
-        }
-        drag {
-            if {[llength $args] != 3} {
-                error "wrong # args: should be \"_axis drag axis x y\""
-            }
-            if {![info exists _axis(moved)]} {
-                return  ;# must have skipped click event -- ignore
-            }
-            set axis [lindex $args 0]
-            set x [lindex $args 1]
-            set y [lindex $args 2]
-            set g $itk_component(plot)
-
-            if {[info exists _axis(click-x)] && [info exists _axis(click-y)]} {
-                foreach {x0 y0 pw ph} [$g extents plotarea] break
-                switch -glob $axis {
-                  x* {
-                    set pix $x
-                    set pix0 $_axis(click-x)
-                    set pixmin $x0
-                    set pixmax [expr {$x0+$pw}]
-                  }
-                  y* {
-                    set pix $y
-                    set pix0 $_axis(click-y)
-                    set pixmin [expr {$y0+$ph}]
-                    set pixmax $y0
-                  }
-                }
-                set log [$g axis cget $axis -logscale]
-                set min $_axis(min0)
-                set max $_axis(max0)
-                set dpix [expr {abs($pix-$pix0)}]
-                set v0 [$g axis invtransform $axis $pixmin]
-                set v1 [$g axis invtransform $axis [expr {$pixmin+$dpix}]]
-                if {$log} {
-                    set v0 [expr {log10($v0)}]
-                    set v1 [expr {log10($v1)}]
-                    set min [expr {log10($min)}]
-                    set max [expr {log10($max)}]
-                }
-
-                if {$pix > $pix0} {
-                    set delta [expr {$v1-$v0}]
-                } else {
-                    set delta [expr {$v0-$v1}]
-                }
-                set min [expr {$min-$delta}]
-                set max [expr {$max-$delta}]
-                if {$log} {
-                    set min [expr {pow(10.0,$min)}]
-                    set max [expr {pow(10.0,$max)}]
-                }
-                $g axis configure $axis -min $min -max $max
-
-                # move axis, don't edit on release
-                set _axis(move) 1
-            }
-        }
-        release {
-            if {[llength $args] != 3} {
-                error "wrong # args: should be \"_axis release axis x y\""
-            }
-            if {![info exists _axis(moved)]} {
-                return  ;# must have skipped click event -- ignore
-            }
-            set axis [lindex $args 0]
-            set x [lindex $args 1]
-            set y [lindex $args 2]
-
-            if {!$_axis(moved)} {
-                # small movement? then treat as click -- pop up axis editor
-                set dx [expr {abs($x-$_axis(click-x))}]
-                set dy [expr {abs($y-$_axis(click-y))}]
-                if {$dx < 2 && $dy < 2} {
-                    _axis edit $axis
-                }
-            } else {
-                # one last movement
-                _axis drag $axis $x $y
-            }
-            catch {unset _axis}
-        }
-        edit {
-            if {[llength $args] != 1} {
-                error "wrong # args: should be \"_axis edit axis\""
-            }
-            set axis [lindex $args 0]
-            set _axisPopup(current) $axis
-
-            # apply last value when deactivating
-            $itk_component(hull).axes configure -deactivatecommand \
-                [itcl::code $this _axis changed $axis focus]
-
-            # fix axis label controls...
-            set label [$itk_component(plot) axis cget $axis -title]
-            $inner.label delete 0 end
-            $inner.label insert end $label
-            bind $inner.label <KeyPress-Return> \
-                [itcl::code $this _axis changed $axis label]
-            bind $inner.label <FocusOut> \
-                [itcl::code $this _axis changed $axis label]
-
-            # fix min/max controls...
-            foreach {min max} [$itk_component(plot) axis limits $axis] break
-            $inner.min delete 0 end
-            $inner.min insert end $min
-            bind $inner.min <KeyPress-Return> \
-                [itcl::code $this _axis changed $axis min]
-            bind $inner.min <FocusOut> \
-                [itcl::code $this _axis changed $axis min]
-
-            $inner.max delete 0 end
-            $inner.max insert end $max
-            bind $inner.max <KeyPress-Return> \
-                [itcl::code $this _axis changed $axis max]
-            bind $inner.max <FocusOut> \
-                [itcl::code $this _axis changed $axis max]
-
-            # fix format control...
-            set fmts [$inner.format choices get -value]
-            set i [lsearch -exact $fmts $_axisPopup(format-$axis)]
-            if {$i < 0} { set i 0 }  ;# use Auto choice
-            $inner.format value [$inner.format choices get -label $i]
-
-            bind $inner.format <<Value>> \
-                [itcl::code $this _axis changed $axis format]
-
-            # fix scale control...
-            if {[$itk_component(plot) axis cget $axis -logscale]} {
-                set _axisPopup(scale) "log"
-                $inner.format configure -state disabled
-            } else {
-                set _axisPopup(scale) "linear"
-                $inner.format configure -state normal
-            }
-            $inner.scales.linear configure \
-                -command [itcl::code $this _axis changed $axis scale]
-            $inner.scales.log configure \
-                -command [itcl::code $this _axis changed $axis scale]
-
-            #
-            # Figure out where the window should pop up.
-            #
-            set x [winfo rootx $itk_component(plot)]
-            set y [winfo rooty $itk_component(plot)]
-            set w [winfo width $itk_component(plot)]
-            set h [winfo height $itk_component(plot)]
-            foreach {x0 y0 pw ph} [$itk_component(plot) extents plotarea] break
-            switch -glob -- $axis {
-                x {
-                    set x [expr {round($x + $x0+0.5*$pw)}]
-                    set y [expr {round($y + $y0+$ph + 0.5*($h-$y0-$ph))}]
-                    set dir "above"
-                }
-                x* {
-                    set x [expr {round($x + $x0+0.5*$pw)}]
-                    set dir "below"
-                    set allx [$itk_component(plot) x2axis use]
-                    set max [llength $allx]
-                    set i [lsearch -exact $allx $axis]
-                    set y [expr {round($y + ($i+0.5)*$y0/double($max))}]
-                }
-                y {
-                    set x [expr {round($x + 0.5*$x0)}]
-                    set y [expr {round($y + $y0+0.5*$ph)}]
-                    set dir "right"
-                }
-                y* {
-                    set y [expr {round($y + $y0+0.5*$ph)}]
-                    set dir "left"
-                    set ally [$itk_component(plot) y2axis use]
-                    set max [llength $ally]
-                    set i [lsearch -exact $ally $axis]
-                    set y [expr {round($y + ($i+0.5)*$y0/double($max))}]
-                    set x [expr {round($x+$x0+$pw + ($i+0.5)*($w-$x0-$pw)/double($max))}]
-                }
-            }
-            $itk_component(hull).axes activate @$x,$y $dir
-        }
-        changed {
-            if {[llength $args] != 2} {
-                error "wrong # args: should be \"_axis changed axis what\""
-            }
-            set axis [lindex $args 0]
-            set what [lindex $args 1]
-            if {$what == "focus"} {
-                set what [focus]
-                if {[winfo exists $what]} {
-                    set what [winfo name $what]
-                }
-            }
-
-            switch -- $what {
-                label {
-                    set val [$inner.label get]
-                    $itk_component(plot) axis configure $axis -title $val
-                }
-                min {
-                    set val [$inner.min get]
-                    if {![string is double -strict $val]} {
-                        Rappture::Tooltip::cue $inner.min "Must be a number"
-                        bell
-                        return
-                    }
-
-                    set max [lindex [$itk_component(plot) axis limits $axis] 1]
-                    if {$val >= $max} {
-                        Rappture::Tooltip::cue $inner.min "Must be <= max ($max)"
-                        bell
-                        return
-                    }
-                    catch {
-                        # can fail in log mode
-                        $itk_component(plot) axis configure $axis -min $val
-                    }
-                    foreach {min max} [$itk_component(plot) axis limits $axis] break
-                    $inner.min delete 0 end
-                    $inner.min insert end $min
-                }
-                max {
-                    set val [$inner.max get]
-                    if {![string is double -strict $val]} {
-                        Rappture::Tooltip::cue $inner.max "Should be a number"
-                        bell
-                        return
-                    }
-
-                    set min [lindex [$itk_component(plot) axis limits $axis] 0]
-                    if {$val <= $min} {
-                        Rappture::Tooltip::cue $inner.max "Must be >= min ($min)"
-                        bell
-                        return
-                    }
-                    catch {
-                        # can fail in log mode
-                        $itk_component(plot) axis configure $axis -max $val
-                    }
-                    foreach {min max} [$itk_component(plot) axis limits $axis] break
-                    $inner.max delete 0 end
-                    $inner.max insert end $max
-                }
-                format {
-                    set fmt [$inner.format translate [$inner.format value]]
-                    set _axisPopup(format-$axis) $fmt
-
-                    # force a refresh
-                    $itk_component(plot) axis configure $axis -min \
-                        [$itk_component(plot) axis cget $axis -min]
-                }
-                scale {
-                    _axis scale $axis $_axisPopup(scale)
-
-                    if {$_axisPopup(scale) == "log"} {
-                        $inner.format configure -state disabled
-                    } else {
-                        $inner.format configure -state normal
-                    }
-
-                    foreach {min max} [$itk_component(plot) axis limits $axis] break
-                    $inner.min delete 0 end
-                    $inner.min insert end $min
-                    $inner.max delete 0 end
-                    $inner.max insert end $max
-                }
-                default {
-                    # be lenient so we can handle the "focus" case
-                }
-            }
-        }
-        format {
-            if {[llength $args] != 3} {
-                error "wrong # args: should be \"_axis format axis widget value\""
-            }
-            set axis [lindex $args 0]
-            set value [lindex $args 2]
-
-            if {[$itk_component(plot) axis cget $axis -logscale]} {
-                set fmt "%.3g"
-            } else {
-                set fmt $_axisPopup(format-$axis)
-            }
-            return [format $fmt $value]
-        }
-        scale {
-            if {[llength $args] != 2} {
-                error "wrong # args: should be \"_axis scale axis type\""
-            }
-            set axis [lindex $args 0]
-            set type [lindex $args 1]
-
-            if {$type == "log"} {
-                catch {$itk_component(plot) axis configure $axis -logscale 1}
-                # leave format alone in log mode
-                $itk_component(plot) axis configure $axis -command ""
-            } else {
-                catch {$itk_component(plot) axis configure $axis -logscale 0}
-                # use special formatting for linear mode
-                $itk_component(plot) axis configure $axis -command \
-                    [itcl::code $this _axis format $axis]
-            }
-        }
-        default {
-            error "bad option \"$option\": should be changed, edit, hilite, or format"
-        }
+        hilite {
+            if {[llength $args] != 2} {
+                error "wrong # args: should be \"_axis hilite axis state\""
+            }
+            set g $itk_component(plot)
+            set axis [lindex $args 0]
+            set state [lindex $args 1]
+
+            if {$state} {
+                $g axis configure $axis \
+                    -color $itk_option(-activecolor) \
+                    -titlecolor $itk_option(-activecolor)
+
+                set x [expr {[winfo pointerx $g]+4}]
+                set y [expr {[winfo pointery $g]+4}]
+                Rappture::Tooltip::tooltip pending $g-$axis @$x,$y
+            } else {
+                $g axis configure $axis \
+                    -color $itk_option(-foreground) \
+                    -titlecolor $itk_option(-foreground)
+                Rappture::Tooltip::tooltip cancel
+            }
+        }
+        click {
+            if {[llength $args] != 3} {
+                error "wrong # args: should be \"_axis click axis x y\""
+            }
+            set axis [lindex $args 0]
+            set x [lindex $args 1]
+            set y [lindex $args 2]
+            set g $itk_component(plot)
+
+            set _axis(moved) 0
+            set _axis(click-x) $x
+            set _axis(click-y) $y
+            foreach {min max} [$g axis limits $axis] break
+            set _axis(min0) $min
+            set _axis(max0) $max
+            Rappture::Tooltip::tooltip cancel
+        }
+        drag {
+            if {[llength $args] != 3} {
+                error "wrong # args: should be \"_axis drag axis x y\""
+            }
+            if {![info exists _axis(moved)]} {
+                return  ;# must have skipped click event -- ignore
+            }
+            set axis [lindex $args 0]
+            set x [lindex $args 1]
+            set y [lindex $args 2]
+            set g $itk_component(plot)
+
+            if {[info exists _axis(click-x)] && [info exists _axis(click-y)]} {
+                foreach {x0 y0 pw ph} [$g extents plotarea] break
+                switch -glob $axis {
+                  x* {
+                    set pix $x
+                    set pix0 $_axis(click-x)
+                    set pixmin $x0
+                    set pixmax [expr {$x0+$pw}]
+                  }
+                  y* {
+                    set pix $y
+                    set pix0 $_axis(click-y)
+                    set pixmin [expr {$y0+$ph}]
+                    set pixmax $y0
+                  }
+                }
+                set log [$g axis cget $axis -logscale]
+                set min $_axis(min0)
+                set max $_axis(max0)
+                set dpix [expr {abs($pix-$pix0)}]
+                set v0 [$g axis invtransform $axis $pixmin]
+                set v1 [$g axis invtransform $axis [expr {$pixmin+$dpix}]]
+                if {$log} {
+                    set v0 [expr {log10($v0)}]
+                    set v1 [expr {log10($v1)}]
+                    set min [expr {log10($min)}]
+                    set max [expr {log10($max)}]
+                }
+
+                if {$pix > $pix0} {
+                    set delta [expr {$v1-$v0}]
+                } else {
+                    set delta [expr {$v0-$v1}]
+                }
+                set min [expr {$min-$delta}]
+                set max [expr {$max-$delta}]
+                if {$log} {
+                    set min [expr {pow(10.0,$min)}]
+                    set max [expr {pow(10.0,$max)}]
+                }
+                $g axis configure $axis -min $min -max $max
+
+                # move axis, don't edit on release
+                set _axis(move) 1
+            }
+        }
+        release {
+            if {[llength $args] != 3} {
+                error "wrong # args: should be \"_axis release axis x y\""
+            }
+            if {![info exists _axis(moved)]} {
+                return  ;# must have skipped click event -- ignore
+            }
+            set axis [lindex $args 0]
+            set x [lindex $args 1]
+            set y [lindex $args 2]
+
+            if {!$_axis(moved)} {
+                # small movement? then treat as click -- pop up axis editor
+                set dx [expr {abs($x-$_axis(click-x))}]
+                set dy [expr {abs($y-$_axis(click-y))}]
+                if {$dx < 2 && $dy < 2} {
+                    _axis edit $axis
+                }
+            } else {
+                # one last movement
+                _axis drag $axis $x $y
+            }
+            catch {unset _axis}
+        }
+        edit {
+            if {[llength $args] != 1} {
+                error "wrong # args: should be \"_axis edit axis\""
+            }
+            set axis [lindex $args 0]
+            set _axisPopup(current) $axis
+
+            # apply last value when deactivating
+            $itk_component(hull).axes configure -deactivatecommand \
+                [itcl::code $this _axis changed $axis focus]
+
+            # fix axis label controls...
+            set label [$itk_component(plot) axis cget $axis -title]
+            $inner.label delete 0 end
+            $inner.label insert end $label
+            bind $inner.label <KeyPress-Return> \
+                [itcl::code $this _axis changed $axis label]
+            bind $inner.label <FocusOut> \
+                [itcl::code $this _axis changed $axis label]
+
+            # fix min/max controls...
+            foreach {min max} [$itk_component(plot) axis limits $axis] break
+            $inner.min delete 0 end
+            $inner.min insert end $min
+            bind $inner.min <KeyPress-Return> \
+                [itcl::code $this _axis changed $axis min]
+            bind $inner.min <FocusOut> \
+                [itcl::code $this _axis changed $axis min]
+
+            $inner.max delete 0 end
+            $inner.max insert end $max
+            bind $inner.max <KeyPress-Return> \
+                [itcl::code $this _axis changed $axis max]
+            bind $inner.max <FocusOut> \
+                [itcl::code $this _axis changed $axis max]
+
+            # fix format control...
+            set fmts [$inner.format choices get -value]
+            set i [lsearch -exact $fmts $_axisPopup(format-$axis)]
+            if {$i < 0} { set i 0 }  ;# use Auto choice
+            $inner.format value [$inner.format choices get -label $i]
+
+            bind $inner.format <<Value>> \
+                [itcl::code $this _axis changed $axis format]
+
+            # fix scale control...
+            if {[$itk_component(plot) axis cget $axis -logscale]} {
+                set _axisPopup(scale) "log"
+                $inner.format configure -state disabled
+            } else {
+                set _axisPopup(scale) "linear"
+                $inner.format configure -state normal
+            }
+            $inner.scales.linear configure \
+                -command [itcl::code $this _axis changed $axis scale]
+            $inner.scales.log configure \
+                -command [itcl::code $this _axis changed $axis scale]
+
+            #
+            # Figure out where the window should pop up.
+            #
+            set x [winfo rootx $itk_component(plot)]
+            set y [winfo rooty $itk_component(plot)]
+            set w [winfo width $itk_component(plot)]
+            set h [winfo height $itk_component(plot)]
+            foreach {x0 y0 pw ph} [$itk_component(plot) extents plotarea] break
+            switch -glob -- $axis {
+                x {
+                    set x [expr {round($x + $x0+0.5*$pw)}]
+                    set y [expr {round($y + $y0+$ph + 0.5*($h-$y0-$ph))}]
+                    set dir "above"
+                }
+                x* {
+                    set x [expr {round($x + $x0+0.5*$pw)}]
+                    set dir "below"
+                    set allx [$itk_component(plot) x2axis use]
+                    set max [llength $allx]
+                    set i [lsearch -exact $allx $axis]
+                    set y [expr {round($y + ($i+0.5)*$y0/double($max))}]
+                }
+                y {
+                    set x [expr {round($x + 0.5*$x0)}]
+                    set y [expr {round($y + $y0+0.5*$ph)}]
+                    set dir "right"
+                }
+                y* {
+                    set y [expr {round($y + $y0+0.5*$ph)}]
+                    set dir "left"
+                    set ally [$itk_component(plot) y2axis use]
+                    set max [llength $ally]
+                    set i [lsearch -exact $ally $axis]
+                    set y [expr {round($y + ($i+0.5)*$y0/double($max))}]
+                    set x [expr {round($x+$x0+$pw + ($i+0.5)*($w-$x0-$pw)/double($max))}]
+                }
+            }
+            $itk_component(hull).axes activate @$x,$y $dir
+        }
+        changed {
+            if {[llength $args] != 2} {
+                error "wrong # args: should be \"_axis changed axis what\""
+            }
+            set axis [lindex $args 0]
+            set what [lindex $args 1]
+            if {$what == "focus"} {
+                set what [focus]
+                if {[winfo exists $what]} {
+                    set what [winfo name $what]
+                }
+            }
+
+            switch -- $what {
+                label {
+                    set val [$inner.label get]
+                    $itk_component(plot) axis configure $axis -title $val
+                }
+                min {
+                    set val [$inner.min get]
+                    if {![string is double -strict $val]} {
+                        Rappture::Tooltip::cue $inner.min "Must be a number"
+                        bell
+                        return
+                    }
+
+                    set max [lindex [$itk_component(plot) axis limits $axis] 1]
+                    if {$val >= $max} {
+                        Rappture::Tooltip::cue $inner.min "Must be <= max ($max)"
+                        bell
+                        return
+                    }
+                    catch {
+                        # can fail in log mode
+                        $itk_component(plot) axis configure $axis -min $val
+                    }
+                    foreach {min max} [$itk_component(plot) axis limits $axis] break
+                    $inner.min delete 0 end
+                    $inner.min insert end $min
+                }
+                max {
+                    set val [$inner.max get]
+                    if {![string is double -strict $val]} {
+                        Rappture::Tooltip::cue $inner.max "Should be a number"
+                        bell
+                        return
+                    }
+
+                    set min [lindex [$itk_component(plot) axis limits $axis] 0]
+                    if {$val <= $min} {
+                        Rappture::Tooltip::cue $inner.max "Must be >= min ($min)"
+                        bell
+                        return
+                    }
+                    catch {
+                        # can fail in log mode
+                        $itk_component(plot) axis configure $axis -max $val
+                    }
+                    foreach {min max} [$itk_component(plot) axis limits $axis] break
+                    $inner.max delete 0 end
+                    $inner.max insert end $max
+                }
+                format {
+                    set fmt [$inner.format translate [$inner.format value]]
+                    set _axisPopup(format-$axis) $fmt
+
+                    # force a refresh
+                    $itk_component(plot) axis configure $axis -min \
+                        [$itk_component(plot) axis cget $axis -min]
+                }
+                scale {
+                    _axis scale $axis $_axisPopup(scale)
+
+                    if {$_axisPopup(scale) == "log"} {
+                        $inner.format configure -state disabled
+                    } else {
+                        $inner.format configure -state normal
+                    }
+
+                    foreach {min max} [$itk_component(plot) axis limits $axis] break
+                    $inner.min delete 0 end
+                    $inner.min insert end $min
+                    $inner.max delete 0 end
+                    $inner.max insert end $max
+                }
+                default {
+                    # be lenient so we can handle the "focus" case
+                }
+            }
+        }
+        format {
+            if {[llength $args] != 3} {
+                error "wrong # args: should be \"_axis format axis widget value\""
+            }
+            set axis [lindex $args 0]
+            set value [lindex $args 2]
+
+            if {[$itk_component(plot) axis cget $axis -logscale]} {
+                set fmt "%.3g"
+            } else {
+                set fmt $_axisPopup(format-$axis)
+            }
+            return [format $fmt $value]
+        }
+        scale {
+            if {[llength $args] != 2} {
+                error "wrong # args: should be \"_axis scale axis type\""
+            }
+            set axis [lindex $args 0]
+            set type [lindex $args 1]
+
+            if {$type == "log"} {
+                catch {$itk_component(plot) axis configure $axis -logscale 1}
+                # leave format alone in log mode
+                $itk_component(plot) axis configure $axis -command ""
+            } else {
+                catch {$itk_component(plot) axis configure $axis -logscale 0}
+                # use special formatting for linear mode
+                $itk_component(plot) axis configure $axis -command \
+                    [itcl::code $this _axis format $axis]
+            }
+        }
+        default {
+            error "bad option \"$option\": should be changed, edit, hilite, or format"
+        }
     }
 }
@@ -1475 +1475 @@
 itcl::body Rappture::XyResult::_getLineMarkerOptions {style} {
     array set lineOptions {
-        "-color"  "-outline"
-        "-dashes" "-dashes"
-        "-linecolor" "-outline"
-        "-linewidth" "-linewidth"
+        "-color"  "-outline"
+        "-dashes" "-dashes"
+        "-linecolor" "-outline"
+        "-linewidth" "-linewidth"
     }
     set options {}
     foreach {name value} $style {
-        if { [info exists lineOptions($name)] } {
-            lappend options $lineOptions($name) $value
-        }
+        if { [info exists lineOptions($name)] } {
+            lappend options $lineOptions($name) $value
+        }
     }
     return $options
@@ -1498 +1498 @@
 itcl::body Rappture::XyResult::_getTextMarkerOptions {style} {
     array set textOptions {
-        "-color"  "-outline"
-        "-textcolor"  "-outline"
-        "-font"   "-font"
-        "-xoffset" "-xoffset"
-        "-yoffset" "-yoffset"
-        "-anchor" "-anchor"
+        "-color"  "-outline"
+        "-textcolor"  "-outline"
+        "-font"   "-font"
+        "-xoffset" "-xoffset"
+        "-yoffset" "-yoffset"
+        "-anchor" "-anchor"
     }
     set options {}
     foreach {name value} $style {
-        if { [info exists textOptions($name)] } {
-            lappend options $textOptions($name) $value
-        }
+        if { [info exists textOptions($name)] } {
+            lappend options $textOptions($name) $value
+        }
     }
     return $options
@@ -1524 +1524 @@
     # rebuild if needed, so we know about the axes
     if {[$_dispatcher ispending !rebuild]} {
-        $_dispatcher cancel !rebuild
-        $_dispatcher event -now !rebuild
+        $_dispatcher cancel !rebuild
+        $_dispatcher event -now !rebuild
     }
 
@@ -1531 +1531 @@
     set xlabel [$xydata hints xlabel]
     if {[info exists _label2axis(x-$xlabel)]} {
-        set mapx $_label2axis(x-$xlabel)
+        set mapx $_label2axis(x-$xlabel)
     } else {
-        set mapx "x"
+        set mapx "x"
     }
 
@@ -1539 +1539 @@
     set ylabel [$xydata hints ylabel]
     if {[info exists _label2axis(y-$ylabel)]} {
-        set mapy $_label2axis(y-$ylabel)
+        set mapy $_label2axis(y-$ylabel)
     } else {
-        set mapy "y"
+        set mapy "y"
     }
 
@@ -1552 +1552 @@
 itcl::configbody Rappture::XyResult::gridcolor {
     if {"" == $itk_option(-gridcolor)} {
-        $itk_component(plot) grid off
+        $itk_component(plot) grid off
     } else {
-        $itk_component(plot) grid configure -color $itk_option(-gridcolor)
-        $itk_component(plot) grid on
+        $itk_component(plot) grid configure -color $itk_option(-gridcolor)
+        $itk_component(plot) grid on
     }
 }
@@ -1564 +1564 @@
 itcl::configbody Rappture::XyResult::autocolors {
     foreach c $itk_option(-autocolors) {
-        if {[catch {winfo rgb $itk_component(hull) $c}]} {
-            error "bad color \"$c\""
-        }
+        if {[catch {winfo rgb $itk_component(hull) $c}]} {
+            error "bad color \"$c\""
+        }
     }
     if {$_autoColorI >= [llength $itk_option(-autocolors)]} {
-        set _autoColorI 0
+        set _autoColorI 0
     }
 }
@@ -1576 +1576 @@
     _leaveMarker $g $name
     set id [$g marker create text \
-                -coords [list $x $y] \
-                -yoffset -1 \
-                -anchor s \
-                -text $text]
+                -coords [list $x $y] \
+                -yoffset -1 \
+                -anchor s \
+                -text $text]
     set _markers($name) $id
 }
@@ -1585 +1585 @@
 itcl::body Rappture::XyResult::_leaveMarker { g name } {
     if { [info exists _markers($name)] } { 
-        set id $_markers($name)
-        $g marker delete $id
-        unset _markers($name)
-    }
-}
+        set id $_markers($name)
+        $g marker delete $id
+        unset _markers($name)
+    }
+}

trunk/lang/python/Rappture/PyRpLibrary.cc

@@ -28 +28 @@
 
 static PyObject *ErrorObject;
-RpLibrary* RpLibraryObject_AsLibrary(PyObject *lib);
-static PyObject* RpLibraryObject_FromLibrary(RpLibrary *lib);
-int boolAsInt(const char* inVal, int* outVal);
-int boolIntFromPyObject ( PyObject* inPyObj, const char* defaultVal,
-                            const char* argName, int* boolVal);
-int getArgCount ( PyObject* args, PyObject* keywds, int* argc);
+RpLibrary * RpLibraryObject_AsLibrary(PyObject *lib);
+static PyObject * RpLibraryObject_FromLibrary(RpLibrary *lib);
+int boolAsInt(const char *inVal, int *outVal);
+int boolIntFromPyObject ( PyObject *inPyObj, const char *defaultVal,
+                            const char *argName, int *boolVal);
+int getArgCount ( PyObject *args, PyObject *keywds, int *argc);
 
 typedef struct {
     PyObject_HEAD
-    RpLibrary* lib;
+    RpLibrary *lib;
 } RpLibraryObject;
 
@@ -87 +87 @@
 }
 
-static PyObject*
+static PyObject *
 RpLibraryObject_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
@@ -149 +149 @@
             delete(self->lib);
         }
-        self->ob_type->tp_free((PyObject*) self);
+        self->ob_type->tp_free((PyObject *) self);
     }
 }
@@ -169 +169 @@
 ");
 
-static PyObject*
+static PyObject *
 RpLibraryObject_copy(RpLibraryObject *self, PyObject *args, PyObject *keywds)
 {
@@ -178 +178 @@
     PyObject *fromobj = (PyObject *) self;
 
-    static char *kwlist[] = { 
-        (char *)"topath",
-        (char *)"frompath",
-        (char *)"fromobj", 
-        NULL
+    static char *kwlist[] = {
+        (char *)"topath",
+        (char *)"frompath",
+        (char *)"fromobj",
+        NULL
     };
 
@@ -252 +252 @@
 ");
 
-static PyObject*
+static PyObject *
 RpLibraryObject_element(RpLibraryObject *self, PyObject *args, PyObject *keywds)
 {
@@ -263 +263 @@
 
     static char *kwlist[] = {
-        (char *)"path", 
-        (char *)"as", 
-        NULL
+        (char *)"path",
+        (char *)"as",
+        NULL
     };
 
@@ -340 +340 @@
 ");
 
-static PyObject*
+static PyObject *
 RpLibraryObject_get(RpLibraryObject *self, PyObject *args, PyObject *keywds)
 {
@@ -356 +356 @@
 
     static char *kwlist[] = {
-        (char *)"path",
-        (char *)"decode", 
-        NULL
+        (char *)"path",
+        (char *)"decode",
+        NULL
     };
 
@@ -432 +432 @@
 ");
 
-static PyObject*
+static PyObject *
 RpLibraryObject_parent(RpLibraryObject *self, PyObject *args, PyObject *keywds)
 {
@@ -443 +443 @@
 
     static char *kwlist[] = {
-        (char *)"path", 
-        (char *)"as", 
-        NULL
+        (char *)"path",
+        (char *)"as",
+        NULL
     };
 
@@ -531 +531 @@
 ");
 
-static PyObject*
+static PyObject *
 RpLibraryObject_put(RpLibraryObject *self, PyObject *args, PyObject *keywds)
 {
@@ -555 +555 @@
 
     static char *kwlist[] = {
-        (char *)"path",
-        (char *)"value",
-        (char *)"id",
-        (char *)"append",
-        (char *)"type",
-        (char *)"compress", 
-        NULL
+        (char *)"path",
+        (char *)"value",
+        (char *)"id",
+        (char *)"append",
+        (char *)"type",
+        (char *)"compress",
+        NULL
     };
 
@@ -827 +827 @@
  * used to create a RpLibrary object from a PyObject
  */
-RpLibrary*
+RpLibrary *
 RpLibraryObject_AsLibrary(PyObject *lib)
 {
-    RpLibrary* retval = NULL;
+    RpLibrary *retval = NULL;
 
     if (lib != NULL) {
@@ -843 +843 @@
  * used to create a PyObject from a RpLibrary object
  */
-PyObject*
+PyObject *
 RpLibraryObject_FromLibrary(RpLibrary *lib)
 {
@@ -883 +883 @@
 
 int
-boolAsInt(const char* inVal, int* outVal)
+boolAsInt(const char *inVal, int *outVal)
 {
     int len = 0;
@@ -936 +936 @@
 int
 boolIntFromPyObject (
-    PyObject* inPyObj,
-    const char* defaultVal,
-    const char* argName,
-    int* boolVal
+    PyObject *inPyObj,
+    const char *defaultVal,
+    const char *argName,
+    int *boolVal
     )
 {
     int status = -1;
-    PyObject* inStrObj = NULL;
-    char* inStr = NULL;
+    PyObject *inStrObj = NULL;
+    char *inStr = NULL;
 
     if (    (defaultVal == NULL) ||
@@ -983 +983 @@
 
 int getArgCount (
-    PyObject* args,
-    PyObject* keywds,
-    int* argc
+    PyObject *args,
+    PyObject *keywds,
+    int *argc
     )
 {

trunk/src/core/RpBuffer.cc

@@ -120 +120 @@
     if (f == NULL) {
         status.addError("can't open \"%s\": %s", filePath, strerror(errno));
-        return false;
+        return false;
     }
     struct stat stat;
     if (fstat(fileno(f), &stat) < 0) {
         status.addError("can't stat \"%s\": %s", filePath, strerror(errno));
-        return false;
-    }   
+        return false;
+    }
     off_t size;
     size = stat.st_size;
@@ -133 +133 @@
     if (memblock == NULL) {
         status.addError("can't allocate %d bytes for file \"%s\": %s",
-                        size, filePath, strerror(errno));
+                        size, filePath, strerror(errno));
         fclose(f);
         return false;
@@ -139 +139 @@
 
     // FIXME: better yet, create an "extend" method in the buffer and returns
-    //       the address of the char buffer so I can read the data directly
-    //       into the buffer.  This eliminates memory new/copy/delete ops.
+    //             the address of the char buffer so I can read the data directly
+    //             into the buffer.  This eliminates memory new/copy/delete ops.
 
     size_t nRead;
     nRead = fread(memblock, sizeof(char), size, f);
-    fclose(f);                  // Close the file.
+    fclose(f);                        // Close the file.
 
     if (nRead != (size_t)size) {
         status.addError("can't read %d bytes from \"%s\": %s", size, filePath, 
-                        strerror(errno));
-        return false;
-    }   
+                        strerror(errno));
+        return false;
+    }
 
     int nBytes;
@@ -158 +158 @@
     if (nBytes != size) {
         status.addError("can't append %d bytes from \"%s\" to buffer: %s", 
-                size, filePath, strerror(errno));
-        return false;
-    }   
+                size, filePath, strerror(errno));
+        return false;
+    }
     return true;
 }
@@ -174 +174 @@
     if (f != NULL) {
         status.addError("can't open \"%s\": %s\n", filePath, strerror(errno));
-        return false;
+        return false;
     }
     ssize_t nWritten;
     nWritten = fwrite(bytes(), size(), sizeof(char), f);
-    fclose(f);                  // Close the file.
-    
+    fclose(f);                        // Close the file.
+
     if (nWritten != (ssize_t)size()) {
         status.addError("can't write %d bytes to \"%s\": %s\n", size(), 
-                        filePath, strerror(errno));
-        return false;
+                        filePath, strerror(errno));
+        return false;
     }
     return true;
@@ -198 +198 @@
     switch (flags & (RPENC_Z | RPENC_B64)) {
     case 0:
-        break;
-
-    case RPENC_Z:               // Compress only
-        if (!do_compress(status, *this, bout)) {
-            return false;
-        }
-        move(bout);
-        break;
-
-    case RPENC_B64:             // Encode only
+        break;
+
+    case RPENC_Z:                // Compress only
+        if (!do_compress(status, *this, bout)) {
+            return false;
+        }
+        move(bout);
+        break;
+
+    case RPENC_B64:                // Encode only
         if (!do_base64_enc(status, *this, bout)) {
             return false;
         }
-        move(bout);
-        break;
+        move(bout);
+        break;
 
     case (RPENC_B64 | RPENC_Z):
-        
-        // It's always compress then encode
-        if (!do_compress(status, *this, bout)) {
-            return false;
-        }
+
+        // It's always compress then encode
+        if (!do_compress(status, *this, bout)) {
+            return false;
+        }
         if (!do_base64_enc(status, bout, *this)) {
             return false;
         }
-        break;
+        break;
     }
     return true;
@@ -238 +238 @@
     switch (flags & (RPENC_Z | RPENC_B64)) {
     case 0:
-        if (encoding::isBase64(bytes(), size())) {
-            if (!do_base64_dec(status, *this, bout)) {
-                return false;
-            }
-            move(bout);
-        }
-        bout.clear();
-        if (encoding::isBinary(bytes(), size())) {
-            if (!do_decompress(status, *this, bout)) {
-                return false;
-            }
-            move(bout);
-        }
-        break;
-
-    case RPENC_Z:               // Decompress only
-        if (!do_decompress(status, *this, bout)) {
-            return false;
-        }
-        move(bout);
-        break;
-
-    case RPENC_B64:             // Decode only
+        if (encoding::isBase64(bytes(), size())) {
+            if (!do_base64_dec(status, *this, bout)) {
+                return false;
+            }
+            move(bout);
+        }
+        bout.clear();
+        if (encoding::isBinary(bytes(), size())) {
+            if (!do_decompress(status, *this, bout)) {
+                return false;
+            }
+            move(bout);
+        }
+        break;
+
+    case RPENC_Z:                // Decompress only
+        if (!do_decompress(status, *this, bout)) {
+            return false;
+        }
+        move(bout);
+        break;
+
+    case RPENC_B64:                // Decode only
         if (!do_base64_dec(status, *this, bout)) {
             return false;
         }
-        move(bout);
-        break;
+        move(bout);
+        break;
 
     case (RPENC_B64 | RPENC_Z):
-        
-        // It's always decode then decompress
+
+        // It's always decode then decompress
         if (!do_base64_dec(status, *this, bout)) {
             return false;
         }
-        clear();
-        if (!do_decompress(status, bout, *this)) {
-            return false;
-        }
-        break;
+        clear();
+        if (!do_decompress(status, bout, *this)) {
+            return false;
+        }
+        break;
     }
     return true;
@@ -285 +285 @@
 bool
 Buffer::do_compress(Outcome& status, SimpleCharBuffer& bin, 
-                    SimpleCharBuffer& bout)
+                    SimpleCharBuffer& bout)
 {
     int ret=0, flush=0;
@@ -357 +357 @@
 bool
 Buffer::do_decompress(Outcome& status, SimpleCharBuffer& bin,
-                      SimpleCharBuffer& bout)
+                      SimpleCharBuffer& bout)
 {
     int ret;
@@ -433 +433 @@
 bool
 Buffer::do_base64_enc(Outcome& status, const SimpleCharBuffer& bin,
-                      SimpleCharBuffer& bout )
+                      SimpleCharBuffer& bout )
 {
     int tBufSize = 0;
@@ -453 +453 @@
 bool
 Buffer::do_base64_dec(Outcome& status, const SimpleCharBuffer& bin,
-                      SimpleCharBuffer& bout )
+                      SimpleCharBuffer& bout )
 {
     int tBufSize = 0;

trunk/src/core/RpBuffer.h

@@ -72 +72 @@
 
     enum { CHUNK = 4096 };
-    
+
     bool do_compress(Outcome& status, SimpleCharBuffer& bin,
-                     SimpleCharBuffer& bout  );
+                     SimpleCharBuffer& bout  );
     bool do_decompress( Outcome& status, SimpleCharBuffer& bin,
                         SimpleCharBuffer& bout  );
     bool do_base64_enc(Outcome& status, const SimpleCharBuffer& bin,
-                       SimpleCharBuffer& bout  );
+                       SimpleCharBuffer& bout  );
     bool do_base64_dec(Outcome& status, const SimpleCharBuffer& bin,
-                       SimpleCharBuffer& bout  );
+                       SimpleCharBuffer& bout  );
 };
 
 } // namespace Rappture
- 
+
 #ifdef __cplusplus
     }

trunk/src/core/RpLibrary.cc

@@ -1177 +1177 @@
         if (retNode) {
             // allocate a new rappture library object for the node
-            retLib = new RpLibrary( retNode,this->tree ); 
+            retLib = new RpLibrary( retNode,this->tree );
         }
     }
@@ -1545 +1545 @@
         // because base64 character set does not include xml entity chars
         if (!Rappture::encoding::decode(status, inData, 0)) {
-            return retStr;
-        }
+            return retStr;
+        }
         retStr = std::string(inData.bytes(),inData.size());
     } else {
@@ -1552 +1552 @@
         if (translateFlag == RPLIB_TRANSLATE) {
             translatedContents = ERTranslator.decode(inData.bytes(),
-                                                     inData.size());
+                                                     inData.size());
             if (translatedContents == NULL) {
                 // translation failed
                 if (!status) {
                     status.error("Error while translating entity references");
-                    return retStr;
+                    return retStr;
                 }
             } else {
@@ -1738 +1738 @@
 RpLibrary&
 RpLibrary::put (std::string path, std::string value, std::string id,
-                unsigned int append, unsigned int translateFlag)
+                unsigned int append, unsigned int translateFlag)
 {
     Rappture::EntityRef ERTranslator;
@@ -1756 +1756 @@
     // check for binary data
     // FIXME: I've already appended a NUL-byte of this assuming that
-    //        it's a ASCII string. This test must come before.
+    //        it's a ASCII string. This test must come before.
     if (Rappture::encoding::isBinary(value.c_str(), value.length())) {
         putData(path, value.c_str(), value.length(), append);
@@ -1775 +1775 @@
             if (!status) {
                 status.error("Error while translating entity references");
-                return *this;
+                return *this;
             }
         }
@@ -1801 +1801 @@
 
 RpLibrary&
-RpLibrary::put (std::string path, double value, std::string id, 
-                unsigned int append)
+RpLibrary::put (std::string path, double value, std::string id,
+                unsigned int append)
 {
     std::stringstream valStr;
@@ -1962 +1962 @@
 
     if (retNode == NULL) {
-        status.addError("can't create node from path \"%s\"", path.c_str());
-        return *this;
+        status.addError("can't create node from path \"%s\"", path.c_str());
+        return *this;
     }
     if (append == RPLIB_APPEND) {
-        if ( (contents = scew_element_contents(retNode)) ) {
-            inData.append(contents);
-            // base64 decode and un-gzip the data
-            if (!Rappture::encoding::decode(status, inData, 0)) {
-                return *this;
-            }
-        }
+        if ( (contents = scew_element_contents(retNode)) ) {
+            inData.append(contents);
+            // base64 decode and un-gzip the data
+            if (!Rappture::encoding::decode(status, inData, 0)) {
+                return *this;
+            }
+        }
     }
     if (inData.append(bytes, nbytes) != nbytes) {
-        status.addError("can't append %d bytes", nbytes);
-        return *this;
-    }   
+        status.addError("can't append %d bytes", nbytes);
+        return *this;
+    }
     // gzip and base64 encode the data
     flags = RPENC_Z|RPENC_B64|RPENC_HDR;
     if (!Rappture::encoding::encode(status, inData,flags)) {
-        return *this;
+        return *this;
     }
     bytesWritten = (unsigned int) inData.size();
@@ -1993 +1993 @@
 /// Put data from a file into the xml.
 /**
- *  Append flag adds additional nodes, it does not merge same 
+ *  Append flag adds additional nodes, it does not merge same
  *  named nodes together
  */
 
 RpLibrary&
-RpLibrary::putFile(std::string path, std::string fileName, 
-                   unsigned int compress, unsigned int append)
+RpLibrary::putFile(std::string path, std::string fileName,
+                   unsigned int compress, unsigned int append)
 {
     Rappture::Buffer buf;
@@ -2011 +2011 @@
 
     if (!fileBuf.load(err, fileName.c_str())) {
-        fprintf(stderr, "error loading file: %s\n", err.remark());
-        return *this;
+        fprintf(stderr, "error loading file: %s\n", err.remark());
+        return *this;
     }
     if (compress == RPLIB_COMPRESS) {
         putData(path, fileBuf.bytes(), fileBuf.size(), append);
     } else {
-        /* Always append a NUL-byte to the end of ASCII strings. */
+        /* Always append a NUL-byte to the end of ASCII strings. */
         fileBuf.append("\0", 1);
         put(path, fileBuf.bytes(), "", append, RPLIB_TRANSLATE);

trunk/src/core/RpSimpleBuffer.h

@@ -67 +67 @@
 #include <cstring>
 #include <cstdlib>
+#include <cstdarg>
 
 namespace Rappture {
@@ -88 +89 @@
     SimpleBuffer<T>& clear();
     int append(const T* bytes, int nmemb=-1);
+    int appendf(const char *format, ...);
+    int remove(int nmemb);
     size_t read(const T* bytes, size_t nmemb);
     int seek(long offset, int whence);
     int tell() const;
-    size_t set(size_t nbytes);
+    size_t set(size_t nmemb);
     SimpleBuffer<T>& rewind();
     SimpleBuffer<T>& show();
@@ -345 +348 @@
         return 0;
     }
+
+    // FIXME: i think this needs to be division,
+    // need to create test case with array of ints
+    // i'm not sure we can even guess the number
+    // bytes in *bytes.
 
     if (nmemb == -1) {
@@ -351 +359 @@
         // at the length of the object.
         nbytes = __guesslen(bytes);
-        nmemb = nbytes*sizeof(T);
+        nmemb = nbytes/sizeof(T);
     }
 
@@ -397 +405 @@
 }
 
+/**
+ * Append formatted bytes to the end of this buffer
+ * @param pointer to bytes to be added
+ * @param number of bytes to be added
+ * @return number of bytes appended.
+ */
+template<class T>
+int
+SimpleBuffer<T>::appendf(const char *format, ...)
+{
+    size_t newMembCnt = 0;
+    size_t nbytes = 0;
+    int nmemb = 0;
+
+    char* dest = NULL;
+    size_t size = 0;
+    size_t bytesAdded = 0;
+    va_list arg;
+
+    // User specified NULL format
+    if (format == NULL) {
+        return 0;
+    }
+
+    // FIXME: i think this needs to be division,
+    // need to create test case with array of ints
+    // i'm not sure we can even guess the number
+    // bytes in *bytes.
+
+
+    // add one for terminating null character
+    nbytes = strlen(format) + 1;
+
+    if (nbytes <= 0) {
+        // no data written, invalid option
+        return nbytes;
+    }
+
+    // FIXME: we need ceil of nbytes/sizeof(T), instead we add 1 for safety
+
+    nmemb = nbytes/sizeof(T);
+    if (nmemb == 0) {
+        nmemb++;
+    }
+
+    newMembCnt = (size_t)(_nMembStored + nmemb);
+
+    if (newMembCnt > _nMembAvl) {
+
+        // buffer sizes less than min_size are set to min_size
+        if (newMembCnt < (size_t) _minMembCnt) {
+            newMembCnt = (size_t) _minMembCnt;
+        }
+
+        /*
+         * Allocate a larger buffer for the string if the current one isn't
+         * large enough. Allocate extra space in the new buffer so that there
+         * will be room to grow before we have to allocate again.
+         */
+        size_t membAvl;
+        membAvl = (_nMembAvl > 0) ? _nMembAvl : _minMembCnt;
+        while (newMembCnt > membAvl) {
+            membAvl += membAvl;
+        }
+
+        /*
+         * reallocate to a larger buffer
+         */
+        if (set(membAvl) != membAvl) {
+            return 0;
+        }
+    }
+
+    dest = (char*) (_buf + _nMembStored);
+    size = (_nMembAvl-_nMembStored)*sizeof(T);
+
+    va_start(arg,format);
+    bytesAdded = vsnprintf(dest,size,format,arg);
+    va_end(arg);
+
+    // bytesAdded contains the number of bytes that would have
+    // been placed in the buffer if the call was successful.
+    // this value does not include the trailing null character.
+    // so we add one to account for it.
+
+    bytesAdded++;
+    nmemb = bytesAdded/sizeof(T);
+
+    if (bytesAdded > size) {
+        // we did not fit everything in the original buffer
+        // resize and try again.
+
+        // FIXME: round the new size up to the nearest multiple of 256?
+        set(_nMembStored+nmemb);
+
+        // reset dest because it may have moved during reallocation
+        dest = (char*) (_buf + _nMembStored);
+        size = bytesAdded;
+
+        va_start(arg,format);
+        bytesAdded = vsnprintf(dest,size,format,arg);
+        va_end(arg);
+
+        if (bytesAdded > size) {
+            // crystals grow, people grow, data doesn't grow...
+            // issue error
+            fprintf(stderr,"error in appendf while appending data");
+        }
+    }
+
+    _nMembStored += nmemb;
+
+    // remove the null character added by vsnprintf()
+    // we do this because if we are appending strings,
+    // the embedded null acts as a terminating null char.
+    // this is a generic buffer so if user wants a
+    // terminating null, they should append it.
+    remove(1);
+
+    return nmemb;
+}
+
+/**
+ * Remove bytes from the end of this buffer
+ * @param number of bytes to be removed
+ * @return number of bytes removed.
+ */
+template<class T>
+int
+SimpleBuffer<T>::remove(int nmemb)
+{
+    if ((_nMembStored - nmemb) < 0){
+        _nMembStored = 0;
+        _pos = 0;
+    } else {
+        _nMembStored -= nmemb;
+        if (_pos >= _nMembStored) {
+            // move _pos back to the new end of the buffer.
+            _pos = _nMembStored-1;
+        }
+    }
+
+
+    return nmemb;
+}
+
 
 template<class T>
@@ -412 +566 @@
 
     if (buf == NULL) {
-        fprintf(stderr,"Can't allocate %zu bytes of memory\n",nbytes);
+        fprintf(stderr,"Can't allocate %lu bytes of memory\n", 
+            (long unsigned int)nbytes);
         _fileState = false;
         return 0;
@@ -429 +584 @@
 
     while (curMemb != _nMembStored) {
-        fprintf(stdout,"_buf[%zu] = :%c:\n", curMemb, _buf[curMemb]);
+        fprintf(stdout,"_buf[%lu] = :%c:\n", (long unsigned int)curMemb,
+                _buf[curMemb]);
         curMemb += 1;
     }
-    fprintf(stdout,"_nMembAvl = :%zu:\n", _nMembAvl);
+    fprintf(stdout,"_nMembAvl = :%lu:\n", (long unsigned int)_nMembAvl);
 
     return *this;
@@ -445 +601 @@
 
     while (curMemb != _nMembStored) {
-        fprintf(stdout,"_buf[%zu] = :%#lx:\n", curMemb,
-            (long unsigned)_buf[curMemb]);
+        fprintf(stdout,"_buf[%lu] = :%#x:\n", (long unsigned int)curMemb,
+                (unsigned long)_buf[curMemb]);
         curMemb += 1;
     }
-    fprintf(stdout,"_nMembAvl = :%zu:\n", _nMembAvl);
+    fprintf(stdout,"_nMembAvl = :%lu:\n", (long unsigned int)_nMembAvl);
 
     return *this;

trunk/src/core/RpUnits.cc

@@ -2395 +2395 @@
         retVal = RpUnitsPreset::addPresetMisc();
     }
+    else if (group.compare(RP_TYPE_POWER) == 0) {
+        retVal = RpUnitsPreset::addPresetPower();
+    }
 
     return retVal;
@@ -2426 +2429 @@
     result += addPresetMagnetic();
     result += addPresetMisc();
+    result += addPresetPower();
 
     return 0;
@@ -2940 +2944 @@
     RpUnits* amu       = NULL;
     RpUnits* bel       = NULL;
+    RpUnits* amp       = NULL;
+    RpUnits* ohm       = NULL;
 
     volt      = RpUnits::define("V",  NULL, RP_TYPE_EPOT, RPUNITS_METRIC);
@@ -2947 +2953 @@
     amu       = RpUnits::define("amu", NULL, "mass_unit", !RPUNITS_METRIC);
     bel       = RpUnits::define("B", NULL, "audio_transmission", RPUNITS_METRIC);
+    amp       = RpUnits::define("amp", NULL, "electric_current", RPUNITS_METRIC);
+    ohm       = RpUnits::define("ohm", NULL, "electric_resistance", RPUNITS_METRIC);
 
     // RpUnits* percent   = RpUnits::define("%",  NULL, RP_TYPE_MISC);
+
+    return 0;
+}
+
+/**********************************************************************/
+// METHOD: addPresetPower()
+/// Add power related units to the dictionary
+/**
+ * Defines the following units:
+ *   watt  (W)
+ *
+ * Return codes: 0 success, anything else is error
+ */
+
+int
+RpUnitsPreset::addPresetPower () {
+
+    RpUnits* watt      = NULL;
+
+    // watts are derived units = J/s = kg*m2/s3 = Newton*m/s and Amps*Volt
+    watt      = RpUnits::define("W",  NULL, RP_TYPE_POWER, RPUNITS_METRIC);
 
     return 0;
@@ -2998 +3027 @@
         return &RpUnitsTypes::hintTypeMisc;
     }
+    else if (type.compare(RP_TYPE_POWER) == 0) {
+        return &RpUnitsTypes::hintTypePower;
+    }
     else {
         return NULL;
@@ -3177 +3209 @@
 
     if ( (unitObj->getType()).compare(RP_TYPE_MISC) == 0 ) {
+        retVal = true;
+    }
+
+    return retVal;
+}
+
+bool
+RpUnitsTypes::hintTypePower   (   RpUnits* unitObj    ) {
+
+    bool retVal = false;
+
+    if ( (unitObj->getType()).compare(RP_TYPE_POWER) == 0 ) {
         retVal = true;
     }

trunk/src/core/RpUnits.h

@@ -48 +48 @@
 #define RP_TYPE_MAGNETIC    "magnetic"
 #define RP_TYPE_MISC        "misc"
+#define RP_TYPE_POWER       "power"
 
 
@@ -87 +88 @@
         static int  addPresetMagnetic();
         static int  addPresetMisc();
+        static int  addPresetPower();
 };
 
@@ -110 +112 @@
         static bool hintTypeMagnetic  ( RpUnits* unitObj );
         static bool hintTypeMisc      ( RpUnits* unitObj );
+        static bool hintTypePower     ( RpUnits* unitObj );
 
     private:
@@ -520 +523 @@
         //  RP_TYPE_MAGNETIC  "magnetic"      load units related to magnetics
         //  RP_TYPE_MISC      "misc"          load units related to everything else
+        //  RP_TYPE_POWER     "power"         load units related to power
         //  (no other groups have been created)