OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-06 18:26:22 +03:00
Code Packages Releases Activity

0031227: Tests - log number of compared images into report

Browse Source
This commit is contained in:
kgv 2019-12-06 15:08:34 +03:00 committed by bugmaster
parent 552a74d829
commit b7b22996bb
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/DrawResources/TestCommands.tcl
View File

@ -2096,6 +2096,15 @@ proc _diff_show_ratio {value1 value2} {
} }
} }
# auxiliary procedure to produce string comparing two values, where first value is a portion of second
proc _diff_show_positive_ratio {value1 value2} {
if {[expr double ($value2)] == 0.} {
return "$value1 / $value2"
} else {
return "$value1 / $value2 \[[format "%5.2f%%" [expr 100 * double($value1) / double($value2)]]\]"
}
}
# procedure to check cpu user time # procedure to check cpu user time
proc _check_time {regexp_msg} { proc _check_time {regexp_msg} {
upvar log log upvar log log
@ -2158,6 +2167,8 @@ proc _test_diff {dir1 dir2 basename image cpu memory status verbose _logvar _log
set stat(cpu2) 0 set stat(cpu2) 0
set stat(mem1) 0 set stat(mem1) 0
set stat(mem2) 0 set stat(mem2) 0
set stat(img1) 0
set stat(img2) 0
set log {} set log {}
set log_image {} set log_image {}
set log_cpu {} set log_cpu {}
@ -2295,13 +2306,16 @@ proc _test_diff {dir1 dir2 basename image cpu memory status verbose _logvar _log
} }
} }
} }
foreach imgfile $imgcommon { foreach imgfile $imgcommon {
set stat(img2) [expr $stat(img2) + 1]
# if { $verbose > 1 } { _log_and_puts log "Checking [split basename /] $casename: $imgfile" } # if { $verbose > 1 } { _log_and_puts log "Checking [split basename /] $casename: $imgfile" }
set diffile [_diff_img_name $dir1 $dir2 $basename $imgfile] set diffile [_diff_img_name $dir1 $dir2 $basename $imgfile]
if { [catch {diffimage [file join $dir1 $basename $imgfile] \ if { [catch {diffimage [file join $dir1 $basename $imgfile] \
[file join $dir2 $basename $imgfile] \ [file join $dir2 $basename $imgfile] \
-toleranceOfColor 0.0 -blackWhite off -borderFilter off $diffile} diff] } { -toleranceOfColor 0.0 -blackWhite off -borderFilter off $diffile} diff] } {
if {$image != false} { if {$image != false} {
set stat(img1) [expr $stat(img1) + 1]
_log_and_puts log_image "IMAGE [split $basename /] $casename: $imgfile cannot be compared" _log_and_puts log_image "IMAGE [split $basename /] $casename: $imgfile cannot be compared"
} else { } else {
_log_and_puts log "IMAGE [split $basename /] $casename: $imgfile cannot be compared" _log_and_puts log "IMAGE [split $basename /] $casename: $imgfile cannot be compared"
@ -2315,6 +2329,7 @@ proc _test_diff {dir1 dir2 basename image cpu memory status verbose _logvar _log
[file join $dir2 $basename $imgfile] \ [file join $dir2 $basename $imgfile] \
-toleranceOfColor $aCaseDiffColorTol -blackWhite off -borderFilter off $diffile} diff2] } { -toleranceOfColor $aCaseDiffColorTol -blackWhite off -borderFilter off $diffile} diff2] } {
if {$image != false} { if {$image != false} {
set stat(img1) [expr $stat(img1) + 1]
_log_and_puts log_image "IMAGE [split $basename /] $casename: $imgfile cannot be compared" _log_and_puts log_image "IMAGE [split $basename /] $casename: $imgfile cannot be compared"
} else { } else {
_log_and_puts log "IMAGE [split $basename /] $casename: $imgfile cannot be compared" _log_and_puts log "IMAGE [split $basename /] $casename: $imgfile cannot be compared"
@ -2325,6 +2340,7 @@ proc _test_diff {dir1 dir2 basename image cpu memory status verbose _logvar _log
set toLogImageCase false set toLogImageCase false
file delete -force $diffile file delete -force $diffile
if {$image != false} { if {$image != false} {
set stat(img1) [expr $stat(img1) + 1]
_log_and_puts log_image "IMAGE [split $basename /] $casename: $imgfile is similar \[$diff different pixels\]" _log_and_puts log_image "IMAGE [split $basename /] $casename: $imgfile is similar \[$diff different pixels\]"
} else { } else {
_log_and_puts log "IMAGE [split $basename /] $casename: $imgfile is similar \[$diff different pixels\]" _log_and_puts log "IMAGE [split $basename /] $casename: $imgfile is similar \[$diff different pixels\]"
@ -2334,6 +2350,7 @@ proc _test_diff {dir1 dir2 basename image cpu memory status verbose _logvar _log
} }
if {$image != false} { if {$image != false} {
set stat(img1) [expr $stat(img1) + 1]
_log_and_puts log_image "IMAGE [split $basename /] $casename: $imgfile differs \[$diff different pixels\]" _log_and_puts log_image "IMAGE [split $basename /] $casename: $imgfile differs \[$diff different pixels\]"
} else { } else {
_log_and_puts log "IMAGE [split $basename /] $casename: $imgfile differs \[$diff different pixels\]" _log_and_puts log "IMAGE [split $basename /] $casename: $imgfile differs \[$diff different pixels\]"
@ -2381,6 +2398,13 @@ proc _test_diff {dir1 dir2 basename image cpu memory status verbose _logvar _log
_log_and_puts log "Total CPU difference: [_diff_show_ratio $stat(cpu1) $stat(cpu2)]" _log_and_puts log "Total CPU difference: [_diff_show_ratio $stat(cpu1) $stat(cpu2)]"
} }
} }
if {$image != false || ($image == false && $cpu == false && $memory == false)} {
if {$image != false} {
_log_and_puts log_image "Total Image difference: [_diff_show_positive_ratio $stat(img1) $stat(img2)]"
} else {
_log_and_puts log "Total Image difference: [_diff_show_positive_ratio $stat(img1) $stat(img2)]"
}
}
} }
} }