From 73920cd481ae95f73d2542fb0523b88f6cfefc02 Mon Sep 17 00:00:00 2001 From: jgv Date: Thu, 21 Aug 2014 12:28:08 +0400 Subject: [PATCH] 0024949: Segmentation Violation during pipe creation Test cases for issue 0024949 Correction of test case for issue CR24949 --- src/BRepFill/BRepFill_Pipe.cdl | 5 +++ src/BRepFill/BRepFill_Pipe.cxx | 13 ++++++++ src/BRepFill/BRepFill_PipeShell.cdl | 5 +++ src/BRepFill/BRepFill_PipeShell.cxx | 11 +++++++ src/BRepFill/BRepFill_Sweep.cxx | 9 ++++-- src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cdl | 5 +++ src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cxx | 19 +++++++++++- .../BRepOffsetAPI_MakePipeShell.cdl | 3 ++ .../BRepOffsetAPI_MakePipeShell.cxx | 9 ++++++ tests/bugs/modalg_5/bug24949 | 31 +++++++++++++++++++ 10 files changed, 107 insertions(+), 3 deletions(-) create mode 100644 tests/bugs/modalg_5/bug24949 diff --git a/src/BRepFill/BRepFill_Pipe.cdl b/src/BRepFill/BRepFill_Pipe.cdl index 889f8501d2..00dc651e08 100644 --- a/src/BRepFill/BRepFill_Pipe.cdl +++ b/src/BRepFill/BRepFill_Pipe.cdl @@ -72,6 +72,9 @@ is ---C++ : return const & is static; + ErrorOnSurface (me) + returns Real from Standard; + FirstShape(me) returns Shape from TopoDS ---C++ : return const & is static; @@ -185,4 +188,6 @@ fields myMode : Trihedron from GeomFill; myForceApproxC1 : Boolean from Standard; + myErrorOnSurf : Real from Standard; + end Pipe; diff --git a/src/BRepFill/BRepFill_Pipe.cxx b/src/BRepFill/BRepFill_Pipe.cxx index 046279dc77..04a2ec68de 100644 --- a/src/BRepFill/BRepFill_Pipe.cxx +++ b/src/BRepFill/BRepFill_Pipe.cxx @@ -363,6 +363,16 @@ const TopoDS_Shape& BRepFill_Pipe::Shape() const return myShape; } +//======================================================================= +//function : ErrorOnSurface +//purpose : +//======================================================================= + +Standard_Real BRepFill_Pipe::ErrorOnSurface() const +{ + return myErrorOnSurf; +} + //======================================================================= //function : FirstShape @@ -521,6 +531,7 @@ TopoDS_Wire BRepFill_Pipe::PipeLine(const gp_Pnt& Point) MkSw.Build( myReversedEdges, myTapes, myRails, BRepFill_Modified, myContinuity, GeomFill_Location, myDegmax, mySegmax ); TopoDS_Shape aLocalShape = MkSw.Shape(); + myErrorOnSurf = MkSw.ErrorOnSurface(); return TopoDS::Wire(aLocalShape); // return TopoDS::Wire(MkSw.Shape()); } @@ -648,6 +659,7 @@ TopoDS_Shape BRepFill_Pipe::MakeShape(const TopoDS_Shape& S, MkSw.Build( myReversedEdges, myTapes, myRails, BRepFill_Modified, myContinuity, GeomFill_Location, myDegmax, mySegmax ); result = MkSw.Shape(); + myErrorOnSurf = MkSw.ErrorOnSurface(); Handle(TopTools_HArray2OfShape) aSections = MkSw.Sections(); @@ -669,6 +681,7 @@ TopoDS_Shape BRepFill_Pipe::MakeShape(const TopoDS_Shape& S, MkSw.Build( myReversedEdges, myTapes, myRails, BRepFill_Modified, myContinuity, GeomFill_Location, myDegmax, mySegmax ); result = MkSw.Shape(); + myErrorOnSurf = MkSw.ErrorOnSurface(); //Correct and ReverseModifiedEdges(myFirst, myReversedEdges); ReverseModifiedEdges(myLast, myReversedEdges); diff --git a/src/BRepFill/BRepFill_PipeShell.cdl b/src/BRepFill/BRepFill_PipeShell.cdl index f75a5e6ce2..b3ca4350a8 100644 --- a/src/BRepFill/BRepFill_PipeShell.cdl +++ b/src/BRepFill/BRepFill_PipeShell.cdl @@ -256,6 +256,9 @@ is returns Shape from TopoDS is static; + ErrorOnSurface (me) + returns Real from Standard; + FirstShape (me) ---Purpose: Returns the TopoDS Shape of the bottom of the sweep. ---C++: return const & @@ -316,6 +319,8 @@ fields myTrihedron : Trihedron from GeomFill; myTransition : TransitionStyle from BRepFill; myStatus : PipeError from GeomFill; + myErrorOnSurf : Real from Standard; + end PipeShell; diff --git a/src/BRepFill/BRepFill_PipeShell.cxx b/src/BRepFill/BRepFill_PipeShell.cxx index 48880fb148..e08bb5aaa9 100644 --- a/src/BRepFill/BRepFill_PipeShell.cxx +++ b/src/BRepFill/BRepFill_PipeShell.cxx @@ -773,6 +773,7 @@ void BRepFill_PipeShell::SetForceApproxC1(const Standard_Boolean ForceApproxC1) if (Ok) { myShape = MkSw.Shape(); + myErrorOnSurf = MkSw.ErrorOnSurface(); TopoDS_Shape aBottomWire = myFirst; TopoDS_Shape aTopWire = myLast; @@ -879,6 +880,16 @@ const TopoDS_Shape& BRepFill_PipeShell::Shape() const return myShape; } +//======================================================================= +//function : ErrorOnSurface +//purpose : +//======================================================================= + +Standard_Real BRepFill_PipeShell::ErrorOnSurface() const +{ + return myErrorOnSurf; +} + //======================================================================= //function : FirstShape //purpose : Return the start section diff --git a/src/BRepFill/BRepFill_Sweep.cxx b/src/BRepFill/BRepFill_Sweep.cxx index bdd7080fa6..93e3d951dc 100644 --- a/src/BRepFill/BRepFill_Sweep.cxx +++ b/src/BRepFill/BRepFill_Sweep.cxx @@ -2456,8 +2456,13 @@ BRepFill_Sweep::BRepFill_Sweep(const Handle(BRepFill_SectionLaw)& Section, Vertex(1,ipath+1), myTol3d); } - else UpdateEdge(TopoDS::Edge(UEdge(isec, ipath)), - S, !exuv, UFirst); + else + { + if (UEdge(isec, ipath).IsNull()) //sweep failed + return Standard_False; + UpdateEdge(TopoDS::Edge(UEdge(isec, ipath)), + S, !exuv, UFirst); + } if (uclose && (isec==NbLaw)) { UpdateEdge(TopoDS::Edge(UEdge(1, ipath)), diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cdl b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cdl index cd76bce52e..00fea56f6a 100644 --- a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cdl +++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cdl @@ -90,6 +90,11 @@ is returns Shape from TopoDS; + ErrorOnSurface (me) + ---Level: Public + returns Real from Standard; + + fields myPipe : Pipe from BRepFill; diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cxx index c34ce44fbe..dc5ed78dcc 100644 --- a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cxx +++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipe.cxx @@ -22,6 +22,8 @@ #include #include #include +#include +#include //======================================================================= //function : BRepOffsetAPI_MakePipe @@ -76,7 +78,13 @@ const BRepFill_Pipe& BRepOffsetAPI_MakePipe::Pipe() const void BRepOffsetAPI_MakePipe::Build() { myShape = myPipe.Shape(); - Done(); + //Check for emptiness of result + TopTools_IndexedMapOfShape theMap; + TopExp::MapShapes(myShape, theMap); + if (theMap.Extent() == 1) + NotDone(); + else + Done(); } @@ -122,3 +130,12 @@ TopoDS_Shape BRepOffsetAPI_MakePipe::Generated (const TopoDS_Shape& SSpine, return bid; } +//======================================================================= +//function : ErrorOnSurface +//purpose : +//======================================================================= + +Standard_Real BRepOffsetAPI_MakePipe::ErrorOnSurface() const +{ + return myPipe.ErrorOnSurface(); +} diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cdl b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cdl index 738fdfdafa..73b20ed900 100644 --- a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cdl +++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cdl @@ -349,6 +349,9 @@ is returns ListOfShape from TopTools is redefined; + ErrorOnSurface (me) + returns Real from Standard; + fields myPipe : PipeShell from BRepFill; diff --git a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx index 7ca936527f..510797e3f7 100644 --- a/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx +++ b/src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx @@ -305,3 +305,12 @@ BRepOffsetAPI_MakePipeShell::Generated(const TopoDS_Shape& S) return myGenerated; } +//======================================================================= +//function : ErrorOnSurface +//purpose : +//======================================================================= + +Standard_Real BRepOffsetAPI_MakePipeShell::ErrorOnSurface() const +{ + return myPipe->ErrorOnSurface(); +} diff --git a/tests/bugs/modalg_5/bug24949 b/tests/bugs/modalg_5/bug24949 new file mode 100644 index 0000000000..da907a0d12 --- /dev/null +++ b/tests/bugs/modalg_5/bug24949 @@ -0,0 +1,31 @@ +puts "============" +puts "OCC24949" +puts "============" +puts "" +####################################################################### +# Segmentation Violation during pipe creation +####################################################################### + +restore [locate_data_file bug24949_Comp.brep] c +explode c +mksweep c_1 +addsweep c_2 +catch {buildsweep res} + +restore [locate_data_file bug24949_Comp.brep] c +explode c +pipe result c_1 c_2 2 + +set square 188.689 + +set nb_v_good 14 +set nb_e_good 19 +set nb_w_good 6 +set nb_f_good 6 +set nb_sh_good 1 +set nb_sol_good 0 +set nb_compsol_good 0 +set nb_compound_good 0 +set nb_shape_good 46 + +set 2dviewer 1