From 447d29ae53a79f7f67ee9d213dff84f35fde41f3 Mon Sep 17 00:00:00 2001 From: ibs Date: Tue, 22 Apr 2014 15:40:43 +0400 Subject: [PATCH] 0024865: igesread loopback transfer process should not skip any entity natural bounds are added to faces with infinite UV bounds and without outer wire unrelated changes: the output of de test cases now has the list of main test steps. --- src/ShapeFix/ShapeFix_Face.cxx | 13 +------------ tests/de/end | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/src/ShapeFix/ShapeFix_Face.cxx b/src/ShapeFix/ShapeFix_Face.cxx index b3bf90e00c..1fcbed3d85 100644 --- a/src/ShapeFix/ShapeFix_Face.cxx +++ b/src/ShapeFix/ShapeFix_Face.cxx @@ -108,17 +108,6 @@ #define DEBUG #endif -static Standard_Boolean IsSurfaceUVInfinite(const Handle(Geom_Surface)& theSurf) -{ - Standard_Real UMin,UMax,VMin,VMax; - theSurf->Bounds(UMin,UMax,VMin,VMax); - - return (Precision::IsInfinite(UMin) || - Precision::IsInfinite(UMax) || - Precision::IsInfinite(VMin) || - Precision::IsInfinite(VMax) ); -} - static Standard_Boolean IsSurfaceUVPeriodic(const Handle(Geom_Surface)& theSurf) { return theSurf->IsUPeriodic() && theSurf->IsVPeriodic(); @@ -823,7 +812,7 @@ Standard_Boolean ShapeFix_Face::FixAddNaturalBound() } // deal with the case of an empty face: just create a new face by a standard tool - if (ws.IsEmpty() && !IsSurfaceUVInfinite (mySurf->Surface())) + if (ws.IsEmpty()) { BRepBuilderAPI_MakeFace aFaceBuilder (mySurf->Surface(), Precision::Confusion()); diff --git a/tests/de/end b/tests/de/end index b19b2703c6..6f7698d589 100644 --- a/tests/de/end +++ b/tests/de/end @@ -6,6 +6,14 @@ # - check transfer status, shape, and attributes against expected values # - write data to +puts "

    +Test steps:\n +
  1. Read file +
  2. Write file +
  3. Loopback read file +
  4. Results +

" + # Set flag dump_file to 1 in order to regenerate script files with actual data # used as reference. In this mode all tests intentionaly report failure. set dump_file 0 @@ -47,6 +55,7 @@ set end_line "\" \n" ################################################################## # Read original file +puts "

1. Read file UP

" if { [string length $filename] > 1} { set ext [file extension $filename] set ReadCommand ReadStep @@ -73,9 +82,8 @@ if { [string length $filename] > 1} { } # Get information about translation -if { $mist < 1} { +if { $mist < 1} { puts "" - set tps_2 [data c] if { [llength $tps_2] > 0 } { # Finding all strings with warnings @@ -100,7 +108,6 @@ if { $mist < 1} { puts " DATA c checking was NOT provided" } - puts "" set tps_1 [tpstat c] set colvo [llength $tps_1] if { ${colvo} > 0 } { @@ -130,7 +137,7 @@ if { $mist < 1} { # Get DECAF information about (color, layers and properties) puts "" - set xst [ XStat D_First ] + set xst [ XStat D_First ] if { [llength $xst] > 0 } { regexp {level +N +0 +: +([-0-9.+eE]+)} $xst full nblev0_First @@ -221,8 +228,7 @@ if { $mist < 1} { } # Writing file if { $mist < 1} { - puts " " - puts "-----------------------------WRITING FILE ------------------------------" + puts "

2. Write file UP

" file delete $imagedir/${casename}_D_First$ext if { [catch { $WriteCommand D_First $imagedir/${casename}_D_First$ext } catch_result] } { set err_msg "Error: First - file was not written - exception" @@ -231,7 +237,7 @@ if { $mist < 1} { set mist_w 1 } if { $mist_w < 1 } { - + puts "

3. Loopback read file UP

" if { [catch { $ReadCommand D_Second $imagedir/${casename}_D_First$ext } catch_result] } { set err_msg "Errorr: Second - file was not read - exception" puts $err_msg @@ -403,7 +409,6 @@ if { $mist < 1} { } #Collect results of loop back test - if { $mist < 1 } { set dat_check "DATA : OK" set tpst_check "TPSTAT : OK" @@ -491,10 +496,9 @@ if { $mist != 1 } { [lsort $layers_Second] [lsort $layers_First] ] } -puts "" +puts "

4. Results UP

" puts "" puts "########################### RESULTS ###############################" -puts "" puts "========================== Loop Back test =========================" puts "" if {$mist == 1 } {