Changeset 3047 for trunk/gui/scripts

Timestamp:

Jun 19, 2012, 2:48:12 PM (12 years ago)

Author:

gah

Message:

 

Location:

trunk/gui/scripts

Files:

• sequenceresult.tcl (modified) (1 diff)
• xyresult.tcl (modified) (5 diffs)

trunk/gui/scripts/sequenceresult.tcl

@@ -446 +446 @@
             ::Rappture::Curve {
                 Rappture::XyResult $viewer
+                pack $viewer -expand yes -fill both
+            }
+            ::Rappture::Histogram {
+                Rappture::HistogramResult $viewer
                 pack $viewer -expand yes -fill both
             }

trunk/gui/scripts/xyresult.tcl

@@ -283 +283 @@
         -param ""
     }
+    # Override the defaults with first the <style> specified and then the
+    # settings list passed into this routoue.
+    array set params [$dataobj hints style]
     foreach {opt val} $settings {
         if {![info exists params($opt)]} {
@@ -299 +302 @@
             set _autoColorI 0
         }
-        set color [lindex $itk_option(-autocolors) $_autoColorI]
+        set color [lindex $itk_option(-autocolors) $_autoColorI]
         if { "" == $color} { 
             set color black 
@@ -694 +697 @@
                 set color $_dataobj2color($dataobj)
             } else {
-                set color [$dataobj hints color]
-                if {"" == $color} {
-                    set color black
-                }
+                set color black
             }
             if {[info exists _dataobj2width($dataobj)]} {
@@ -704 +704 @@
                 set lwidth 2
             }
-
             if {[info exists _dataobj2dashes($dataobj)]} {
                 set dashes $_dataobj2dashes($dataobj)
@@ -710 +709 @@
                 set dashes ""
             }
-
             if {([$xv length] <= 1) || ($lwidth == 0)} {
                 set sym square