OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-29 14:00:49 +03:00
Code Activity

0024422: Wrong result done by FaceClassifier algorithm

Browse Source 
Control of out of boundaries by finding circle-point extrema.
This commit is contained in:
nbv
2013-12-04 15:07:25 +04:00
committed by abv
parent 6bf1bdbd22
commit 73cd8a8afd
5 changed files with 690 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
src/BRepOffsetAPI/BRepOffsetAPI_MakeOffset.cxx
View File

@@ -60,7 +60,7 @@ BRepOffsetAPI_MakeOffset::BRepOffsetAPI_MakeOffset()
//=======================================================================
BRepOffsetAPI_MakeOffset::BRepOffsetAPI_MakeOffset(const TopoDS_Face& Spine,
const GeomAbs_JoinType Join)
const GeomAbs_JoinType Join)
{
Init(Spine, Join);
}
@@ -72,7 +72,7 @@ BRepOffsetAPI_MakeOffset::BRepOffsetAPI_MakeOffset(const TopoDS_Face& Spine,
//=======================================================================
void BRepOffsetAPI_MakeOffset::Init(const TopoDS_Face& Spine,
const GeomAbs_JoinType Join)
const GeomAbs_JoinType Join)
{
myFace = Spine;
myIsInitialized = Standard_True;
@@ -89,7 +89,7 @@ void BRepOffsetAPI_MakeOffset::Init(const TopoDS_Face& Spine,
//=======================================================================
BRepOffsetAPI_MakeOffset::BRepOffsetAPI_MakeOffset(const TopoDS_Wire& Spine,
const GeomAbs_JoinType Join)
const GeomAbs_JoinType Join)
{
myWires.Append(Spine);
myIsInitialized = Standard_True;
@@ -105,14 +105,14 @@ void BRepOffsetAPI_MakeOffset::Init(const GeomAbs_JoinType Join)
{
myJoin = Join;
}
//=======================================================================
//function : BRepOffsetAPI_MakeOffset
//purpose :
//=======================================================================
void BRepOffsetAPI_MakeOffset::AddWire(const TopoDS_Wire& Spine)
{
myIsInitialized = Standard_True;
myWires.Append(Spine);
@@ -124,10 +124,10 @@ void BRepOffsetAPI_MakeOffset::AddWire(const TopoDS_Wire& Spine)
//=======================================================================
static void BuildDomains(TopoDS_Face& myFace,
TopTools_ListOfShape& WorkWires,
BRepFill_ListOfOffsetWire& myAlgos,
GeomAbs_JoinType myJoin,
Standard_Boolean isPositive)
TopTools_ListOfShape& WorkWires,
BRepFill_ListOfOffsetWire& myAlgos,
GeomAbs_JoinType myJoin,
Standard_Boolean isPositive)
{
BRepAlgo_FaceRestrictor FR;
TopoDS_Vertex VF,VL;
@@ -146,14 +146,14 @@ static void BuildDomains(TopoDS_Face& myFace,
if (anExp.More()) {
aWire2 = anExp.Current();
if ((aWire1.Orientation() == aWire2.Orientation() && isPositive) ||
(aWire1.Orientation() == TopAbs::Complement(aWire2.Orientation()) && !isPositive)) {
TopTools_ListOfShape LWires;
TopTools_ListIteratorOfListOfShape itl;
for (itl.Initialize(WorkWires); itl.More(); itl.Next()) {
const TopoDS_Shape& W = itl.Value();
LWires.Append(W.Reversed());
}
WorkWires = LWires;
(aWire1.Orientation() == TopAbs::Complement(aWire2.Orientation()) && !isPositive)) {
TopTools_ListOfShape LWires;
TopTools_ListIteratorOfListOfShape itl;
for (itl.Initialize(WorkWires); itl.More(); itl.Next()) {
const TopoDS_Shape& W = itl.Value();
LWires.Append(W.Reversed());
}
WorkWires = LWires;
}
}
// Modified by Sergey KHROMOV - Thu Apr 26 16:04:44 2001 End
@@ -200,7 +200,7 @@ static void BuildDomains(TopoDS_Face& myFace,
myAlgos.Append(Algo);
return;
}
//====================================================
// Classification of open wires.
//====================================================
@@ -227,21 +227,21 @@ static void BuildDomains(TopoDS_Face& myFace,
Standard_Real Dist2Min = Precision::Infinite();
Standard_Real Found = Standard_False;
for (Standard_Integer ie = 1; ie <= ExtPS.NbExt(); ie++) {
Standard_Real X,Y;
if (ExtPS.SquareDistance(ie) < Dist2Min) {
Dist2Min = ExtPS.SquareDistance(ie);
Found = Standard_True;
ExtPS.Point(ie).Parameter(X,Y);
PV.SetCoord(X,Y);
}
Standard_Real X,Y;
if (ExtPS.SquareDistance(ie) < Dist2Min) {
Dist2Min = ExtPS.SquareDistance(ie);
Found = Standard_True;
ExtPS.Point(ie).Parameter(X,Y);
PV.SetCoord(X,Y);
}
}
if ( Found && (CL.Perform(PV) == TopAbs_IN)) {
// The face that contains a wire is found and it is removed from the list
B.Add(F,W);
LOW.Remove(itW);
// The face that contains a wire is found and it is removed from the list
B.Add(F,W);
LOW.Remove(itW);
}
else {
itW.Next();
itW.Next();
}
}
}
@@ -260,68 +260,68 @@ static void BuildDomains(TopoDS_Face& myFace,
//=======================================================================
void BRepOffsetAPI_MakeOffset::Perform( const Standard_Real Offset,
const Standard_Real Alt)
{
const Standard_Real Alt)
{
StdFail_NotDone_Raise_if ( !myIsInitialized,
"BRepOffsetAPI_MakeOffset : Perform without Init");
"BRepOffsetAPI_MakeOffset : Perform without Init");
try
{
{
Standard_Integer i = 1;
BRepFill_ListIteratorOfListOfOffsetWire itOW;
TopoDS_Compound Res;
BRep_Builder B;
B.MakeCompound (Res);
myLastIsLeft = (Offset <= 0);
if( Offset <= 0. )
{
{
if( myLeft.IsEmpty() )
{
{
// Modified by Sergey KHROMOV - Fri Apr 27 14:35:26 2001 Begin
BuildDomains(myFace,myWires,myLeft,myJoin, Standard_False);
// Modified by Sergey KHROMOV - Fri Apr 27 14:35:26 2001 End
}
}
for (itOW.Initialize(myLeft); itOW.More(); itOW.Next())
{
{
BRepFill_OffsetWire& Algo = itOW.Value();
Algo.Perform(Abs(Offset),Alt);
if (Algo.IsDone() && !Algo.Shape().IsNull())
{
{
B.Add(Res,Algo.Shape());
if (i == 1)
myShape = Algo.Shape();
i++;
}
}
}
}
else
{
{
if (myRight.IsEmpty())
{
{
// Modified by Sergey KHROMOV - Fri Apr 27 14:35:28 2001 Begin
BuildDomains(myFace,myWires,myRight,myJoin, Standard_True);
// Modified by Sergey KHROMOV - Fri Apr 27 14:35:35 2001 End
}
}
for(itOW.Initialize(myRight); itOW.More(); itOW.Next())
{
{
BRepFill_OffsetWire& Algo = itOW.Value();
Algo.Perform(Offset,Alt);
if (Algo.IsDone() && !Algo.Shape().IsNull())
{
{
B.Add(Res,Algo.Shape());
if (i == 1)
myShape = Algo.Shape();
i++;
}
}
}
}
if( i > 2 )
myShape = Res;
@@ -330,16 +330,16 @@ void BRepOffsetAPI_MakeOffset::Perform( const Standard_Real Offset,
NotDone();
else
Done();
}
}
catch(...) //Every exception was caught.
{
{
cout<<"An exception was caught in BRepOffsetAPI_MakeOffset::Perform : ";
Standard_ConstructionError::Caught()->Print(cout);
cout<<endl;
NotDone();
myShape.Nullify();
}
}
}
//=======================================================================
//function : Build
@@ -358,7 +358,7 @@ void BRepOffsetAPI_MakeOffset::Build()
//=======================================================================
const TopTools_ListOfShape& BRepOffsetAPI_MakeOffset::Generated
(const TopoDS_Shape& S)
(const TopoDS_Shape& S)
{
myGenerated.Clear();
BRepFill_ListIteratorOfListOfOffsetWire itOW;