Changeset 1613 for trunk/gui/scripts

Timestamp:

Nov 10, 2009, 9:47:30 AM (15 years ago)

Author:

dkearney

Message:

fix for rappture automatic ticket #256452. if we receive no data in the xy
curve object, we don't add empty data to the list of curves. this also affects
xvector and yvector objects that have unequal lengths. if this is encountered,
we don't add the curve to the list of curves. we also no not tell the user
there was an error.

adding file nodata.xml which showed the error described in the automatic
ticket.

File:

• trunk/gui/scripts/curve.tcl (modified) (2 diffs)

trunk/gui/scripts/curve.tcl

@@ -237 +237 @@
             set _hints(tooltip) $_hints(label)
         }
-        set _hints(xmlobj) $_xmlobj
+        set _hints(xmlobj) $_xmlobj
     }
     if {$keyword != ""} {
@@ -268 +268 @@
     #
     foreach cname [$_curve children -type component] {
-        set xv ""
-        set yv ""
+        set xv [blt::vector create \#auto]
+        set yv [blt::vector create \#auto]
 
         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
-        } else { 
-            set xv [blt::vector create \#auto]
-            set yv [blt::vector create \#auto]
+        } else {
             $xv set [$_curve get $cname.xvector]
             $yv set [$_curve get $cname.yvector]
-            if { [$xv length] != [$yv length] } {
-                blt::vector destroy $xv $yv
-                set xv ""; set yv ""
-            }
-        }
-        if {$xv != "" && $yv != ""} {
+        }
+        if { (([$xv length] == 0) && ([$yv length] == 0))
+            || ([$xv length] != [$yv length]) } {
+            # FIXME: need to show an error about improper data.
+            blt::vector destroy $xv $yv
+            set xv ""; set yv ""
+        } else {
             set _comp2xy($cname) [list $xv $yv]
             incr _counter