Changeset 4918 for branches

Timestamp:

Jan 4, 2015 5:03:11 PM (9 years ago)

Author:

gah

Message:

 

Location:

branches/1.3/gui/scripts

Files:

• xylegend.tcl (modified) (4 diffs)
• xyresult.tcl (modified) (2 diffs)

branches/1.3/gui/scripts/xylegend.tcl

@@ -85 +85 @@
     private method Lower { args } 
     private method Raise { args } 
+    private method Recolor {} 
     private method PopupMenu { x y }
     private method Rename {} 
@@ -158 +159 @@
         delete ""
         rename ""
+        recolor ""
     }
     foreach { but icon} $commands {
@@ -174 +176 @@
     grid $controls.average    -column 1 -row 1 -sticky w
     grid $controls.rename     -column 1 -row 2 -sticky w
-    grid $controls.delete     -column 1 -row 3 -sticky w
+    grid $controls.recolor    -column 1 -row 3 -sticky w
+    grid $controls.delete     -column 1 -row 4 -sticky w
 
     grid columnconfigure $controls 0  -weight 1
@@ -613 +616 @@
     }
 }
+
+itcl::body Rappture::XyLegend::Recolor {} {
+    set nodes [$itk_component(legend) curselection]
+    if { $nodes == "" } {
+        return
+    }
+    foreach node $nodes {
+        set elem [$_tree label $node]
+        if { $_lastColorIndex == 0 } {
+            set _lastColorIndex [llength $_autocolors]
+        }
+        incr _lastColorIndex -1
+        set color [lindex $_autocolors $_lastColorIndex]
+        $_graph element configure $elem -color $color
+        set im [$itk_component(legend) entry cget $node -icon]
+        $_graph legend icon $elem $im
+    }
+}

branches/1.3/gui/scripts/xyresult.tcl

@@ -250 +250 @@
     if { $color == "auto" || $color == "autoreset" } {
         if { $color == "autoreset" } {
-            set _nextColorIndex 0
+puts stderr "autoreset _nextColorIndex=$_nextColorIndex"
+#            set _nextColorIndex 0
         }
         set color [lindex $itk_option(-autocolors) $_nextColorIndex]
@@ -1067 +1068 @@
         }
     }
+        incr _nextColorIndex
     if {$_nextColorIndex >= [llength $itk_option(-autocolors)]} {
         set _nextColorIndex 0