Revision: 54179
http://brlcad.svn.sourceforge.net/brlcad/?rev=54179&view=rev
Author: bob1961
Date: 2013-01-15 18:15:40 +0000 (Tue, 15 Jan 2013)
Log Message:
-----------
Fixed a few issues related to primitive labels not being drawn.
Modified Paths:
--------------
brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-01-15 17:47:24 UTC
(rev 54178)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2013-01-15 18:15:40 UTC
(rev 54179)
@@ -3422,66 +3422,62 @@
$itk_component(ged) refresh_off
catch {
- if {[catch {gedCmd attr get \
- $tnode displayColor} displayColor]} {
- switch -exact -- $state {
- "0" {
- gedCmd configure -primitiveLabels $plnode
- gedCmd draw -m0 -x$trans $node
+ if {[catch {gedCmd attr get \
+ $tnode displayColor} displayColor]} {
+ switch -exact -- $state {
+ "0" {
+ gedCmd draw -m0 -x$trans $node
+ }
+ "1" {
+ gedCmd draw -m1 -x$trans $node
+ }
+ "2" {
+ gedCmd draw -m2 -x$trans $node
+ }
+ "3" {
+ gedCmd E $node
+ }
+ "4" {
+ gedCmd draw -h $node
+ }
+ "-1" {
+ gedCmd erase $node
+ }
}
- "1" {
- gedCmd configure -primitiveLabels $plnode
- gedCmd draw -m1 -x$trans $node
+ } else {
+ switch -exact -- $state {
+ "0" {
+ gedCmd draw -m0 -x$trans \
+ -C$displayColor $node
+ }
+ "1" {
+ gedCmd draw -m1 -x$trans \
+ -C$displayColor $node
+ }
+ "2" {
+ gedCmd draw -m2 -x$trans \
+ -C$displayColor $node
+ }
+ "3" {
+ gedCmd E -C$displayColor $node
+ }
+ "4" {
+ gedCmd draw -h -C$displayColor $node
+ }
+ "-1" {
+ gedCmd erase $node
+ }
}
- "2" {
- gedCmd configure -primitiveLabels $plnode
- gedCmd draw -m2 -x$trans $node
- }
- "3" {
- gedCmd configure -primitiveLabels $plnode
- gedCmd E $node
- }
- "4" {
- gedCmd configure -primitiveLabels $plnode
- gedCmd draw -h $node
- }
- "-1" {
- gedCmd configure -primitiveLabels {}
- gedCmd erase $node
- }
}
- } else {
- switch -exact -- $state {
- "0" {
- gedCmd configure -primitiveLabels $plnode
- gedCmd draw -m0 -x$trans \
- -C$displayColor $node
- }
- "1" {
- gedCmd configure -primitiveLabels $plnode
- gedCmd draw -m1 -x$trans \
- -C$displayColor $node
- }
- "2" {
- gedCmd configure -primitiveLabels $plnode
- gedCmd draw -m2 -x$trans \
- -C$displayColor $node
- }
- "3" {
- gedCmd configure -primitiveLabels $plnode
- gedCmd E -C$displayColor $node
- }
- "4" {
- gedCmd configure -primitiveLabels $plnode
- gedCmd draw -h -C$displayColor $node
- }
- "-1" {
- gedCmd configure -primitiveLabels {}
- gedCmd erase $node
- }
+ }
+
+ if {$node == $mSelectedObj} {
+ if {$state != -1} {
+ gedCmd configure -primitiveLabels $plnode
+ } else {
+ gedCmd configure -primitiveLabels {}
}
}
- }
if {$mSavedCenter != "" && $mTreeMode > $TREE_MODE_TREE &&
($mColorObjects != "" || $mGhostObjects != "" || $mEdgeObjects != "")} {
@@ -5737,15 +5733,23 @@
lappend tobjects [regsub {^/} $obj ""]
}
+ set soi [lsearch $tobjects $mSelectedObj]
+
if {[catch {eval gedCmd erase $options $tobjects} ret]} {
- gedCmd configure -primitiveLabels {}
+ if {$soi != -1} {
+ gedCmd configure -primitiveLabels {}
+ }
+
updateTreeDrawLists
SetNormalCursor $this
return $ret
}
- gedCmd configure -primitiveLabels {}
+ if {$soi != -1} {
+ gedCmd configure -primitiveLabels {}
+ }
+
updateTreeDrawLists
SetNormalCursor $this
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Master SQL Server Development, Administration, T-SQL, SSAS, SSIS, SSRS
and more. Get SQL Server skills now (including 2012) with LearnDevNow -
200+ hours of step-by-step video tutorials by Microsoft MVPs and experts.
SALE $99.99 this month only - learn more at:
http://p.sf.net/sfu/learnmore_122512
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
