0025805: Added preprocessing for closed surfaces before exporting to STEP.

Added SplitClosedFaces to XSTEPResource/STEP, changed tests in connection with addition SplitClosedFaces

diff --git a/src/STEPCAFControl/STEPCAFControl_Writer.cxx b/src/STEPCAFControl/STEPCAFControl_Writer.cxx
index 69aaa4218929c82903a83492017fe73c0c46be12..0d32752b16e91b8ec9bb3621e488133c261ec2e3 100644 (file)
--- a/src/STEPCAFControl/STEPCAFControl_Writer.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_Writer.cxx
@@ -748,7 +748,7 @@ static Standard_Integer FindEntities (const Handle(Transfer_FinderProcess) &FP,
     //Handle(Transfer_TransientListBinder)::DownCast( bnd->Next(Standard_True) );
     Handle(Transfer_TransientListBinder)::DownCast( bnd );
   Standard_Integer nres=0;
-  if ( TransientListBinder.IsNull() && S.ShapeType() == TopAbs_COMPOUND) 
+  if ( TransientListBinder.IsNull() || S.ShapeType() == TopAbs_COMPOUND) 
   {
     for ( TopoDS_Iterator it(S); it.More(); it.Next() ) {
       Handle(StepRepr_RepresentationItem) item = STEPConstruct::FindEntity ( FP, it.Value(), L );

diff --git a/src/XSTEPResource/STEP b/src/XSTEPResource/STEP
index 9a02245b5cd147bb3f3c3491e08642e2b052d12b..7b2bf6d891e95840dca18101749fb80304a315ba 100755 (executable)
--- a/src/XSTEPResource/STEP
+++ b/src/XSTEPResource/STEP
@@ -6,7 +6,9 @@
 ! ==============================================================================
 !
 
-ToSTEP.exec.op : SplitCommonVertex,DirectFaces
+ToSTEP.exec.op : SplitCommonVertex,DirectFaces,SplitClosedFaces
+
+ToSTEP.SplitClosedFaces.SegmentSurfaceMode      : 1
 
 FromSTEP.exec.op : FixShape
 

diff --git a/tests/bugs/modalg_1/bug19793_2 b/tests/bugs/modalg_1/bug19793_2
index 81c13639d6411ade908f9d2c563e8709bd6f9ee1..27b59c6b47bdbff9635712c69c6032ac20393f88 100755 (executable)
--- a/tests/bugs/modalg_1/bug19793_2
+++ b/tests/bugs/modalg_1/bug19793_2
@@ -67,7 +67,7 @@ if { [regexp {Debug mode} [dversion]] } {
   } else {
     puts "Checking LINUX performance..."
     # Initial CPU_time is 287-289 seconds for Linux
-    if {$CPU_time > 250.} {
+    if {$CPU_time > 260.} {
        puts "ERROR: OCC23753 is reproduced."
        puts "       Low performance: $CPU_time"
     }

diff --git a/tests/bugs/step/bug25523 b/tests/bugs/step/bug25523
index d425f2831439f9e70e09c60ed02b30433c211a4d..bf9a89bcc759fde400609be85d0b33aaa2e504c8 100755 (executable)
--- a/tests/bugs/step/bug25523
+++ b/tests/bugs/step/bug25523
@@ -29,9 +29,22 @@ catch { file delete ${aFile} }
 
 stepwrite a a ${aFile}
 
+set nbshapes_expected_1 "
+Number of shapes in a
+ VERTEX    : 58
+ EDGE      : 106
+ WIRE      : 56
+ FACE      : 51
+ SHELL     : 1
+ SOLID     : 1
+ COMPSOLID : 0
+ COMPOUND  : 0
+ SHAPE     : 273
+"
+
 stepread ${aFile} b *
 nbshapes b_1 ;# empty compound
-checknbshapes b_1 ${nbshapes_expected} 0 "Stator model"
+checknbshapes b_1 ${nbshapes_expected_1} 0 "Stator model"
 
 tpstat c ;# reports exception
 

diff --git a/tests/bugs/xde/bug22492 b/tests/bugs/xde/bug22492
index 3b6ff9a5f90fd26d218880fee2a3bb692242a7d8..1168b95b0444d191b6fa3785f29e31418353b1df 100755 (executable)
--- a/tests/bugs/xde/bug22492
+++ b/tests/bugs/xde/bug22492
@@ -19,16 +19,16 @@ stepread $imagedir/${test_image}.step sc2 *
 tpcompound sc2
 renamevar sc2 result
 
-set square 285636
+set square 277677
 
 set nb_v_good 2
-set nb_e_good 3
-set nb_w_good 1
-set nb_f_good 1
+set nb_e_good 6
+set nb_w_good 2
+set nb_f_good 2
 set nb_sh_good 1
 set nb_sol_good 1
 set nb_compsol_good 0
 set nb_compound_good 1
-set nb_shape_good 10
+set nb_shape_good 15
 
 set 2dviewer 0

diff --git a/tests/bugs/xde/bug22535_1 b/tests/bugs/xde/bug22535_1
index f958faa47b8b0a6a7c700e5bd2ccb713285be185..7dd50a8e8ab198f2e5f029baeba9bfe2f240e934 100755 (executable)
--- a/tests/bugs/xde/bug22535_1
+++ b/tests/bugs/xde/bug22535_1
@@ -19,13 +19,13 @@ vfit
 set square 14217.2
 
 set nb_v_good 6
-set nb_e_good 9
-set nb_w_good 3
-set nb_f_good 2
+set nb_e_good 14
+set nb_w_good 4
+set nb_f_good 4
 set nb_sh_good 1
 set nb_sol_good 1
 set nb_compsol_good 0
 set nb_compound_good 0
-set nb_shape_good 22
+set nb_shape_good 30
 
 set 3dviewer 1

diff --git a/tests/bugs/xde/bug22535_2 b/tests/bugs/xde/bug22535_2
index bc216c97d6ec7ec11d14f6a99c5ae5e7fe6003e4..c08b298d31a25646f4a60d51401fb300a33bfa6d 100755 (executable)
--- a/tests/bugs/xde/bug22535_2
+++ b/tests/bugs/xde/bug22535_2
@@ -18,14 +18,14 @@ vfit
 
 set square 50201.3
 
-set nb_v_good 15
-set nb_e_good 24
-set nb_w_good 9
-set nb_f_good 8
+set nb_v_good 18
+set nb_e_good 40
+set nb_w_good 16
+set nb_f_good 16
 set nb_sh_good 5
 set nb_sol_good 4
 set nb_compsol_good 0
 set nb_compound_good 1
-set nb_shape_good 66
+set nb_shape_good 100
 
 set 3dviewer 1

diff --git a/tests/bugs/xde/bug9490 b/tests/bugs/xde/bug9490
index 98dcde01428d7d932dae7e469d64667985ca3317..d2b07ca1bf1358c3b88fc0e698458a1e38bd86bf 100755 (executable)
--- a/tests/bugs/xde/bug9490
+++ b/tests/bugs/xde/bug9490
@@ -33,7 +33,7 @@ if { ${IsOk} == 1} {
    set Tol1 [lindex [split [tolerance OCC9490a] ${aTokList}] 2]
    set Tol2 [lindex [split [tolerance OCC9490b] ${aTokList}] 2]
    set percent_max 0.1
-   set Tolerance_percent [GetPercent ${Tol1} ${Tol2}]
+   set Tolerance_percent [expr abs( ${Tol2})-abs(${Tol1})/abs(${Tol1})*100.]
    puts "Tolerance_percent = ${Tolerance_percent} %"
    if { ${Tolerance_percent}  > ${percent_max} } {
       set IsOk 0

diff --git a/tests/bugs/xde/bug9531 b/tests/bugs/xde/bug9531
index d6468d909637ed15b0caff3cab8f8e010cdc7bc3..67214b44fd50f95d4711ae4cf2d050ad4a584102 100755 (executable)
--- a/tests/bugs/xde/bug9531
+++ b/tests/bugs/xde/bug9531
@@ -35,7 +35,7 @@ if { ${IsOk} == 1} {
    set Tol1 [lindex [split [tolerance OCC9531a] ${aTokList}] 2]
    set Tol2 [lindex [split [tolerance OCC9531b] ${aTokList}] 2]
    set percent_max 0.1
-   set Tolerance_percent [GetPercent ${Tol1} ${Tol2}]
+   set Tolerance_percent [expr abs( ${Tol2})-abs(${Tol1})/abs(${Tol1})*100.]
    puts "Tolerance_percent = ${Tolerance_percent} %"
    if { ${Tolerance_percent}  > ${percent_max} } {
       set IsOk 0

diff --git a/tests/xcaf/end b/tests/xcaf/end
index 78aebe90ae11c028b176796b327d065a020276a0..4edd168e9cf67fe3cd44dba0ed4f15340a2a0515 100644 (file)
--- a/tests/xcaf/end
+++ b/tests/xcaf/end
@@ -728,7 +728,7 @@ if {[regexp "FACES" $CompareDocumentsMode]} {
     puts "================FACES==================="
     puts "Faces First: [llength $faces_list_First]"
     puts "Faces Second: [llength $faces_list_Second]"
-    if {[llength $faces_list_First] != [llength $faces_list_Second]} {
+    if {[llength $faces_list_First] > [llength $faces_list_Second]} {
        puts "Error : The number of faces is wrong"
        set ErrorCode 2
     }