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

0027179: The algorithm of sharing edges in Boolean operation should be improved

Browse Source 
1. New sharing algorithm has been implemented. If intermediate point of some edge is included in the tube with center taken in another edge and radius equaled to maximal vertex-tolerance of both edges then these two edges are considered to be shared. This know-how touches edges only, which have common blocks with interfered faces. If they do not have any common-blocks the algorithm will work as before.

2. Interface of BOPAlgo_PaveFiller::IsExistingPaveBlock(...) method has been changed.

Creation of test case for issues #27128 and #27179

Adjusting some test cases according to their new behavior, because they are IMPROVEMENTS really (TODOs have been deleted).
This commit is contained in:
nbv
2016-02-29 17:52:20 +03:00
committed by bugmaster
parent 0d42485334
commit 93e38faa3b
12 changed files with 98 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BOPAlgo/BOPAlgo_PaveFiller.hxx
View File

@@ -193,7 +193,7 @@ protected:
const Standard_Real theTolR3D, const BOPDS_IndexedMapOfPaveBlock& theMPB,
Handle(BOPDS_PaveBlock)& thePBOut, Standard_Real& theTolNew);
Standard_EXPORT Standard_Boolean IsExistingPaveBlock (const Handle(BOPDS_PaveBlock)& thePB, const BOPDS_Curve& theNC, const Standard_Real theTolR3D, const BOPCol_ListOfInteger& theLSE);
Standard_EXPORT Standard_Boolean IsExistingPaveBlock (const Handle(BOPDS_PaveBlock)& thePB, const BOPDS_Curve& theNC, const BOPCol_ListOfInteger& theLSE);
//! Treatment of section edges.

55
src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx
View File

@@ -516,7 +516,7 @@ void BOPAlgo_PaveFiller::MakeBlocks()
continue;
}
//
bExist=IsExistingPaveBlock(aPB, aNC, aTolR3D, aLSE);
bExist=IsExistingPaveBlock(aPB, aNC, aLSE);
if (bExist) {
continue;
}
@@ -1091,7 +1091,6 @@ Standard_Boolean BOPAlgo_PaveFiller::IsExistingVertex
Standard_Boolean BOPAlgo_PaveFiller::IsExistingPaveBlock
(const Handle(BOPDS_PaveBlock)& thePB,
const BOPDS_Curve& theNC,
const Standard_Real theTolR3D,
const BOPCol_ListOfInteger& theLSE)
{
Standard_Boolean bRet=Standard_True;
@@ -1101,16 +1100,24 @@ Standard_Boolean BOPAlgo_PaveFiller::IsExistingPaveBlock
}
//
Standard_Real aT1, aT2, aTm, aTx, aTol, aDist;
Standard_Integer nE, iFlag;
Standard_Integer nE, iFlag, nV1, nV2;
gp_Pnt aPm;
Bnd_Box aBoxPm;
BOPCol_ListIteratorOfListOfInteger aItLI;
//
thePB->Range(aT1, aT2);
thePB->Indices(nV1, nV2);
const TopoDS_Vertex &aV1 = TopoDS::Vertex(myDS->Shape(nV1)),
&aV2 = TopoDS::Vertex(myDS->Shape(nV2));
const Standard_Real aTolV1 = BRep_Tool::Tolerance(aV1),
aTolV2 = BRep_Tool::Tolerance(aV2);
aTol = Max(aTolV1, aTolV2);
aTm=IntTools_Tools::IntermediatePoint (aT1, aT2);
theNC.Curve().D0(aTm, aPm);
aBoxPm.Add(aPm);
aBoxPm.Enlarge(theTolR3D);
aBoxPm.Enlarge(aTol);
//
aItLI.Initialize(theLSE);
for (; aItLI.More(); aItLI.Next()) {
@@ -1121,9 +1128,8 @@ Standard_Boolean BOPAlgo_PaveFiller::IsExistingPaveBlock
const Bnd_Box& aBoxE=aSIE.Box();
if (!aBoxE.IsOut(aBoxPm)) {
const TopoDS_Edge& aE=(*(TopoDS_Edge *)(&aSIE.Shape()));
aTol = BRep_Tool::Tolerance(aE);
aTol = aTol > theTolR3D ? aTol : theTolR3D;
iFlag=myContext->ComputePE(aPm, aTol, aE, aTx, aDist);
const Standard_Real aTol1 = Max(BRep_Tool::Tolerance(aE), aTol);
iFlag=myContext->ComputePE(aPm, aTol1, aE, aTx, aDist);
if (!iFlag) {
return bRet;
}
@@ -1148,32 +1154,38 @@ Standard_Boolean BOPAlgo_PaveFiller::IsExistingPaveBlock
Standard_Real aT1, aT2, aTm, aTx;
Standard_Integer nSp, iFlag1, iFlag2, nV11, nV12, nV21, nV22, i, aNbPB;
gp_Pnt aP1, aPm, aP2;
Bnd_Box aBoxP1, aBoxPm, aBoxP2;
Bnd_Box aBoxP1, aBoxPm, aBoxP2, aBoxTmp;
//
bRet=Standard_False;
const IntTools_Curve& aIC=theNC.Curve();
//
thePB->Range(aT1, aT2);
thePB->Indices(nV11, nV12);
const Standard_Real aTolV11 = BRep_Tool::Tolerance(TopoDS::Vertex(myDS->Shape(nV11)));
const Standard_Real aTolV12 = BRep_Tool::Tolerance(TopoDS::Vertex(myDS->Shape(nV12)));
const Standard_Real aTolV1 = Max(aTolV11, aTolV12);
//first point
aIC.D0(aT1, aP1);
aBoxP1.Add(aP1);
aBoxP1.Enlarge(theTolR3D);
aBoxP1.Enlarge(aTolV11);
//intermediate point
aTm=IntTools_Tools::IntermediatePoint (aT1, aT2);
aIC.D0(aTm, aPm);
aBoxPm.Add(aPm);
aBoxPm.Enlarge(theTolR3D);
//last point
aIC.D0(aT2, aP2);
aBoxP2.Add(aP2);
aBoxP2.Enlarge(theTolR3D);
aBoxP2.Enlarge(aTolV12);
//
theTolNew = 0.;
aNbPB = theMPBOnIn.Extent();
for (i = 1; i <= aNbPB; ++i) {
const Handle(BOPDS_PaveBlock)& aPB = theMPBOnIn(i);
aPB->Indices(nV21, nV22);
const Standard_Real aTolV21 = BRep_Tool::Tolerance(TopoDS::Vertex(myDS->Shape(nV21)));
const Standard_Real aTolV22 = BRep_Tool::Tolerance(TopoDS::Vertex(myDS->Shape(nV22)));
const Standard_Real aTolV2 = Max(aTolV21, aTolV22);
nSp=aPB->Edge();
if (nSp < 0)
continue;
@@ -1187,21 +1199,28 @@ Standard_Boolean BOPAlgo_PaveFiller::IsExistingPaveBlock
(!aBoxSp.IsOut(aBoxP2) ? 1 : 0);
if (iFlag1 && iFlag2) {
Standard_Real aDist;
if (aBoxSp.IsOut(aBoxPm) || myContext->ComputePE(aPm,
theTolR3D,
aSp,
aTx, theTolNew)) {
const Standard_Real aRealTol = myDS->IsCommonBlock(aPB) ?
Max(aTolV1, aTolV2) : theTolR3D;
aBoxTmp = aBoxPm;
aBoxTmp.Enlarge(aRealTol);
if (aBoxSp.IsOut(aBoxTmp) || myContext->ComputePE(aPm,
aRealTol,
aSp,
aTx, theTolNew)) {
continue;
}
//
if (iFlag1 == 1) {
iFlag1 = !myContext->ComputePE(aP1, theTolR3D, aSp, aTx, aDist);
iFlag1 = !myContext->ComputePE(aP1, aRealTol, aSp, aTx, aDist);
if (theTolNew < aDist)
theTolNew = aDist;
}
//
if (iFlag2 == 1) {
iFlag2 = !myContext->ComputePE(aP2, theTolR3D, aSp, aTx, aDist);
iFlag2 = !myContext->ComputePE(aP2, aRealTol, aSp, aTx, aDist);
if (theTolNew < aDist)
theTolNew = aDist;
}
@@ -1811,7 +1830,7 @@ void BOPAlgo_PaveFiller::RemoveUsedVertices(BOPDS_Curve& aNC,
aTolV = BRep_Tool::Tolerance(aVToUpdate);
aP2 = BRep_Tool::Pnt(aVToUpdate);
aDist = aP1.Distance(aP2);
aTolVNew = aDist - aTolV2;
aTolVNew = Max(aDist - aTolV2, aTolR3D);
//
if (aTolVNew > aTolV) {
BRep_Builder aBB;