1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00

0022924: We need more stable work of ShapeAnalysis_FreeBounds::ConnectEdgesToWires()

This commit is contained in:
GKA
2012-02-17 12:13:40 +00:00
committed by bugmaster
parent 8b5567c78f
commit 974c25edb4
3 changed files with 109 additions and 13 deletions

View File

@@ -14,6 +14,7 @@
#include <gp_Pnt.hxx>
#include <TColStd_ListIteratorOfListOfInteger.hxx>
#include <BRep_Tool.hxx>
#include <Precision.hxx>
//=======================================================================
//function : Reject
@@ -43,7 +44,11 @@ Standard_Boolean ShapeAnalysis_BoxBndTreeSelector::
Standard_Boolean IsAccept = Standard_False;
if (myList.Contains(theObj))
return Standard_False;
enum
{
First = 1,
Last = 2
};
TopoDS_Wire W = TopoDS::Wire (mySeq->Value (theObj));
TopoDS_Vertex V1,V2;
@@ -52,21 +57,25 @@ Standard_Boolean ShapeAnalysis_BoxBndTreeSelector::
if (myLVertex.IsSame(V1)){
myStatus = ShapeExtend::EncodeStatus (ShapeExtend_DONE1);
IsAccept = Standard_True;
myArrIndices(Last) = theObj;
}
else {
if (myLVertex.IsSame(V2)){
myStatus = ShapeExtend::EncodeStatus (ShapeExtend_DONE2);
IsAccept = Standard_True;
myArrIndices(Last) = theObj;
}
else {
if (myFVertex.IsSame(V2)){
myStatus = ShapeExtend::EncodeStatus (ShapeExtend_DONE3);
IsAccept = Standard_True;
myArrIndices(First) = theObj;
}
else {
if (myFVertex.IsSame(V1)){
myStatus = ShapeExtend::EncodeStatus (ShapeExtend_DONE4);
IsAccept = Standard_True;
myArrIndices(First) = theObj;
}
else myStatus = ShapeExtend::EncodeStatus (ShapeExtend_FAIL2);
@@ -77,7 +86,8 @@ Standard_Boolean ShapeAnalysis_BoxBndTreeSelector::
if (IsAccept){
SetNb(theObj);
myStop = Standard_True;
if(myArrIndices(Last))
myStop = Standard_True;
return Standard_True;
}
else myStop = Standard_False;
@@ -102,32 +112,39 @@ Standard_Boolean ShapeAnalysis_BoxBndTreeSelector::
if (min3d > myMin3d)
return Standard_False;
Standard_Integer minInd = (dm1 > dm2 ? First : Last );
Standard_Integer maxInd = (dm1 > dm2 ? Last : First);
myArrIndices(minInd) = theObj;
if((min3d - myMin3d) > RealSmall())
myArrIndices(maxInd) = 0;
myMin3d = min3d;
if (min3d > myTol)
{
myStatus = ShapeExtend::EncodeStatus (ShapeExtend_FAIL2);
return Standard_False;
}
SetNb(theObj);
if (min3d == 0)
Standard_Integer anObj = (myArrIndices(Last) ? myArrIndices(Last) : myArrIndices(First));
SetNb(anObj);
if (min3d == 0 && minInd == Last)
myStop = Standard_True;
if (dm1 > dm2)
{
dm1 = dm2;
result = res2 + 2;
}
switch (result) {
if(anObj == theObj)
{
switch (result) {
case 0: myStatus = ShapeExtend::EncodeStatus (ShapeExtend_DONE1); break;
case 1: myStatus = ShapeExtend::EncodeStatus (ShapeExtend_DONE2); break;
case 2: myStatus = ShapeExtend::EncodeStatus (ShapeExtend_DONE3); break;
case 3: myStatus = ShapeExtend::EncodeStatus (ShapeExtend_DONE4); break;
}
}
return Standard_True;
}

View File

@@ -16,6 +16,7 @@
#include <ShapeExtend_Status.hxx>
#include <TopoDS_Vertex.hxx>
#include <TColStd_MapOfInteger.hxx>
#include <TColStd_Array1OfInteger.hxx>
typedef NCollection_UBTree <Standard_Integer , Bnd_Box> ShapeAnalysis_BoxBndTree;
@@ -26,12 +27,18 @@ class ShapeAnalysis_BoxBndTreeSelector
ShapeAnalysis_BoxBndTreeSelector
(Handle (TopTools_HArray1OfShape) theSeq,
Standard_Boolean theShared)
: mySeq(theSeq), myShared(theShared), myNb(0), myTol(1e-7), myMin3d(1e-7),
myStatus(ShapeExtend::EncodeStatus (ShapeExtend_OK)){}
: mySeq(theSeq), myShared(theShared), myNb(0), myTol(1e-7), myMin3d(1e-7),myArrIndices(1,2),
myStatus(ShapeExtend::EncodeStatus (ShapeExtend_OK))
{
myArrIndices.Init(0);
}
void DefineBoxes (const Bnd_Box& theFBox, const Bnd_Box& theLBox)
{ myFBox = theFBox;
myLBox = theLBox; }
myLBox = theLBox;
myArrIndices.Init(0);
}
void DefineVertexes (TopoDS_Vertex theVf, TopoDS_Vertex theVl)
{ myFVertex = theVf;
@@ -87,6 +94,7 @@ class ShapeAnalysis_BoxBndTreeSelector
TColStd_MapOfInteger myList;
Standard_Real myTol;
Standard_Real myMin3d;
TColStd_Array1OfInteger myArrIndices;
};
#endif