0026833: Create command checkview containing all viewer types

Created command checkview for displaying shapes.

dox/dev_guides/tests/tests.md

@@ -1156,6 +1156,50 @@ vdump $imagedir/${casename}_shading.png
 
 This image will be included in the HTML log produced by *testgrid* command and will be checked for non-regression through comparison of images by command *testdiff*.
 
+Also it is possible to use command *checkview* to make a snapshot of the viewer.
+
+Use: checkview [options...]
+Allowed options are:
+*   -display shapename: display shape with name 'shapename'
+*   -3d: display shape in 3d viewer
+*   -2d [ v2d / smallview ]: display shape in 2d viewer (default viewer is a 'smallview')
+*   -path PATH: location of saved screenshot of viewer
+*   -vdispmode N: it is possible to set vdispmode for 3d viewer (default value is 1)
+*   -screenshot: procedure will try to make screenshot of already created viewer
+*   Procedure can check some property of shape (length, area or volume) and compare it with some value N:
+	* -l [N]
+	* -s [N]
+	* -v [N]
+	* If current property is equal to value N, shape is marked as valid in procedure.
+	* If value N is not given procedure will mark shape as valid if current property is non-zero.
+*   -with {a b c}: display shapes 'a' 'b' 'c' together with 'shape' (if shape is valid)
+*   -otherwise {d e f}: display shapes 'd' 'e' 'f' instead of 'shape' (if shape is NOT valid)
+
+Note that one of two options -2d/-3d is required.
+
+Examples:
+~~~~~
+checkview -display result -2d -path ${imagedir}/${test_image}.png
+checkview -display result -3d -path ${imagedir}/${test_image}.png
+checkview -display result_2d -2d v2d -path ${imagedir}/${test_image}.png
+~~~~~
+~~~~~
+box a 10 10 10
+box b 5 5 5 10 10 10
+bcut result b a
+set result_vertices [explode result v]
+checkview -display result -2d -with ${result_vertices} -otherwise { a b } -l -path ${imagedir}/${test_image}.png
+~~~~~
+~~~~~
+box a 10 10 10
+box b 5 5 5 10 10 10
+bcut result b a
+vinit
+vdisplay a b
+vfit
+checkview -screenshot -3d -path ${imagedir}/${test_image}.png
+~~~~~
+
 @subsubsection testmanual_5_3_6 Number of free edges
 
 To check the number of free edges run the command *checkfreebounds*.

src/DrawResources/CheckCommands.tcl

@@ -170,7 +170,15 @@ proc _check_arg {check_name check_result {get_value 0}} {
   upvar narg narg
   upvar args args
   if { $arg == ${check_name} } {
-    if {${get_value}} {
+    if { ${get_value} == "?" } {
+      set next_arg_index [expr $narg + 1]
+      if { $next_arg_index < [llength $args] && ! [regexp {^-[^0-9]} [lindex $args $next_arg_index]] } {
+        set ${check_result} "[lindex $args $next_arg_index]"
+        set narg ${next_arg_index}
+      } else {
+        set ${check_result} "true"
+      }
+    } elseif {${get_value}} {
       incr narg
       if { $narg < [llength $args] && ! [regexp {^-[^0-9]} [lindex $args $narg]] } {
         set ${check_result} "[lindex $args $narg]"
@@ -178,7 +186,7 @@ proc _check_arg {check_name check_result {get_value 0}} {
         error "Option ${check_result} requires argument"
       }
     } else {
-      set ${check_result} 1
+      set ${check_result} "true"
     }
     return 1
   }
@@ -734,4 +742,157 @@ proc checklength {shape args} {
             }
         }
     }
+}
+
+help checkview {
+  Display shape in selected viewer.
+
+  Use: checkview [options...]
+  Allowed options are:
+    -display shapename: display shape with name 'shapename'
+    -3d: display shape in 3d viewer
+    -2d [ v2d / smallview ]: display shape in 2d viewer (default viewer is a 'smallview')
+    -path PATH: location of saved screenshot of viewer
+    -vdispmode N: it is possible to set vdispmode for 3d viewer (default value is 1)
+    -screenshot: procedure will try to make screenshot of already created viewer
+    Procedure can check some property of shape (length, area or volume) and compare it with some value N:
+      -l [N]
+      -s [N]
+      -v [N]
+    If current property is equal to value N, shape is marked as valid in procedure.
+    If value N is not given procedure will mark shape as valid if current property is non-zero.
+    -with {a b c}: display shapes 'a' 'b' 'c' together with 'shape' (if shape is valid)
+    -otherwise {d e f}: display shapes 'd' 'e' 'f' instead of 'shape' (if shape is NOT valid)
+    Note that one of two options -2d/-3d is required.
+}
+
+proc checkview {args} {
+  puts "checkview ${args}"
+
+  set 3dviewer 0
+  set 2dviewer false
+  set shape ""
+  set PathToSave ""
+  set dispmode 1
+  set isScreenshot 0
+  set check_length false
+  set check_area false
+  set check_volume false
+  set otherwise {}
+  set with {}
+
+  set options {{"-3d" 3dviewer 0}
+               {"-2d" 2dviewer ?}
+               {"-display" shape 1}
+               {"-path" PathToSave 1}
+               {"-vdispmode" dispmode 1}
+               {"-screenshot" isScreenshot 0}
+               {"-otherwise" otherwise 1}
+               {"-with" with 1}
+               {"-l" check_length ?}
+               {"-s" check_area ?}
+               {"-v" check_volume ?}}
+
+  # check arguments
+  _check_args ${args} ${options} "checkview"
+
+  if { ${PathToSave} == "" } {
+    set PathToSave "./photo.png"
+  }
+
+  if { ${3dviewer} == 0 && ${2dviewer} == false } {
+    error "Error: wrong using of command 'checkview', please use -2d or -3d option"
+  }
+
+  if { ${isScreenshot} } {
+    if { ${3dviewer} } {
+      vdump ${PathToSave}
+    } else {
+      xwd ${PathToSave}
+    }
+    return
+  }
+
+  set mass 0
+  set isBAD 0
+  upvar ${shape} ${shape}
+  if {[isdraw ${shape}]} {
+    # check area
+    if { [string is boolean ${check_area}] } {
+      if { ${check_area} } {
+        regexp {Mass +: +([-0-9.+eE]+)} [sprops ${shape}] full mass
+      }
+    } else {
+      set mass ${check_area}
+    }
+    # check length
+    if { [string is boolean ${check_length}] } {
+      if { ${check_length} } {
+        regexp {Mass +: +([-0-9.+eE]+)} [lprops ${shape}] full mass
+      }
+    } else {
+      set mass ${check_length}
+    }
+    # check volume
+    if { [string is boolean ${check_volume}] } {
+      if { ${check_volume} } {
+        regexp {Mass +: +([-0-9.+eE]+)} [vprops ${shape}] full mass
+      }
+    } else {
+      set mass ${check_volume}
+    }
+  } else {
+    set isBAD 1
+  }
+  if { ${3dviewer} } {
+    vinit
+    vclear
+  } elseif { ([string is boolean ${2dviewer}] && ${2dviewer}) || ${2dviewer} == "smallview"} {
+    smallview
+    clear
+  } elseif { ${2dviewer} == "v2d"} {
+    v2d
+    2dclear
+  }
+  if {[isdraw ${shape}]} {
+    if { ( ${check_area} == false && ${check_length} == false && ${check_volume} == false ) || ( ${mass} != 0 ) } {
+      foreach s ${with} {
+        upvar ${s} ${s}
+      }
+      lappend with ${shape}
+      if { ${3dviewer} } {
+        vdisplay {*}${with}
+      } else {
+        donly {*}${with}
+      }
+    } else {
+      set isBAD 1
+    }
+  } else {
+    set isBAD 1
+  }
+
+  if { ${isBAD} && [llength ${otherwise}] } {
+    foreach s ${otherwise} {
+      upvar ${s} ${s}
+    }
+    if { ${3dviewer} } {
+      vdisplay {*}${otherwise}
+    } else {
+      donly {*}${otherwise}
+    }
+  }
+
+  if { ${3dviewer} } {
+    vsetdispmode ${dispmode}
+    vfit
+    vdump ${PathToSave}
+  } else {
+    if { ([string is boolean ${2dviewer}] && ${2dviewer}) || ${2dviewer} == "smallview"} {
+      fit
+    } elseif { ${2dviewer} == "v2d"} {
+      2dfit
+    }
+    xwd ${PathToSave}
+  }
 }

tests/3rdparty/end

@@ -1,6 +1,3 @@
-vglinfo
-vdump $imagedir/${test_image}.png
-
 puts ""
 puts "TEST COMPLETED" 
 puts ""

tests/3rdparty/export/end

@@ -1,11 +1,14 @@
 vexport ${aFile} ${format}
+vglinfo
+checkview -screenshot -3d -path ${imagedir}/${test_image}.png
 
 if { [file exists ${aFile}] } {
     puts "The file has been exported to ${format}."
     set filesize [file size ${aFile}]
-# Check if difference of size is more 5%
+
+    # Check if difference of size is more 5%
     if { $filesize < $size && [expr 1.*($size - $filesize)/$size] > 0.05 } {
-	puts "Error: The file has been exported to ${format}, but the result has a different size ($filesize instead of $size)."
+        puts "Error: The file has been exported to ${format}, but the result has a different size ($filesize instead of $size)."
     }
 } else {
     puts "Error: Impossible to export file to ${format}."

tests/3rdparty/fonts/A1

@@ -6,3 +6,5 @@ puts ""
 
 vcolorscale cs -range 10 20 100 -font 16 -textpos right -xy 0 0
 
+vglinfo
+checkview -screenshot -3d -path ${imagedir}/${test_image}.png

tests/3rdparty/fonts/A2

@@ -93,3 +93,6 @@ vdrawtext OC18 OpenCascade -pos -200 -200 150 -color 0.0 1.0 1.0 -halign left -v
 vdrawtext OC19 OpenCascade -pos -200 -200 200 -color 1.0 1.0 0.0 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect italic -font SerifFont
 vdrawtext OC20 OpenCascade -pos -200 -200 250 -color 0.0 1.0 0.02 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect bolditalic -font MonoFont
 vdrawtext OC21 OpenCascade -pos -200 -200 300 -color 1.0 0.0 0.02 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect regular -font MonoFont
+
+vglinfo
+checkview -screenshot -3d -path ${imagedir}/${test_image}.png

tests/3rdparty/fonts/A3

@@ -20,3 +20,6 @@ vfit
 vdrawtext text "$aText"  -pos 100  100 -400 -color 0.0 1.0 1.0 -halign left -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont
 
 vfps
+
+vglinfo
+checkview -screenshot -3d -path ${imagedir}/${test_image}.png

tests/3rdparty/fonts/A4

@@ -31,3 +31,6 @@ vzfit
 vzoom 20
 
 vfps
+
+vglinfo
+checkview -screenshot -3d -path ${imagedir}/${test_image}.png

tests/3rdparty/fonts/A5

@@ -38,3 +38,6 @@ vdrawtext Text8 "Bottom-Right\nFirst line\nLion The Second\n3rd" -pos 700  100 -
 vfit
 
 vfps
+
+vglinfo
+checkview -screenshot -3d -path ${imagedir}/${test_image}.png

tests/3rdparty/fonts/A6

@@ -39,3 +39,6 @@ vdrawtext Text8 "  Bottom-Right\nFirst line  \nLion   The Second\n  3rd  " -pos
 vfit
 
 vfps
+
+vglinfo
+checkview -screenshot -3d -path ${imagedir}/${test_image}.png

tests/3rdparty/fonts/A7

@@ -28,3 +28,6 @@ vdisplay b
 vfit
 
 vfps
+
+vglinfo
+checkview -screenshot -3d -path ${imagedir}/${test_image}.png

tests/3rdparty/fonts/A8

@@ -59,3 +59,6 @@ vdrawtext OC18 OpenCascade -pos -200 -200 150 -color 0.0 1.0 1.0 -halign left -v
 vdrawtext OC19 OpenCascade -pos -200 -200 200 -color 1.0 1.0 0.0 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect italic -font Elephant
 vdrawtext OC20 OpenCascade -pos -200 -200 250 -color 0.0 1.0 0.02 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect bolditalic -font RockWell
 vdrawtext OC21 OpenCascade -pos -200 -200 300 -color 1.0 0.0 0.02 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect regular -font Arial
+
+vglinfo
+checkview -screenshot -3d -path ${imagedir}/${test_image}.png

tests/3rdparty/fonts/B1

@@ -29,3 +29,6 @@ foreach aSize $THE_FONT_SIZES {
 }
 
 vfit
+
+vglinfo
+checkview -screenshot -3d -path ${imagedir}/${test_image}.png

tests/3rdparty/fonts/B2

@@ -29,3 +29,6 @@ foreach aSize $THE_FONT_SIZES {
 }
 
 vfit
+
+vglinfo
+checkview -screenshot -3d -path ${imagedir}/${test_image}.png

tests/3rdparty/fonts/B3

@@ -32,3 +32,6 @@ vdisplay aBTextN
 vdisplay aBTextC
 
 vfit
+
+vglinfo
+checkview -screenshot -3d -path ${imagedir}/${test_image}.png

tests/3rdparty/fonts/B4

@@ -44,3 +44,6 @@ vsetcolor Text6 Text7 Text8 1 1 0
 vfit
 
 vfps
+
+vglinfo
+checkview -screenshot -3d -path ${imagedir}/${test_image}.png

tests/3rdparty/fonts/B5

@@ -44,3 +44,6 @@ vsetcolor Text6 Text7 Text8 1 1 0
 vfit
 
 vfps
+
+vglinfo
+checkview -screenshot -3d -path ${imagedir}/${test_image}.png

tests/3rdparty/text3d/A1

@@ -26,5 +26,5 @@ vdrawtext t2 "Some text on the top face" -pos $x/2 $y/2 $z -color red -height 20
 vdrawtext t3 "First line\nSecond line" -pos $x/2 0 $z/2 -color 0.0 0.0 1.0 -height 20 -plane 0 -1 0 0 0 1 -valign center -halign center -font SansFont
 
 vfit
-
+vglinfo
-vdump ${imagedir}/${casename}.png
+checkview -screenshot -3d -path ${imagedir}/${test_image}.png

tests/blend/end

@@ -2,11 +2,7 @@ if { [isdraw result] } {
     #check if result is valid
     puts [checkshape result]
 
-    clear
+    checkview -display result -2d -path ${imagedir}/${test_image}.png
-    smallview
-    donly result
-    fit
-    xwd $imagedir/${test_image}.png
 } else {
     puts "Error : The blend cannot be built."
 }

tests/boolean/bcommon_2d/A1

@@ -1,7 +1,9 @@
 restore [locate_data_file case_1_solid.brep] a
 restore [locate_data_file case_1_edge1.brep] b
+
 bcommon result b a
+
 checkprops result -l 100.002
 checksection result
-set nbsh_v 4
+checknbshapes result -vertex 4 -edge 2 -t
-set nbsh_e 2
+

tests/boolean/bcommon_2d/A2

@@ -1,7 +1,9 @@
 restore [locate_data_file case_1_solid.brep] a
 restore [locate_data_file case_1_edge2.brep] b
+
 bcommon result b a
+
 checkprops result -l empty
 checksection result
-set nbsh_v 0
+checknbshapes result -vertex 0 -edge 0 -t
-set nbsh_e 0
+

tests/boolean/bcommon_2d/A3

@@ -1,7 +1,9 @@
 restore [locate_data_file case_1_solid.brep] a
 restore [locate_data_file case_1_edge3.brep] b
+
 bcommon result b a
+
 checkprops result -l 297.02
 checksection result
-set nbsh_v 2
+checknbshapes result -vertex 2 -edge 1 -t
-set nbsh_e 1
+

tests/boolean/bcommon_2d/A4

@@ -1,7 +1,9 @@
 restore [locate_data_file case_1_solid.brep] a
 restore [locate_data_file case_1_edge4.brep] b
+
 bcommon result b a
+
 checkprops result -l 474.239
 checksection result
-set nbsh_v 2
+checknbshapes result -vertex 2 -edge 1 -t
-set nbsh_e 1
+

tests/boolean/bcommon_2d/A5

@@ -1,7 +1,9 @@
 restore [locate_data_file case_1_solid.brep] a
 restore [locate_data_file case_1_wire1.brep] b
+
 bcommon result b a
+
 checkprops result -l 100.002
 checksection result
-set nbsh_v 4
+checknbshapes result -vertex 4 -edge 2 -t
-set nbsh_e 2
+

tests/boolean/bcommon_2d/A6

@@ -1,7 +1,9 @@
 restore [locate_data_file case_1_solid.brep] a
 restore [locate_data_file case_1_wire2.brep] b
+
 bcommon result b a
+
 checkprops result -l 350.738
 checksection result
-set nbsh_v 3
+checknbshapes result -vertex 3 -edge 2 -t
-set nbsh_e 2
+

tests/boolean/bcommon_2d/A7

@@ -1,7 +1,9 @@
 restore [locate_data_file case_1_solid.brep] a
 restore [locate_data_file case_1_wire3.brep] b
+
 bcommon result b a
+
 checkprops result -l 942.478
 checksection result
-set nbsh_v 2
+checknbshapes result -vertex 2 -edge 2 -t
-set nbsh_e 2
+

tests/boolean/bcommon_2d/A8

@@ -1,7 +1,9 @@
 restore [locate_data_file case_1_shell.brep] a
 restore [locate_data_file case_1_edge2.brep] b
+
 bcommon result b a
+
 checkprops result -l empty
 checksection result
-set nbsh_v 0
+checknbshapes result -vertex 0 -edge 0 -t
-set nbsh_e 0
+

tests/boolean/bcommon_2d/A9

@@ -1,7 +1,9 @@
 restore [locate_data_file case_1_shell.brep] a
 restore [locate_data_file case_1_edge4.brep] b
+
 bcommon result b a
+
 checkprops result -l 471.239
 checksection result
-set nbsh_v 2
+checknbshapes result -vertex 2 -edge 1 -t
-set nbsh_e 1
+

tests/boolean/bcommon_2d/B1

@@ -1,7 +1,9 @@
 restore [locate_data_file case_1_shell.brep] a
 restore [locate_data_file case_1_wire3.brep] b
+
 bcommon result b a
+
 checkprops result -l 942.478
 checksection result
-set nbsh_v 2
+checknbshapes result -vertex 2 -edge 2 -t
-set nbsh_e 2
+

tests/boolean/bcommon_2d/B2

@@ -1,7 +1,9 @@
 restore [locate_data_file case_2_solid_r.brep] a
 restore [locate_data_file case_2_edge1.brep] b
+
 bcommon result b a
+
 checkprops result -l 847.007
 checksection result
-set nbsh_v 14
+checknbshapes result -vertex 14 -edge 7 -t
-set nbsh_e 7
+

tests/boolean/bcommon_2d/B3

@@ -1,7 +1,9 @@
 restore [locate_data_file case_2_solid_r.brep] a
 restore [locate_data_file case_2_edge2.brep] b
+
 bcommon result b a
+
 checkprops result -l 847.007
 checksection result
-set nbsh_v 14
+checknbshapes result -vertex 14 -edge 7 -t
-set nbsh_e 7
+

tests/boolean/bcommon_2d/B4

@@ -1,7 +1,9 @@
 restore [locate_data_file case_2_solid_r.brep] a
 restore [locate_data_file case_2_edge3.brep] b
+
 bcommon result b a
+
 checkprops result -l 753.315
 checksection result
-set nbsh_v 6
+checknbshapes result -vertex 6 -edge 3 -t
-set nbsh_e 3
+

tests/boolean/bcommon_2d/B5

@@ -1,7 +1,9 @@
 restore [locate_data_file case_2_solid_r.brep] a
 restore [locate_data_file case_2_edge4.brep] b
+
 bcommon result b a
+
 checkprops result -l 753.315
 checksection result
-set nbsh_v 6
+checknbshapes result -vertex 6 -edge 3 -t
-set nbsh_e 3
+

tests/boolean/bcommon_2d/B6

@@ -1,7 +1,9 @@
 restore [locate_data_file case_2_solid_r.brep] a
 restore [locate_data_file case_2_wire1.brep] b
+
 bcommon result b a
+
 checkprops result -l 874
 checksection result
-set nbsh_v 18
+checknbshapes result -vertex 18 -edge 11 -t
-set nbsh_e 11
+

tests/boolean/bcommon_2d/B7

@@ -1,7 +1,9 @@
 restore [locate_data_file case_2_solid_r.brep] a
 restore [locate_data_file case_2_wire2.brep] b
+
 bcommon result b a
+
 checkprops result -l 874
 checksection result
-set nbsh_v 18
+checknbshapes result -vertex 18 -edge 11 -t
-set nbsh_e 11
+

tests/boolean/bcommon_2d/B8

@@ -1,7 +1,9 @@
 restore [locate_data_file case_2_solid_r.brep] a
 restore [locate_data_file case_2_wire3.brep] b
+
 bcommon result b a
+
 checkprops result -l 846.821
 checksection result
-set nbsh_v 9
+checknbshapes result -vertex 9 -edge 6 -t
-set nbsh_e 6
+

tests/boolean/bcommon_2d/B9

@@ -1,7 +1,9 @@
 restore [locate_data_file case_2_solid_r.brep] a
 restore [locate_data_file case_2_wire4.brep] b
+
 bcommon result b a
+
 checkprops result -l 768.597
 checksection result
-set nbsh_v 9
+checknbshapes result -vertex 9 -edge 6 -t
-set nbsh_e 6
+

tests/boolean/bcommon_2d/C1

@@ -1,7 +1,9 @@
 restore [locate_data_file case_2_shell_r.brep] a
 restore [locate_data_file case_2_edge1.brep] b
+
 bcommon result b a
+
 checkprops result -l 847.007
 checksection result
-set nbsh_v 14
+checknbshapes result -vertex 14 -edge 7 -t
-set nbsh_e 7
+

tests/boolean/bcommon_2d/C2

@@ -1,7 +1,9 @@
 restore [locate_data_file case_2_shell_r.brep] a
 restore [locate_data_file case_2_edge2.brep] b
+
 bcommon result b a
+
 checkprops result -l 847.007
 checksection result
-set nbsh_v 14
+checknbshapes result -vertex 14 -edge 7 -t
-set nbsh_e 7
+

tests/boolean/bcommon_2d/C3

@@ -1,7 +1,9 @@
 restore [locate_data_file case_2_shell_r.brep] a
 restore [locate_data_file case_2_edge3.brep] b
+
 bcommon result b a
+
 checkprops result -l 753.315
 checksection result
-set nbsh_v 6
+checknbshapes result -vertex 6 -edge 3 -t
-set nbsh_e 3
+

tests/boolean/bcommon_2d/C4

@@ -1,7 +1,9 @@
 restore [locate_data_file case_2_shell_r.brep] a
 restore [locate_data_file case_2_wire1.brep] b
+
 bcommon result b a
+
 checkprops result -l 874
 checksection result
-set nbsh_v 18
+checknbshapes result -vertex 18 -edge 11 -t
-set nbsh_e 11
+

tests/boolean/bcommon_2d/C5

@@ -1,7 +1,9 @@
 restore [locate_data_file case_2_shell_r.brep] a
 restore [locate_data_file case_2_wire2.brep] b
+
 bcommon result b a
+
 checkprops result -l empty
 checksection result
-set nbsh_v 0
+checknbshapes result -vertex 0 -edge 0 -t
-set nbsh_e 0
+

tests/boolean/bcommon_2d/C6

@@ -1,7 +1,9 @@
 restore [locate_data_file case_2_shell_r.brep] a
 restore [locate_data_file case_2_wire3.brep] b
+
 bcommon result b a
+
 checkprops result -l 846.821
 checksection result
-set nbsh_v 9
+checknbshapes result -vertex 9 -edge 6 -t
-set nbsh_e 6
+

tests/boolean/bcommon_2d/C7

@@ -1,7 +1,9 @@
 restore [locate_data_file case_2_face_r.brep] a
 restore [locate_data_file case_2_edge1.brep] b
+
 bcommon result b a
+
 checkprops result -l 847.007
 checksection result
-set nbsh_v 14
+checknbshapes result -vertex 14 -edge 7 -t
-set nbsh_e 7
+

tests/boolean/bcommon_2d/C8

@@ -1,7 +1,9 @@
 restore [locate_data_file case_2_face_r.brep] a
 restore [locate_data_file case_2_edge3.brep] b
+
 bcommon result b a
+
 checkprops result -l 753.315
 checksection result
-set nbsh_v 6
+checknbshapes result -vertex 6 -edge 3 -t
-set nbsh_e 3
+

tests/boolean/bcommon_2d/C9

@@ -1,7 +1,9 @@
 restore [locate_data_file case_2_face_r.brep] a
 restore [locate_data_file case_2_wire1.brep] b
+
 bcommon result b a
+
 checkprops result -l 874
 checksection result
-set nbsh_v 18
+checknbshapes result -vertex 18 -edge 11 -t
-set nbsh_e 11
+

tests/boolean/bcommon_2d/D1

@@ -1,7 +1,9 @@
 restore [locate_data_file case_2_face_r.brep] a
 restore [locate_data_file case_2_wire3.brep] b
+
 bcommon result b a
+
 checkprops result -l 846.821
 checksection result
-set nbsh_v 9
+checknbshapes result -vertex 9 -edge 6 -t
-set nbsh_e 6
+

tests/boolean/bcommon_2d/D2

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_solid.brep] a
 restore [locate_data_file case_3_edge1.brep] b
+
 bcommon result b a
+
 checkprops result -l 345.975
 checksection result
-set nbsh_v 8
+checknbshapes result -vertex 8 -edge 7 -t
-set nbsh_e 7
+

tests/boolean/bcommon_2d/D3

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_solid.brep] a
 restore [locate_data_file case_3_edge2.brep] b
+
 bcommon result b a
+
 checkprops result -l 345.975
 checksection result
-set nbsh_v 8
+checknbshapes result -vertex 8 -edge 7 -t
-set nbsh_e 7
+

tests/boolean/bcommon_2d/D4

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_solid.brep] a
 restore [locate_data_file offset_wire_034.brep] b
+
 bcommon result b a
+
 checkprops result -l 345.975
 checksection result
-set nbsh_v 8
+checknbshapes result -vertex 8 -edge 7 -t
-set nbsh_e 7
+

tests/boolean/bcommon_2d/D5

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_solid.brep] a
 restore [locate_data_file case_3_wire2.brep] b
+
 bcommon result b a
+
 checkprops result -l 345.975
 checksection result
-set nbsh_v 14
+checknbshapes result -vertex 14 -edge 13 -t
-set nbsh_e 13
+

tests/boolean/bcommon_2d/D6

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_solid.brep] a
 restore [locate_data_file case_3_wire3.brep] b
+
 bcommon result b a
+
 checkprops result -l 345.975
 checksection result
-set nbsh_v 8
+checknbshapes result -vertex 8 -edge 7 -t
-set nbsh_e 7
+

tests/boolean/bcommon_2d/D7

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_solid.brep] a
 restore [locate_data_file case_3_wire4.brep] b
+
 bcommon result b a
+
 checkprops result -l 345.975
 checksection result
-set nbsh_v 8
+checknbshapes result -vertex 8 -edge 7 -t
-set nbsh_e 7
+

tests/boolean/bcommon_2d/D8

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_solid.brep] a
 restore [locate_data_file case_3_wire5.brep] b
+
 bcommon result b a
+
 checkprops result -l 292.732
 checksection result
-set nbsh_v 4
+checknbshapes result -vertex 4 -edge 4 -t
-set nbsh_e 4
+

tests/boolean/bcommon_2d/D9

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_shell.brep] a
 restore [locate_data_file case_3_edge1.brep] b
+
 bcommon result b a
+
 checkprops result -l 345.975
 checksection result
-set nbsh_v 8
+checknbshapes result -vertex 8 -edge 7 -t
-set nbsh_e 7
+

tests/boolean/bcommon_2d/E1

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_shell.brep] a
 restore [locate_data_file case_3_edge2.brep] b
+
 bcommon result b a
+
 checkprops result -l 345.975
 checksection result
-set nbsh_v 8
+checknbshapes result -vertex 8 -edge 7 -t
-set nbsh_e 7
+

tests/boolean/bcommon_2d/E2

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_shell.brep] a
 restore [locate_data_file offset_wire_034.brep] b
+
 bcommon result b a
+
 checkprops result -l 345.975
 checksection result
-set nbsh_v 8
+checknbshapes result -vertex 8 -edge 7 -t
-set nbsh_e 7
+

tests/boolean/bcommon_2d/E3

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_shell.brep] a
 restore [locate_data_file case_3_wire2.brep] b
+
 bcommon result b a
+
 checkprops result -l 345.975
 checksection result
-set nbsh_v 14
+checknbshapes result -vertex 14 -edge 13 -t
-set nbsh_e 13
+

tests/boolean/bcommon_2d/E4

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_shell.brep] a
 restore [locate_data_file case_3_wire3.brep] b
+
 bcommon result b a
+
 checkprops result -l 345.975
 checksection result
-set nbsh_v 8
+checknbshapes result -vertex 8 -edge 7 -t
-set nbsh_e 7
+

tests/boolean/bcommon_2d/E5

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_shell.brep] a
 restore [locate_data_file case_3_wire4.brep] b
+
 bcommon result b a
+
 checkprops result -l 345.975
 checksection result
-set nbsh_v 8
+checknbshapes result -vertex 8 -edge 7 -t
-set nbsh_e 7
+

tests/boolean/bcommon_2d/E6

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_shell.brep] a
 restore [locate_data_file case_3_wire5.brep] b
+
 bcommon result b a
+
 checkprops result -l 292.732
 checksection result
-set nbsh_v 4
+checknbshapes result -vertex 4 -edge 4 -t
-set nbsh_e 4
+

tests/boolean/bcommon_2d/E7

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_face.brep] a
 restore [locate_data_file case_3_edge1.brep] b
+
 bcommon result b a
+
 checkprops result -l 345.975
 checksection result
-set nbsh_v 8
+checknbshapes result -vertex 8 -edge 7 -t
-set nbsh_e 7
+

tests/boolean/bcommon_2d/E8

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_face.brep] a
 restore [locate_data_file offset_wire_034.brep] b
+
 bcommon result b a
+
 checkprops result -l 345.975
 checksection result
-set nbsh_v 8
+checknbshapes result -vertex 8 -edge 7 -t
-set nbsh_e 7
+

tests/boolean/bcommon_2d/E9

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_face.brep] a
 restore [locate_data_file case_3_wire2.brep] b
+
 bcommon result b a
+
 checkprops result -l 345.975
 checksection result
-set nbsh_v 14
+checknbshapes result -vertex 14 -edge 13 -t
-set nbsh_e 13
+

tests/boolean/bcommon_2d/F1

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_face.brep] a
 restore [locate_data_file case_3_wire5.brep] b
+
 bcommon result b a
+
 checkprops result -l 66.3661
 checksection result
-set nbsh_v 2
+checknbshapes result -vertex 2 -edge 1 -t
-set nbsh_e 1
+

tests/boolean/bcommon_2d/F2

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_wire.brep] a
 restore [locate_data_file case_3_edge1.brep] b
+
 bcommon result b a
+
 checkprops result -l 345.975
 checksection result
-set nbsh_v 8
+checknbshapes result -vertex 8 -edge 7 -t
-set nbsh_e 7
+

tests/boolean/bcommon_2d/F3

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_wire.brep] a
 restore [locate_data_file offset_wire_034.brep] b
+
 bcommon result b a
+
 checkprops result -l 345.975
 checksection result
-set nbsh_v 8
+checknbshapes result -vertex 8 -edge 7 -t
-set nbsh_e 7
+

tests/boolean/bcommon_2d/F4

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_wire.brep] a
 restore [locate_data_file case_3_wire2.brep] b
+
 bcommon result b a
+
 checkprops result -l 345.975
 checksection result
-set nbsh_v 14
+checknbshapes result -vertex 14 -edge 13 -t
-set nbsh_e 13
+

tests/boolean/bcommon_2d/F5

@@ -1,7 +1,9 @@
 restore [locate_data_file case_3_wire.brep] a
 restore [locate_data_file case_3_wire5.brep] b
+
 bcommon result b a
+
 checkprops result -l 66.3661
 checksection result
-set nbsh_v 2
+checknbshapes result -vertex 2 -edge 1 -t
-set nbsh_e 1
+

tests/boolean/bcommon_2d/F6

@@ -1,7 +1,9 @@
 restore [locate_data_file case_4_solid.brep] a
 restore [locate_data_file case_4_edge1.brep] b
+
 bcommon result b a
+
 checkprops result -l 1231.36
 checksection result
-set nbsh_v 2
+checknbshapes result -vertex 2 -edge 1 -t
-set nbsh_e 1
+

tests/boolean/bcommon_2d/F7

@@ -1,7 +1,9 @@
 restore [locate_data_file case_4_solid.brep] a
 restore [locate_data_file case_4_edge2.brep] b
+
 bcommon result b a
+
 checkprops result -l 1231.36
 checksection result
-set nbsh_v 2
+checknbshapes result -vertex 2 -edge 1 -t
-set nbsh_e 1
+

tests/boolean/bcommon_2d/F8

@@ -1,7 +1,9 @@
 restore [locate_data_file case_4_solid.brep] a
 restore [locate_data_file case_4_edge3.brep] b
+
 bcommon result b a
+
 checkprops result -l 375.748
 checksection result
-set nbsh_v 2
+checknbshapes result -vertex 2 -edge 1 -t
-set nbsh_e 1
+

tests/boolean/bcommon_2d/F9

@@ -1,7 +1,9 @@
 restore [locate_data_file case_4_solid.brep] a
 restore [locate_data_file case_4_wire1.brep] b
+
 bcommon result b a
+
 checkprops result -l 2553.95
 checksection result
-set nbsh_v 3
+checknbshapes result -vertex 3 -edge 3 -t
-set nbsh_e 3
+

tests/boolean/bcommon_2d/G1

@@ -1,7 +1,9 @@
 restore [locate_data_file case_4_solid.brep] a
 restore [locate_data_file case_4_wire2.brep] b
+
 bcommon result b a
+
 checkprops result -l 2553.95
 checksection result
-set nbsh_v 3
+checknbshapes result -vertex 3 -edge 3 -t
-set nbsh_e 3
+

tests/boolean/bcommon_2d/G2

@@ -1,7 +1,9 @@
 restore [locate_data_file case_4_solid.brep] a
 restore [locate_data_file case_4_wire3.brep] b
+
 bcommon result b a
+
 checkprops result -l 633.071
 checksection result
-set nbsh_v 9
+checknbshapes result -vertex 9 -edge 7 -t
-set nbsh_e 7
+

tests/boolean/bcommon_2d/G3

@@ -1,7 +1,9 @@
 restore [locate_data_file case_4_solid.brep] a
 restore [locate_data_file case_4_wire4.brep] b
+
 bcommon result b a
+
 checkprops result -l 633.071
 checksection result
-set nbsh_v 9
+checknbshapes result -vertex 9 -edge 7 -t
-set nbsh_e 7
+

tests/boolean/bcommon_2d/G4

@@ -1,7 +1,9 @@
 restore [locate_data_file case_4_shell.brep] a
 restore [locate_data_file case_4_edge1.brep] b
+
 bcommon result b a
+
 checkprops result -l 615.235
 checksection result
-set nbsh_v 6
+checknbshapes result -vertex 6 -edge 3 -t
-set nbsh_e 3
+

tests/boolean/bcommon_2d/G5

@@ -1,7 +1,9 @@
 restore [locate_data_file case_4_shell.brep] a
 restore [locate_data_file case_4_edge3.brep] b
+
 bcommon result b a
+
 checkprops result -l 474.547
 checksection result
-set nbsh_v 4
+checknbshapes result -vertex 4 -edge 2 -t
-set nbsh_e 2
+

tests/boolean/bcommon_2d/G6

@@ -1,7 +1,9 @@
 restore [locate_data_file case_4_shell.brep] a
 restore [locate_data_file case_4_wire1.brep] b
+
 bcommon result b a
+
 checkprops result -l 1245.29
 checksection result
-set nbsh_v 10
+checknbshapes result -vertex 10 -edge 5 -t
-set nbsh_e 5
+

tests/boolean/bcommon_2d/G7

@@ -1,7 +1,9 @@
 restore [locate_data_file case_4_shell.brep] a
 restore [locate_data_file case_4_wire3.brep] b
+
 bcommon result b a
+
 checkprops result -l 1150.78
 checksection result
-set nbsh_v 15
+checknbshapes result -vertex 15 -edge 10 -t
-set nbsh_e 10
+

tests/boolean/bcommon_2d/G8

@@ -1,7 +1,9 @@
 restore [locate_data_file case_4_face.brep] a
 restore [locate_data_file case_4_edge1.brep] b
+
 bcommon result b a
+
 checkprops result -l 615.235
 checksection result
-set nbsh_v 6
+checknbshapes result -vertex 6 -edge 3 -t
-set nbsh_e 3
+

tests/boolean/bcommon_2d/G9

@@ -1,7 +1,9 @@
 restore [locate_data_file case_4_face.brep] a
 restore [locate_data_file case_4_edge3.brep] b
+
 bcommon result b a
+
 checkprops result -l 474.547
 checksection result
-set nbsh_v 4
+checknbshapes result -vertex 4 -edge 2 -t
-set nbsh_e 2
+

tests/boolean/bcommon_2d/H1

@@ -1,7 +1,9 @@
 restore [locate_data_file case_4_face.brep] a
 restore [locate_data_file case_4_wire1.brep] b
+
 bcommon result b a
+
 checkprops result -l 1245.29
 checksection result
-set nbsh_v 10
+checknbshapes result -vertex 10 -edge 5 -t
-set nbsh_e 5
+

tests/boolean/bcommon_2d/H2

@@ -1,7 +1,9 @@
 restore [locate_data_file case_4_face.brep] a
 restore [locate_data_file case_4_wire3.brep] b
+
 bcommon result b a
+
 checkprops result -l 1150.78
 checksection result
-set nbsh_v 15
+checknbshapes result -vertex 15 -edge 10 -t
-set nbsh_e 10
+

tests/boolean/bcommon_2d/H3

@@ -1,7 +1,9 @@
 restore [locate_data_file case_5_solid.brep] a
 restore [locate_data_file case_4_edge1.brep] b
+
 bcommon result b a
+
 checkprops result -l 887.185
 checksection result
-set nbsh_v 2
+checknbshapes result -vertex 2 -edge 1 -t
-set nbsh_e 1
+

tests/boolean/bcommon_2d/H4

@@ -1,7 +1,9 @@
 restore [locate_data_file case_5_solid.brep] a
 restore [locate_data_file case_5_edge2.brep] b
+
 bcommon result b a
+
 checkprops result -l 887.185
 checksection result
-set nbsh_v 2
+checknbshapes result -vertex 2 -edge 1 -t
-set nbsh_e 1
+

tests/boolean/bcommon_2d/H5

@@ -1,7 +1,9 @@
 restore [locate_data_file case_5_solid.brep] a
 restore [locate_data_file case_4_edge3.brep] b
+
 bcommon result b a
+
 checkprops result -l 829.541
 checksection result
-set nbsh_v 2
+checknbshapes result -vertex 2 -edge 1 -t
-set nbsh_e 1
+

tests/boolean/bcommon_2d/H6

@@ -1,7 +1,9 @@
 restore [locate_data_file case_5_solid.brep] a
 restore [locate_data_file case_4_wire1.brep] b
+
 bcommon result b a
+
 checkprops result -l 1747.73
 checksection result
-set nbsh_v 4
+checknbshapes result -vertex 4 -edge 2 -t
-set nbsh_e 2
+

tests/boolean/bcommon_2d/H7

@@ -1,7 +1,9 @@
 restore [locate_data_file case_5_solid.brep] a
 restore [locate_data_file case_4_wire2.brep] b
+
 bcommon result b a
+
 checkprops result -l 1747.73
 checksection result
-set nbsh_v 4
+checknbshapes result -vertex 4 -edge 2 -t
-set nbsh_e 2
+

tests/boolean/bcommon_2d/H8

@@ -1,7 +1,9 @@
 restore [locate_data_file case_5_solid.brep] a
 restore [locate_data_file case_4_wire3.brep] b
+
 bcommon result b a
+
 checkprops result -l 1808.02
 checksection result
-set nbsh_v 12
+checknbshapes result -vertex 12 -edge 11 -t
-set nbsh_e 11
+

tests/boolean/bcommon_2d/H9

@@ -1,7 +1,9 @@
 restore [locate_data_file case_5_solid.brep] a
 restore [locate_data_file case_5_wire4.brep] b
+
 bcommon result b a
+
 checkprops result -l 1808.02
 checksection result
-set nbsh_v 12
+checknbshapes result -vertex 12 -edge 11 -t
-set nbsh_e 11
+

tests/boolean/bcommon_2d/I1

@@ -1,7 +1,9 @@
 restore [locate_data_file case_5_solid.brep] a
 restore [locate_data_file case_5_wire5.brep] b
+
 bcommon result b a
+
 checkprops result -l 3000.52
 checksection result
-set nbsh_v 2
+checknbshapes result -vertex 2 -edge 2 -t
-set nbsh_e 2
+

tests/boolean/bcommon_2d/I2

@@ -1,7 +1,9 @@
 restore [locate_data_file case_5_shell.brep] a
 restore [locate_data_file case_4_edge1.brep] b
+
 bcommon result b a
+
 checkprops result -l 887.185
 checksection result
-set nbsh_v 2
+checknbshapes result -vertex 2 -edge 1 -t
-set nbsh_e 1
+

tests/boolean/bcommon_2d/I3

@@ -1,7 +1,9 @@
 restore [locate_data_file case_5_shell.brep] a
 restore [locate_data_file case_4_edge3.brep] b
+
 bcommon result b a
+
 checkprops result -l 829.541
 checksection result
-set nbsh_v 2
+checknbshapes result -vertex 2 -edge 1 -t
-set nbsh_e 1
+

tests/boolean/bcommon_2d/I4

@@ -1,7 +1,9 @@
 restore [locate_data_file case_5_shell.brep] a
 restore [locate_data_file case_4_wire1.brep] b
+
 bcommon result b a
+
 checkprops result -l 1747.73
 checksection result
-set nbsh_v 4
+checknbshapes result -vertex 4 -edge 2 -t
-set nbsh_e 2
+

tests/boolean/bcommon_2d/I5

@@ -1,7 +1,9 @@
 restore [locate_data_file case_5_shell.brep] a
 restore [locate_data_file case_4_wire3.brep] b
+
 bcommon result b a
+
 checkprops result -l 1808.02
 checksection result
-set nbsh_v 12
+checknbshapes result -vertex 12 -edge 11 -t
-set nbsh_e 11
+

tests/boolean/bcommon_2d/I6

@@ -1,7 +1,9 @@
 restore [locate_data_file case_5_shell.brep] a
 restore [locate_data_file case_5_wire5.brep] b
+
 bcommon result b a
+
 checkprops result -l 3000.52
 checksection result
-set nbsh_v 2
+checknbshapes result -vertex 2 -edge 2 -t
-set nbsh_e 2
+

tests/boolean/bcommon_2d/I7

@@ -1,7 +1,9 @@
 restore [locate_data_file case_5_face.brep] a
 restore [locate_data_file case_4_edge1.brep] b
+
 bcommon result b a
+
 checkprops result -l 887.185
 checksection result
-set nbsh_v 2
+checknbshapes result -vertex 2 -edge 1 -t
-set nbsh_e 1
+

tests/boolean/bcommon_2d/I8

@@ -1,7 +1,9 @@
 restore [locate_data_file case_5_face.brep] a
 restore [locate_data_file case_4_edge3.brep] b
+
 bcommon result b a
+
 checkprops result -l 829.541
 checksection result
-set nbsh_v 2
+checknbshapes result -vertex 2 -edge 1 -t
-set nbsh_e 1
+

tests/boolean/bcommon_2d/I9

@@ -1,7 +1,9 @@
 restore [locate_data_file case_5_face.brep] a
 restore [locate_data_file case_4_wire1.brep] b
+
 bcommon result b a
+
 checkprops result -l 1747.73
 checksection result
-set nbsh_v 4
+checknbshapes result -vertex 4 -edge 2 -t
-set nbsh_e 2
+