Changeset 4938

Timestamp:

Jan 18, 2015 12:40:33 PM (9 years ago)

Author:

ldelgass

Message:

merge r4918:4922 from 1.3 branch (recolor)

Location:

trunk

Files:

• . (modified) (1 prop)
• gui/scripts/xylegend.tcl (modified) (6 diffs)
• gui/scripts/xyresult.tcl (modified) (2 diffs)

trunk/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
@@ -393 +396 @@
     set nodes [$itk_component(legend) curselection]
     foreach n { hide show toggle raise lower 
-        rename average difference delete } {
+        rename average difference delete recolor } {
         $itk_component(controls).$n configure -state disabled
     }
@@ -411 +414 @@
         }
         1 {
-            foreach n { hide show toggle rename } {
+            foreach n { hide show toggle rename recolor } {
                 $itk_component(controls).$n configure -state normal
             }
         }
         2 {
-            foreach n { hide show toggle difference average } {
+            foreach n { hide show toggle difference average recolor } {
                 $itk_component(controls).$n configure -state normal
             }
         }
         default {
-            foreach n { hide show toggle average } {
+            foreach n { hide show toggle average recolor } {
                 $itk_component(controls).$n configure -state normal
             }
@@ -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
+    }
+}

trunk/gui/scripts/xyresult.tcl

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