Changeset 736 for trunk/gui/scripts

Timestamp:

May 14, 2007, 11:44:47 PM (17 years ago)

Author:

dkearney

Message:

adding capabilities for xy scatter plots by adding curve.about.type = scatter to your run.xml file

Location:

trunk/gui/scripts

Files:

• curve.tcl (modified) (1 diff)
• resultviewer.tcl (modified) (1 diff)
• xyresult.tcl (modified) (6 diffs)

trunk/gui/scripts/curve.tcl

@@ -193 +193 @@
             color   about.color
             style   about.style
+            type    about.type
             xlabel  xaxis.label
             xdesc   xaxis.description

trunk/gui/scripts/resultviewer.tcl

@@ -168 +168 @@
                         eval lappend settings $style
                     }
+                    if {[catch {$dobj hints type} type] == 0} {
+                        if {"" != $type} {
+                            eval lappend settings "-type $type"
+                        }
+                    }
                     # add override settings passed in here
                     eval lappend settings $opts

trunk/gui/scripts/xyresult.tcl

@@ -217 +217 @@
         -brightness 0
         -width 1
+        -type "line"
         -raise 0
         -linestyle solid
@@ -226 +227 @@
         }
         set params($opt) $val
+    }
+
+    # if type is set to "scatter", then override the width
+    if {"scatter" == $params(-type)} {
+        set params(-width) 0
     }
 
@@ -631 +637 @@
             }
 
-            if {[$xv length] <= 1} {
+            if {([$xv length] <= 1) || ($lwidth == 0)} {
                 set sym square
+                set pixels 2
             } else {
                 set sym ""
+                set pixels 6
             }
 
@@ -641 +649 @@
 
             $g element create $elem -x $xv -y $yv \
-                -symbol $sym -pixels 6 -linewidth $lwidth -label $label \
+                -symbol $sym -pixels $pixels -linewidth $lwidth -label $label \
                 -color $color -dashes $dashes \
                 -mapx $mapx -mapy $mapy
@@ -750 +758 @@
     if {$state == "at"} {
         if {[$g element closest $x $y info -interpolate yes]} {
+            # for dealing with xy line plots
             set elem $info(name)
             foreach {mapx mapy} [_getAxes $_elem2curve($elem)] break
@@ -757 +766 @@
             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 tip [$curve hints tooltip]
+                    if {[info exists info(y)]} {
+                        set val [_axis format y dummy $info(y)]
+                        set units [$curve hints yunits]
+                        append tip "\n$val$units"
+
+                        if {[info exists info(x)]} {
+                            set val [_axis format x dummy $info(x)]
+                            set units [$curve hints xunits]
+                            append tip " @ $val$units"
+                        }
+                    }
+                    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)
+            foreach {mapx mapy} [_getAxes $_elem2curve($elem)] break
+
+            # search again for an exact point -- this time don't interpolate
+            set tip ""
+            if {$info(name) == $elem} {
                 set x [$g axis transform $mapx $info(x)]
                 set y [$g axis transform $mapy $info(y)]