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

Timestamp:

Sep 14, 2009 2:14:22 PM (15 years ago)

Author:

gah

Message:

Added cartoon image, changed molecule representation controls, added print options, relabel duplicate xy elements

File:

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

trunk/gui/scripts/xyresult.tcl

@@ -91 +91 @@
     protected method _hilite {state x y}
     protected method _axis {option args}
-    protected method _getAxes {xydata}
+    protected method _getAxes {curve}
     protected method _getLineMarkerOptions { style } 
     protected method _getTextMarkerOptions { style } 
@@ -435 +435 @@
 
     catch {unset _limits}
-    foreach xydata $args {
+    foreach curve $args {
         # find the axes for this curve (e.g., {x y2})
-        foreach {map(x) map(y)} [_getAxes $xydata] break
+        foreach {map(x) map(y)} [_getAxes $curve] break
 
         foreach axis {x y} {
@@ -444 +444 @@
                 # store results -- ex: _limits(x2log-min)
                 set id $map($axis)$type
-                foreach {min max} [$xydata limits $axis$type] break
+                foreach {min max} [$curve limits $axis$type] break
                 if {"" != $min && "" != $max} {
                     if {![info exists _limits($id-min)]} {
@@ -460 +460 @@
             }
 
-            if {[$xydata hints ${axis}scale] == "log"} {
+            if {[$curve hints ${axis}scale] == "log"} {
                 _axis scale $map($axis) log
             }
@@ -633 +633 @@
     set anum(x) 0
     set anum(y) 0
-    foreach xydata [get] {
+    foreach curve [get] {
         foreach ax {x y} {
-            set label [$xydata hints ${ax}label]
+            set label [$curve hints ${ax}label]
             if {"" != $label} {
                 if {![info exists _label2axis($ax-$label)]} {
@@ -651 +651 @@
 
                     # if this axis has a description, add it as a tooltip
-                    set desc [string trim [$xydata hints ${ax}desc]]
+                    set desc [string trim [$curve hints ${ax}desc]]
                     Rappture::Tooltip::text $g-$axis $desc
                 }
@@ -698 +698 @@
     #
     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)
+    foreach curve $_clist {
+        set label [$curve hints label]
+        foreach {mapx mapy} [_getAxes $curve] break
+
+        foreach comp [$curve components] {
+            set xv [$curve mesh $comp]
+            set yv [$curve values $comp]
+
+            if {[info exists _curve2color($curve)]} {
+                set color $_curve2color($curve)
             } else {
-                set color [$xydata hints color]
+                set color [$curve hints color]
                 if {"" == $color} {
                     set color black
@@ -715 +715 @@
             }
 
-            if {[info exists _curve2width($xydata)]} {
-                set lwidth $_curve2width($xydata)
+            if {[info exists _curve2width($curve)]} {
+                set lwidth $_curve2width($curve)
             } else {
                 set lwidth 2
             }
 
-            if {[info exists _curve2dashes($xydata)]} {
-                set dashes $_curve2dashes($xydata)
+            if {[info exists _curve2dashes($curve)]} {
+                set dashes $_curve2dashes($curve)
             } else {
                 set dashes ""
@@ -736 +736 @@
 
             set elem "elem[incr count]"
-            set _elem2curve($elem) $xydata
-
+            set _elem2curve($elem) $curve
+            lappend label2elem($label) $elem
             $g element create $elem -x $xv -y $yv \
-                -symbol $sym -pixels $pixels -linewidth $lwidth -label $label \
+                -symbol $sym -pixels $pixels -linewidth $lwidth \
+                -label $label \
                 -color $color -dashes $dashes \
                 -mapx $mapx -mapy $mapy
@@ -745 +746 @@
     }
 
-    foreach xydata $_clist {
+    # Fix duplicate labels by appending the simulation number
+    foreach label [array names label2elem] {
+        if { [llength $label2elem($label)] == 1 } {
+            continue
+        }
+        foreach elem $label2elem($label) {
+            set curve $_elem2curve($elem)
+            scan [$curve hints xmlobj] "::libraryObj%d" suffix
+            incr suffix
+            set elabel [format "%s \#%d" $label $suffix]
+            $g element configure $elem -label $elabel
+        }
+    }   
+
+    foreach curve $_clist {
         set xmin -Inf
         set ymin -Inf
@@ -753 +768 @@
         # Create text/line markers for each *axis.marker specified. 
         # 
-        foreach m [$xydata xmarkers] {
+        foreach m [$curve xmarkers] {
             foreach {at label style} $m break
             set id [$g marker create line -coords [list $at $ymin $at $ymax]]
@@ -773 +788 @@
             }
         }
-        foreach m [$xydata ymarkers] {
+        foreach m [$curve ymarkers] {
             foreach {at label style} $m break
             set id [$g marker create line -coords [list $xmin $at $xmax $at]]
@@ -1521 +1536 @@
 # x-axis name (x, x2, x3, etc.), and y is the y-axis name.
 # ----------------------------------------------------------------------
-itcl::body Rappture::XyResult::_getAxes {xydata} {
+itcl::body Rappture::XyResult::_getAxes {curve} {
     # rebuild if needed, so we know about the axes
     if {[$_dispatcher ispending !rebuild]} {
@@ -1529 +1544 @@
 
     # what is the x axis?  x? x2? x3? ...
-    set xlabel [$xydata hints xlabel]
+    set xlabel [$curve hints xlabel]
     if {[info exists _label2axis(x-$xlabel)]} {
         set mapx $_label2axis(x-$xlabel)
@@ -1537 +1552 @@
 
     # what is the y axis?  y? y2? y3? ...
-    set ylabel [$xydata hints ylabel]
+    set ylabel [$curve hints ylabel]
     if {[info exists _label2axis(y-$ylabel)]} {
         set mapy $_label2axis(y-$ylabel)