Revision: 76229
http://sourceforge.net/p/brlcad/code/76229
Author: brlcad
Date: 2020-06-27 04:24:22 +0000 (Sat, 27 Jun 2020)
Log Message:
-----------
replace calls to getRGB and elimiante getRGBorReset as the 'Reset' behavior is
rather undesirable. it just assigns the variable to whatever the current
widget's background color is set to, which is wrong in the general case.
Modified Paths:
--------------
brlcad/trunk/src/tclscripts/mged/attr_edit.tcl
brlcad/trunk/src/tclscripts/mged/color.tcl
brlcad/trunk/src/tclscripts/mged/color_scheme.tcl
brlcad/trunk/src/tclscripts/mged/comb.tcl
brlcad/trunk/src/tclscripts/mged/qray.tcl
brlcad/trunk/src/tclscripts/mged/rt.tcl
Modified: brlcad/trunk/src/tclscripts/mged/attr_edit.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/attr_edit.tcl 2020-06-26 19:59:14 UTC
(rev 76228)
+++ brlcad/trunk/src/tclscripts/mged/attr_edit.tcl 2020-06-27 04:24:22 UTC
(rev 76229)
@@ -354,7 +354,8 @@
if { [string length $cur_attr_name] == 0 } {
# restore normal binding for attribute name entry widget
bind $fnew.attr_e <Key-Return> [code $this update_cur_attr_name]
- $fnew.attr_e configure -bg #d9d9d9
+ $fnew.attr_e configure -bg #123456
+ # d9d9d9
set attr_entry_label "Attribute Name:"
return
}
@@ -375,7 +376,8 @@
# restore normal binding for attribute name entry widget
bind $fnew.attr_e <Key-Return> [code $this update_cur_attr_name]
- $fnew.attr_e configure -bg #d9d9d9
+ $fnew.attr_e configure -bg #234567
+ # d9d9d9
set attr_entry_label "Attribute Name:"
focus $textb
Modified: brlcad/trunk/src/tclscripts/mged/color.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/color.tcl 2020-06-26 19:59:14 UTC (rev
76228)
+++ brlcad/trunk/src/tclscripts/mged/color.tcl 2020-06-27 04:24:22 UTC (rev
76229)
@@ -200,34 +200,11 @@
# Set the widget color given a color string.
#
proc setWidgetColor { w vn color } {
- set rgb [getRGBorReset $w $vn $color]
+ set rgb [getRGB $w $color]
setWidgetRGBColor $w $vn $rgb
}
-## -- getRGBorReset
-#
-# Get the RGB value corresponding to the given color. Failing that
-# reset the variable vn to the value provided by the widget w
-#
-proc getRGBorReset { w vn color } {
- upvar #0 $vn varname
-
- if ![winfo exists $w] {
- return -code error "getRGBorReset: bad Tk window name --> $w"
- }
-
- # convert to RGB
- set result [catch {getRGB $w $color} rgb]
- if {$result} {
- # reset varname to properly reflect the current color of the widget
- set varname [$w cget -bg]
- return -code error $rgb
- }
-
- return $rgb
-}
-
## -- getRGB
#
# Get the RGB value corresponding to the given color.
Modified: brlcad/trunk/src/tclscripts/mged/color_scheme.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/color_scheme.tcl 2020-06-26 19:59:14 UTC
(rev 76228)
+++ brlcad/trunk/src/tclscripts/mged/color_scheme.tcl 2020-06-27 04:24:22 UTC
(rev 76229)
@@ -386,8 +386,8 @@
continue
}
- set color_a [getRGBorReset $mged_color_scheme(top).$key_a\MB
mged_color_scheme($id,$key_a) $mged_color_scheme($id,$key_a)]
- set color_ia [getRGBorReset $mged_color_scheme(top).$key_ia\MB
mged_color_scheme($id,$key_ia) $mged_color_scheme($id,$key_ia)]
+ set color_a [getRGB $mged_color_scheme(top).$key_a\MB
$mged_color_scheme($id,$key_a)]
+ set color_ia [getRGB $mged_color_scheme(top).$key_ia\MB
$mged_color_scheme($id,$key_ia)]
mged_apply_local $id "rset cs $key_a $color_a; rset cs $key_ia
$color_ia"
}
@@ -401,8 +401,8 @@
continue
}
- set color_a [getRGBorReset $mged_color_scheme(top).$key_a\MB
mged_color_scheme($id,$key_a) $mged_color_scheme($id,$key_a)]
- set color_ia [getRGBorReset $mged_color_scheme(top).$key_ia\MB
mged_color_scheme($id,$key_ia) $mged_color_scheme($id,$key_ia)]
+ set color_a [getRGB $mged_color_scheme(top).$key_a\MB
$mged_color_scheme($id,$key_a)]
+ set color_ia [getRGB $mged_color_scheme(top).$key_ia\MB
$mged_color_scheme($id,$key_ia)]
mged_apply_local $id "rset cs $key_a $color_a; rset cs $key_ia
$color_ia"
}
Modified: brlcad/trunk/src/tclscripts/mged/comb.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/comb.tcl 2020-06-26 19:59:14 UTC (rev
76228)
+++ brlcad/trunk/src/tclscripts/mged/comb.tcl 2020-06-27 04:24:22 UTC (rev
76229)
@@ -929,7 +929,7 @@
if {$comb_control($id,color) == ""} {
set color ""
} else {
- set color [getRGBorReset $top.colorMB comb_control($id,color)
$comb_control($id,color)]
+ set color [getRGB $top.colorMB $comb_control($id,color)]
}
# actually apply the edits to the combination on disk
@@ -965,7 +965,7 @@
if {$comb_control($id,color) == ""} {
set color ""
} else {
- set color [getRGBorReset $top.colorMB comb_control($id,color)
$comb_control($id,color)]
+ set color [getRGB $top.colorMB $comb_control($id,color)]
}
# actually apply the edits to the combination on disk
Modified: brlcad/trunk/src/tclscripts/mged/qray.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/qray.tcl 2020-06-26 19:59:14 UTC (rev
76228)
+++ brlcad/trunk/src/tclscripts/mged/qray.tcl 2020-06-27 04:24:22 UTC (rev
76229)
@@ -306,10 +306,10 @@
qray echo $qray_control($id,cmd_echo);\
qray effects $qray_control($id,effects);\
qray basename $qray_control($id,basename);\
- eval qray oddcolor [getRGBorReset $qray_control($id,top).oddColorMB
qray_control($id,oddcolor) $qray_control($id,oddcolor)];\
- eval qray evencolor [getRGBorReset
$qray_control($id,top).evenColorMB qray_control($id,evencolor)
$qray_control($id,evencolor)];\
- eval qray voidcolor [getRGBorReset
$qray_control($id,top).voidColorMB qray_control($id,voidcolor)
$qray_control($id,voidcolor)];\
- eval qray overlapcolor [getRGBorReset
$qray_control($id,top).overlapColorMB qray_control($id,overlapcolor)
$qray_control($id,overlapcolor)]"
+ eval qray oddcolor [getRGB $qray_control($id,top).oddColorMB
$qray_control($id,oddcolor)];\
+ eval qray evencolor [getRGB $qray_control($id,top).evenColorMB
$qray_control($id,evencolor)];\
+ eval qray voidcolor [getRGB $qray_control($id,top).voidColorMB
$qray_control($id,voidcolor)];\
+ eval qray overlapcolor [getRGB
$qray_control($id,top).overlapColorMB $qray_control($id,overlapcolor)]"
}
proc qray_reset { id } {
Modified: brlcad/trunk/src/tclscripts/mged/rt.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/rt.tcl 2020-06-26 19:59:14 UTC (rev
76228)
+++ brlcad/trunk/src/tclscripts/mged/rt.tcl 2020-06-27 04:24:22 UTC (rev
76229)
@@ -478,7 +478,7 @@
}
if {[winfo exists $rt_control($id,top).colorMB] && $rt_control($id,color)
!= ""} {
- set rgb [getRGBorReset $rt_control($id,top).colorMB
rt_control($id,color) $rt_control($id,color)]
+ set rgb [getRGB $rt_control($id,top).colorMB $rt_control($id,color)]
append rt_cmd " -C[lindex $rgb 0]/[lindex $rgb 1]/[lindex $rgb 2]"
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
