Changeset 2765 for branches/blt4

Timestamp:

Jan 15, 2012, 8:23:10 PM (13 years ago)

Author:

gah

Message:

 

File:

• branches/blt4/gui/scripts/xyprint.tcl (modified) (11 diffs)

branches/blt4/gui/scripts/xyprint.tcl

@@ -40 +40 @@
     private variable _outputFormatType "";
     private variable _formatIcon "";
+    private variable _colorIcon "";
+    private variable _colorText "";
 
     private common _oldSettingsFile "~/.rpsettings"
@@ -81 +83 @@
     private method GetAxisType { axis } 
     private method restore { toolName plotName data } 
+    private method AddColorToMenu { menu name color } 
 
     # Same dialog may be used for different graphs
@@ -564 +567 @@
 itcl::body Rappture::XyPrint::GetElement { args } {
     set index 1
+    set page $itk_component(legend_page)
     array unset _settings $this-element-*
     foreach elem [$_clone element show] {
@@ -572 +576 @@
     set elem $_settings($this-element-$index)
     set _settings($this-element-label) [$_clone element cget $elem -label]
-    set _settings($this-element-color) [$_clone element cget $elem -color]
+
+    set color [$_clone element cget $elem -color]
+    set found 0
+    set m $page.color.menu
+    foreach item [$m names] {
+        set c [$m item cget $item -value] 
+        if { $c == $color } {
+            set color $item
+            set found 1
+            break
+        }
+    }
+    if { !$found } {
+        AddColorToMenu $m $color $color
+    }
+    $m select $color
+
     if { [$_clone element type $elem] != "bar" } {
         set _settings($this-element-symbol) [$_clone element cget $elem -symbol]
         set _settings($this-element-dashes) [$_clone element cget $elem -dashes]
-    }
-    set page $itk_component(legend_page)
-    set color [$page.color label $_settings($this-element-color)]
-    if { $color == "" } {
-        set color [Color2RGB $_settings($this-element-color)]
-        $page.color choices insert end $color $color
-        $page.color value $color
-    } else {
-        $page.color value [$page.color label $_settings($this-element-color)]
     }
     if { [$_clone element type $elem] != "bar" } {
@@ -764 +775 @@
         "Display the legend."
 
-    label $page.position_l -text "position"
+    blt::tk::label $page.position_l -text "position"
     Rappture::Combobox $page.position -width 15 -editable no
     $page.position choices insert end \
@@ -807 +818 @@
         "Select the current entry."
 
-    label $page.label_l -text "label" 
+    blt::tk::label $page.label_l -text "label" 
     entry $page.label \
         -background white \
@@ -815 +826 @@
         "Set the label of the current entry in the legend."
 
+    blt::tk::label $page.color_l -text "color"
+    set m $page.color.menu
+    blt::comboentry $page.color \
+        -width 1i \
+        -textvariable [itcl::scope _colorText] \
+        -iconvariable [itcl::scope _colorIcon] \
+        -editable no -menu $m \
+        -command [itcl::code $this ApplyElementSettings]
+    blt::combomenu $m \
+        -xscrollbar $m.xs \
+        -yscrollbar $m.ys  \
+        -textvariable [itcl::scope _colorText] \
+        -iconvariable [itcl::scope _colorIcon] \
+        -height { 0 2i } 
+    blt::tk::scrollbar $m.xs
+    blt::tk::scrollbar $m.ys
+    foreach {rgb name} {
+        "#000000" "black" 
+        "#ffffff" "white" 
+        "#0000cd" "blue" 
+        "#cd0000" "red" 
+        "#00cd00" "green" 
+        "#3a5fcd" "royal blue" 
+        "#cdcd00" "yellow" 
+        "#cd1076" "deep pink" 
+        "#009acd" "deep sky blue" 
+        "#00c5cd" "turquoise" 
+        "#a2b5cd" "light steel blue" 
+        "#7ac5cd" "cadet blue" 
+        "#66cdaa" "aquamarine" 
+        "#a2cd5a" "dark olive green" 
+        "#cd9b9b" "rosy brown" 
+        "#0000ff" "blue1" 
+        "#ff0000" "red1" 
+        "#00ff00" "green1" 
+    } {
+        AddColorToMenu $m $name $rgb
+    }
+    Rappture::Tooltip::for $page.color \
+        "Set the color of the current entry."
+
+    if 0 {
     label $page.color_l -text "color " 
     Rappture::Combobox $page.color -width 15 -editable no
@@ -839 +892 @@
     Rappture::Tooltip::for $page.color \
         "Set the color of the current entry."
-
-    label $page.dashes_l -text "line style" 
+    }
+    blt::tk::label $page.dashes_l -text "line style" 
     Rappture::Combobox $page.dashes -width 15 -editable no
     $page.dashes choices insert end \
@@ -852 +905 @@
         "Set the line style of the current entry."
 
-    label $page.symbol_l -text "symbol" 
+    blt::tk::label $page.symbol_l -text "symbol" 
     Rappture::Combobox $page.symbol -editable no
     $page.symbol choices insert end \
@@ -1278 +1331 @@
     set index [$itk_component(element_slider) get]
     set page $itk_component(legend_page)
-    set _settings($this-element-color)  [$page.color current]
     if { $_clone != "" } {
         set elem $_settings($this-element-$index)
@@ -1545 +1597 @@
     return $out
 }
+
+itcl::body Rappture::XyPrint::AddColorToMenu { m name color } {
+    set icon [image create picture -width 19 -height 17]
+    $icon blank 0x0
+    $icon draw circle 7 7 8 -color black \
+        -antialiased 1 -linewidth 0 -shadow { -width 1 -offset 1 }
+    $icon draw circle 7 7 7 -color $color \
+        -antialiased 1 -linewidth 0
+    $m add -text $name -icon $icon -value $color \
+        -variable [itcl::scope _settings($this-element-color)]
+}