- Timestamp:
- Jan 18, 2015, 12:40:33 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/1.3 merged: 4918,4921-4922
- Property svn:mergeinfo changed
-
trunk/gui/scripts/xylegend.tcl
r3799 r4938 85 85 private method Lower { args } 86 86 private method Raise { args } 87 private method Recolor {} 87 88 private method PopupMenu { x y } 88 89 private method Rename {} … … 158 159 delete "" 159 160 rename "" 161 recolor "" 160 162 } 161 163 foreach { but icon} $commands { … … 174 176 grid $controls.average -column 1 -row 1 -sticky w 175 177 grid $controls.rename -column 1 -row 2 -sticky w 176 grid $controls.delete -column 1 -row 3 -sticky w 178 grid $controls.recolor -column 1 -row 3 -sticky w 179 grid $controls.delete -column 1 -row 4 -sticky w 177 180 178 181 grid columnconfigure $controls 0 -weight 1 … … 393 396 set nodes [$itk_component(legend) curselection] 394 397 foreach n { hide show toggle raise lower 395 rename average difference delete } {398 rename average difference delete recolor } { 396 399 $itk_component(controls).$n configure -state disabled 397 400 } … … 411 414 } 412 415 1 { 413 foreach n { hide show toggle rename } {416 foreach n { hide show toggle rename recolor } { 414 417 $itk_component(controls).$n configure -state normal 415 418 } 416 419 } 417 420 2 { 418 foreach n { hide show toggle difference average } {421 foreach n { hide show toggle difference average recolor } { 419 422 $itk_component(controls).$n configure -state normal 420 423 } 421 424 } 422 425 default { 423 foreach n { hide show toggle average } {426 foreach n { hide show toggle average recolor } { 424 427 $itk_component(controls).$n configure -state normal 425 428 } … … 613 616 } 614 617 } 618 619 itcl::body Rappture::XyLegend::Recolor {} { 620 set nodes [$itk_component(legend) curselection] 621 if { $nodes == "" } { 622 return 623 } 624 foreach node $nodes { 625 set elem [$_tree label $node] 626 if { $_lastColorIndex == 0 } { 627 set _lastColorIndex [llength $_autocolors] 628 } 629 incr _lastColorIndex -1 630 set color [lindex $_autocolors $_lastColorIndex] 631 $_graph element configure $elem -color $color 632 set im [$itk_component(legend) entry cget $node -icon] 633 $_graph legend icon $elem $im 634 } 635 } -
trunk/gui/scripts/xyresult.tcl
r4207 r4938 249 249 } 250 250 if { $color == "auto" || $color == "autoreset" } { 251 if { $color == "autoreset" } {252 set _nextColorIndex 0253 }251 # if { $color == "autoreset" } { 252 # set _nextColorIndex 0 253 # } 254 254 set color [lindex $itk_option(-autocolors) $_nextColorIndex] 255 255 if { "" == $color} { … … 1067 1067 } 1068 1068 } 1069 incr _nextColorIndex 1069 1070 if {$_nextColorIndex >= [llength $itk_option(-autocolors)]} { 1070 1071 set _nextColorIndex 0
Note: See TracChangeset
for help on using the changeset viewer.