Changeset 3791 for trunk/gui/scripts/xyresult.tcl

Timestamp:

Jul 12, 2013 7:39:50 PM (10 years ago)

Author:

mmc

Message:

Fixes for the xyresult reported on kronig_penney tool. The new bar/scatter
mode options were causing problems with the caching of existing segments.
Fixed the color options to work properly instead of showing black elements.
Fixed scatter plots so that colors are set correctly when you switch back
and forth between two results. Fixed dashed line styles so that they are
interpreted correctly. The kronig_penney tool seems to be working better now.

File:

• trunk/gui/scripts/xyresult.tcl (modified) (6 diffs)

trunk/gui/scripts/xyresult.tcl

@@ -310 +310 @@
     set barwidth $params(-barwidth)
     foreach {mapx mapy} [GetAxes $dataobj] break
+    set label [$dataobj hints label]
     foreach comp [$dataobj components] {
         set tag $dataobj-$comp
@@ -316 +317 @@
             # Ignore -type, it's already been set 
             switch -- [$g element type $elem] {
-                "line" - "scatter" {
+                "line" {
+                    set xv [$g line cget $elem -x]
+                    if {([$xv length] <= 1) || ($lwidth == 0)} {
+                        set sym square
+                        set pixels 2
+                    } else {
+                        set sym ""
+                        set pixels 6
+                    }
                     $g line configure $elem \
-                        -linewidth $lwidth \
-                        -dashes $dashes -hide no
-                } "bar" {
+                        -symbol $sym -pixels $pixels \
+                        -linewidth $lwidth -label $label \
+                        -color $color -dashes $dashes \
+                        -mapx $mapx -mapy $mapy -hide no
+                }
+                "scatter" {
+                    $g line configure $elem \
+                        -symbol square -pixels 2 \
+                        -linewidth $lwidth -label $label \
+                        -color $color -dashes $dashes \
+                        -mapx $mapx -mapy $mapy -hide no
+                }
+                "bar" {
                     $g bar configure $elem \
-                        -barwidth $barwidth \
-                        -hide no
+                        -barwidth $barwidth -label $label \
+                        -background $color -foreground $color \
+                        -mapx $mapx -mapy $mapy -hide no
                 }
             }
         } else {
             set elem "$type[incr _nextElement]"
-            set label [$dataobj hints label]
             set _elem2comp($elem) $tag
             set _comp2elem($tag) $elem
@@ -360 +379 @@
                         -barwidth $barwidth \
                         -label $label \
-                        -color $color \
+                        -background $color -foreground $color \
                         -mapx $mapx -mapy $mapy
                 }
@@ -1631 +1650 @@
         # Default 
         if {[info exists params(-color)]} {
-            set color params(-color)
+            set color $params(-color)
         } else {
             set color black
@@ -1638 +1657 @@
             set type "line"
         }
-        if {[info exists parmas(-barwidth)]} {
+        if {[info exists params(-barwidth)]} {
             set barwidth $params(-barwidth)
         } else {
@@ -1649 +1668 @@
         }
         if {[info exists params(-linestyle)]} {
-            set dashes $parmas(-linestyle)
+            # convert -linestyle to BLT -dashes
+            switch -- $params(-linestyle) {
+                dashed { set dashes {4 4} }
+                dotted { set dashes {2 4} }
+                default { set dashes {} }
+            }
         } else {
             set dashes ""