Revision: 75496
http://sourceforge.net/p/brlcad/code/75496
Author: starseeker
Date: 2020-04-21 16:58:24 +0000 (Tue, 21 Apr 2020)
Log Message:
-----------
Cherrypick r75492 - restore overlap checker using full paths for drawing,
subtraction and marks
Modified Paths:
--------------
brlcad/branches/RELEASE/src/tclscripts/checker/check.tcl
Property Changed:
----------------
brlcad/branches/RELEASE/
Index: brlcad/branches/RELEASE
===================================================================
--- brlcad/branches/RELEASE 2020-04-21 16:49:25 UTC (rev 75495)
+++ brlcad/branches/RELEASE 2020-04-21 16:58:24 UTC (rev 75496)
Property changes on: brlcad/branches/RELEASE
___________________________________________________________________
Modified: svn:mergeinfo
## -6,4 +6,4 ##
/brlcad/branches/opencl:65867-66137
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
-/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-74976,74981,74991,75056,75325,75375,75377-75378,75387,75470-75472,75477
\ No newline at end of property
+/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-74976,74981,74991,75056,75325,75375,75377-75378,75387,75470-75472,75477,75492
\ No newline at end of property
Modified: brlcad/branches/RELEASE/src/tclscripts/checker/check.tcl
===================================================================
--- brlcad/branches/RELEASE/src/tclscripts/checker/check.tcl 2020-04-21
16:49:25 UTC (rev 75495)
+++ brlcad/branches/RELEASE/src/tclscripts/checker/check.tcl 2020-04-21
16:58:24 UTC (rev 75496)
@@ -502,8 +502,12 @@
set items [$_ck children {}]
while {[gets $mfile line] >= 0} {
foreach item $items {
- if {[$_ck set $item "Left"] == [lindex $line 0] && \
- [$_ck set $item "Right"] == [lindex $line 1]} \
+ set fullpaths $_fullPath([$_ck set $item "ID"])
+ set leftPath [lindex $fullpaths 0]
+ set rightPath [lindex $fullpaths 1]
+
+ if {$leftPath == [lindex $line 0] && \
+ $rightPath == [lindex $line 1]} \
{
$_ck tag add "marked" $item
incr _markedCount
@@ -670,7 +674,9 @@
fconfigure $tmp_chan -encoding utf-8
foreach item $marked_items {
- puts $tmp_chan "[$_ck set $item "Left"] [$_ck set $item "Right"]"
+ set fullpaths $_fullPath([$_ck set $item "ID"])
+
+ puts $tmp_chan [join $fullpaths " "]
}
close $tmp_chan
@@ -679,9 +685,9 @@
fconfigure $tmp_chan -encoding utf-8
foreach item $marked_items {
- if {[gets $tmp_chan line] < 0 ||\
- $line != "[$_ck set $item "Left"] [$_ck set $item "Right"]"} \
- {
+ set fullpaths $_fullPath([$_ck set $item "ID"])
+
+ if {[gets $tmp_chan line] < 0 || $line != [join $fullpaths " "]} {
puts "ERROR: write to mark file failed"
return
}
@@ -819,8 +825,11 @@
foreach item $sset {
foreach {id_lbl id left_lbl left right_lbl right size_lbl size} [$_ck
set $item] {
+ set fullpaths $_fullPath($id)
+ set leftPath [lindex $fullpaths 0]
+ set rightPath [lindex $fullpaths 1]
- if {![catch {$this $subCmd $left $right} err]} {
+ if {![catch {$this $subCmd $leftPath $rightPath} err]} {
$this markOverlap $id
} else {
puts "$err"
@@ -882,11 +891,15 @@
set drawing ""
foreach item $sset {
foreach {id_lbl id left_lbl left right_lbl right size_lbl size} [$_ck
set $item] {
+ set fullpaths $_fullPath($id)
+ set leftPath [lindex $fullpaths 0]
+ set rightPath [lindex $fullpaths 1]
+
if {$_drawFirstUnion} {
- lappend drawing [$this firstUnionedSolid $left]
- lappend drawing [$this firstUnionedSolid $right]
+ lappend drawing [$this firstUnionedSolid $leftPath]
+ lappend drawing [$this firstUnionedSolid $rightPath]
} else {
- lappend drawing $left $right
+ lappend drawing $leftPath $rightPath
}
}
}
@@ -899,11 +912,15 @@
set _progressButtonInvoked false
foreach item $sset {
foreach {id_lbl id left_lbl left right_lbl right size_lbl size} [$_ck
set $item] {
+ set fullpaths $_fullPath($id)
+ set leftPath [lindex $fullpaths 0]
+ set rightPath [lindex $fullpaths 1]
+
if {$_drawFirstUnion} {
- set left [$this firstUnionedSolid $left]
- set right [$this firstUnionedSolid $right]
+ set leftPath [$this firstUnionedSolid $leftPath]
+ set rightPath [$this firstUnionedSolid $rightPath]
}
- set _commandText "Drawing $left"
+ set _commandText "Drawing $leftPath"
if {[$this updateDisplayFinished]} {
break
@@ -915,7 +932,7 @@
set _abort false
lappend _afterCommands [after 3000 \
"if {! \[set \"[scope _progressButtonInvoked]\"\]} { \
- [code $_leftDrawCallback $left]; \
+ [code $_leftDrawCallback $leftPath]; \
[code set [scope _commandText] ""] \
}"]
@@ -932,7 +949,7 @@
break
}
} elseif {! $_progressButtonInvoked} {
- $_leftDrawCallback $left
+ $_leftDrawCallback $leftPath
}
if {! $_progressButtonInvoked} {
@@ -939,13 +956,13 @@
incr count
set _progressValue [expr $count / [expr $total + 1.0] * 100]
- set _commandText "Drawing $right"
+ set _commandText "Drawing $rightPath"
if {[$this updateDisplayFinished]} {
break
}
- $_rightDrawCallback $right
+ $_rightDrawCallback $rightPath
incr count
set _progressValue [expr $count / [expr $total + 1.0] * 100]
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
