OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-10 18:51:21 +03:00
Code

0024154: Wrong result of CUT operation

Browse Source 
Rebuild normal for the face if the method FindPointInFace fails (unable to find point in the face in bi-normal direction).
Adding test case for issue CR24154
This commit is contained in:
emv 2013-09-19 16:41:32 +04:00 committed by bugmaster
parent c7a422d893
commit bb58e462ad
2 changed files with 162 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

263
src/BOPTools/BOPTools_AlgoTools.cxx
View File

@ -39,7 +39,6 @@
#include <Geom_Curve.hxx> #include <Geom_Curve.hxx>
#include <GeomAPI_ProjectPointOnSurf.hxx> #include <GeomAPI_ProjectPointOnSurf.hxx>
#include <Geom2dInt_Geom2dCurveTool.hxx> #include <Geom2dInt_Geom2dCurveTool.hxx>
#include <GeomAdaptor_Surface.hxx>
// //
#include <TopAbs_Orientation.hxx> #include <TopAbs_Orientation.hxx>
// //
@ -53,6 +52,7 @@
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <BRepLib.hxx> #include <BRepLib.hxx>
#include <BRepAdaptor_Curve2d.hxx> #include <BRepAdaptor_Curve2d.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <BRepClass3d_SolidClassifier.hxx> #include <BRepClass3d_SolidClassifier.hxx>
#include <TopExp.hxx> #include <TopExp.hxx>
#include <TopExp_Explorer.hxx> #include <TopExp_Explorer.hxx>
@ -87,7 +87,7 @@ static
TopAbs_Orientation Orientation(const TopoDS_Edge& anE, TopAbs_Orientation Orientation(const TopoDS_Edge& anE,
const TopoDS_Face& aF); const TopoDS_Face& aF);
static static
void GetFaceDir(const TopoDS_Edge& aE, void GetFaceDir(const TopoDS_Edge& aE,
const TopoDS_Face& aF, const TopoDS_Face& aF,
const gp_Pnt& aP, const gp_Pnt& aP,
@ -95,25 +95,25 @@ static
const gp_Dir& aDTgt, const gp_Dir& aDTgt,
gp_Dir& aDN, gp_Dir& aDN,
gp_Dir& aDB, gp_Dir& aDB,
Handle(BOPInt_Context)& theContext); Handle(BOPInt_Context)& theContext,
static GeomAPI_ProjectPointOnSurf& aProjPL);
static
Standard_Boolean FindPointInFace(const TopoDS_Edge& aE, Standard_Boolean FindPointInFace(const TopoDS_Edge& aE,
const TopoDS_Face& aF, const TopoDS_Face& aF,
const gp_Pnt& aP, const gp_Pnt& aP,
const Standard_Real aT,
gp_Dir& aDB, gp_Dir& aDB,
gp_Pnt& aPOut, gp_Pnt& aPOut,
Handle(BOPInt_Context)& theContext, Handle(BOPInt_Context)& theContext,
const GeomAdaptor_Surface& aGAS); GeomAPI_ProjectPointOnSurf& aProjPL);
//======================================================================= //=======================================================================
// function: MakeConnexityBlocks // function: MakeConnexityBlocks
// purpose: // purpose:
//======================================================================= //=======================================================================
void BOPTools_AlgoTools::MakeConnexityBlocks (const TopoDS_Shape& theS, void BOPTools_AlgoTools::MakeConnexityBlocks (const TopoDS_Shape& theS,
const TopAbs_ShapeEnum theType1, const TopAbs_ShapeEnum theType1,
const TopAbs_ShapeEnum theType2, const TopAbs_ShapeEnum theType2,
BOPCol_ListOfShape& theLCB) BOPCol_ListOfShape& theLCB)
{ {
Standard_Integer aNbF, aNbAdd, aNbAdd1, i; Standard_Integer aNbF, aNbAdd, aNbAdd1, i;
BRep_Builder aBB; BRep_Builder aBB;
@ -325,7 +325,7 @@ void BOPTools_AlgoTools::OrientFacesOnShell (TopoDS_Shape& aShell)
//purpose : //purpose :
//======================================================================= //=======================================================================
TopAbs_Orientation Orientation(const TopoDS_Edge& anE, TopAbs_Orientation Orientation(const TopoDS_Edge& anE,
const TopoDS_Face& aF) const TopoDS_Face& aF)
{ {
TopAbs_Orientation anOr=TopAbs_INTERNAL; TopAbs_Orientation anOr=TopAbs_INTERNAL;
@ -349,9 +349,9 @@ TopAbs_Orientation Orientation(const TopoDS_Edge& anE,
// purpose: // purpose:
//======================================================================= //=======================================================================
void BOPTools_AlgoTools::MakeConnexityBlock (BOPCol_ListOfShape& theLFIn, void BOPTools_AlgoTools::MakeConnexityBlock (BOPCol_ListOfShape& theLFIn,
BOPCol_IndexedMapOfShape& theMEAvoid, BOPCol_IndexedMapOfShape& theMEAvoid,
BOPCol_ListOfShape& theLCB, BOPCol_ListOfShape& theLCB,
const Handle(NCollection_BaseAllocator)& theAllocator) const Handle(NCollection_BaseAllocator)& theAllocator)
{ {
Standard_Integer aNbF, aNbAdd1, aNbAdd, i; Standard_Integer aNbF, aNbAdd1, aNbAdd, i;
TopExp_Explorer aExp; TopExp_Explorer aExp;
@ -429,9 +429,9 @@ void BOPTools_AlgoTools::MakeConnexityBlock (BOPCol_ListOfShape& theLFIn,
// purpose: // purpose:
//======================================================================= //=======================================================================
TopAbs_State BOPTools_AlgoTools::ComputeStateByOnePoint(const TopoDS_Shape& theS, TopAbs_State BOPTools_AlgoTools::ComputeStateByOnePoint(const TopoDS_Shape& theS,
const TopoDS_Solid& theRef, const TopoDS_Solid& theRef,
const Standard_Real theTol, const Standard_Real theTol,
Handle(BOPInt_Context)& theContext) Handle(BOPInt_Context)& theContext)
{ {
TopAbs_State aState; TopAbs_State aState;
TopAbs_ShapeEnum aType; TopAbs_ShapeEnum aType;
@ -454,10 +454,10 @@ TopAbs_State BOPTools_AlgoTools::ComputeStateByOnePoint(const TopoDS_Shape& theS
// purpose: // purpose:
//======================================================================= //=======================================================================
TopAbs_State BOPTools_AlgoTools::ComputeState(const TopoDS_Face& theF, TopAbs_State BOPTools_AlgoTools::ComputeState(const TopoDS_Face& theF,
const TopoDS_Solid& theRef, const TopoDS_Solid& theRef,
const Standard_Real theTol, const Standard_Real theTol,
BOPCol_IndexedMapOfShape& theBounds, BOPCol_IndexedMapOfShape& theBounds,
Handle(BOPInt_Context)& theContext) Handle(BOPInt_Context)& theContext)
{ {
TopAbs_State aState; TopAbs_State aState;
TopExp_Explorer aExp; TopExp_Explorer aExp;
@ -495,10 +495,10 @@ TopAbs_State BOPTools_AlgoTools::ComputeState(const TopoDS_Face& theF,
// function: ComputeState // function: ComputeState
// purpose: // purpose:
//======================================================================= //=======================================================================
TopAbs_State BOPTools_AlgoTools::ComputeState(const TopoDS_Vertex& theV, TopAbs_State BOPTools_AlgoTools::ComputeState(const TopoDS_Vertex& theV,
const TopoDS_Solid& theRef, const TopoDS_Solid& theRef,
const Standard_Real theTol, const Standard_Real theTol,
Handle(BOPInt_Context)& theContext) Handle(BOPInt_Context)& theContext)
{ {
TopAbs_State aState; TopAbs_State aState;
gp_Pnt aP3D; gp_Pnt aP3D;
@ -511,10 +511,10 @@ TopAbs_State BOPTools_AlgoTools::ComputeState(const TopoDS_Face& theF,
// function: ComputeState // function: ComputeState
// purpose: // purpose:
//======================================================================= //=======================================================================
TopAbs_State BOPTools_AlgoTools::ComputeState(const TopoDS_Edge& theE, TopAbs_State BOPTools_AlgoTools::ComputeState(const TopoDS_Edge& theE,
const TopoDS_Solid& theRef, const TopoDS_Solid& theRef,
const Standard_Real theTol, const Standard_Real theTol,
Handle(BOPInt_Context)& theContext) Handle(BOPInt_Context)& theContext)
{ {
Standard_Real aT1, aT2, aT = 0.; Standard_Real aT1, aT2, aT = 0.;
TopAbs_State aState; TopAbs_State aState;
@ -561,10 +561,10 @@ TopAbs_State BOPTools_AlgoTools::ComputeState(const TopoDS_Face& theF,
// function: ComputeState // function: ComputeState
// purpose: // purpose:
//======================================================================= //=======================================================================
TopAbs_State BOPTools_AlgoTools::ComputeState(const gp_Pnt& theP, TopAbs_State BOPTools_AlgoTools::ComputeState(const gp_Pnt& theP,
const TopoDS_Solid& theRef, const TopoDS_Solid& theRef,
const Standard_Real theTol, const Standard_Real theTol,
Handle(BOPInt_Context)& theContext) Handle(BOPInt_Context)& theContext)
{ {
TopAbs_State aState; TopAbs_State aState;
// //
@ -635,8 +635,8 @@ Standard_Integer BOPTools_AlgoTools::IsInternalFace
const TopoDS_Face& aF1=(*(TopoDS_Face*)(&aLF.First())); const TopoDS_Face& aF1=(*(TopoDS_Face*)(&aLF.First()));
BOPTools_AlgoTools::GetEdgeOnFace(aE, aF1, aE1); BOPTools_AlgoTools::GetEdgeOnFace(aE, aF1, aE1);
if (aE1.Orientation()!=TopAbs_INTERNAL) { if (aE1.Orientation()!=TopAbs_INTERNAL) {
iRet=2; iRet=2;
break; break;
} }
// //
iRet=BOPTools_AlgoTools::IsInternalFace(theFace, aE, aF1, aF1, theContext); iRet=BOPTools_AlgoTools::IsInternalFace(theFace, aE, aF1, aF1, theContext);
@ -650,7 +650,7 @@ Standard_Integer BOPTools_AlgoTools::IsInternalFace
if (aF2.IsSame(aF1) && BRep_Tool::IsClosed(aE, aF1)) { if (aF2.IsSame(aF1) && BRep_Tool::IsClosed(aE, aF1)) {
// treat as it was for 1 face // treat as it was for 1 face
iRet=BOPTools_AlgoTools::IsInternalFace(theFace, aE, aF1, aF2, theContext); iRet=BOPTools_AlgoTools::IsInternalFace(theFace, aE, aF1, aF2, theContext);
break; break;
} }
} }
// //
@ -692,9 +692,9 @@ Standard_Integer BOPTools_AlgoTools::IsInternalFace
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Integer BOPTools_AlgoTools::IsInternalFace(const TopoDS_Face& theFace, Standard_Integer BOPTools_AlgoTools::IsInternalFace(const TopoDS_Face& theFace,
const TopoDS_Edge& theEdge, const TopoDS_Edge& theEdge,
BOPCol_ListOfShape& theLF, BOPCol_ListOfShape& theLF,
Handle(BOPInt_Context)& theContext) Handle(BOPInt_Context)& theContext)
{ {
Standard_Integer aNbF, iRet; Standard_Integer aNbF, iRet;
// //
@ -795,12 +795,15 @@ Standard_Boolean BOPTools_AlgoTools::GetFaceOff
{ {
Standard_Boolean bRet; Standard_Boolean bRet;
Standard_Real aT, aT1, aT2, aAngle, aTwoPI, aAngleMin; Standard_Real aT, aT1, aT2, aAngle, aTwoPI, aAngleMin;
Standard_Real aUmin, aUsup, aVmin, aVsup;
gp_Pnt aPn1, aPn2, aPx; gp_Pnt aPn1, aPn2, aPx;
gp_Dir aDN1, aDN2, aDBF, aDBF2, aDTF; gp_Dir aDN1, aDN2, aDBF, aDBF2, aDTF;
gp_Vec aVTgt; gp_Vec aVTgt;
TopAbs_Orientation aOr; TopAbs_Orientation aOr;
Handle(Geom_Curve)aC3D; Handle(Geom_Curve)aC3D;
Handle(Geom_Plane) aPL;
BOPTools_ListIteratorOfListOfCoupleOfShape aIt; BOPTools_ListIteratorOfListOfCoupleOfShape aIt;
GeomAPI_ProjectPointOnSurf aProjPL;
// //
aAngleMin=100.; aAngleMin=100.;
aTwoPI=M_PI+M_PI; aTwoPI=M_PI+M_PI;
@ -812,7 +815,11 @@ Standard_Boolean BOPTools_AlgoTools::GetFaceOff
gp_Dir aDTgt(aVTgt), aDTgt2; gp_Dir aDTgt(aVTgt), aDTgt2;
aOr = theE1.Orientation(); aOr = theE1.Orientation();
// //
GetFaceDir(theE1, theF1, aPx, aT, aDTgt, aDN1, aDBF, theContext); aPL = new Geom_Plane(aPx, aDTgt);
aPL->Bounds(aUmin, aUsup, aVmin, aVsup);
aProjPL.Init(aPL, aUmin, aUsup, aVmin, aVsup);
//
GetFaceDir(theE1, theF1, aPx, aT, aDTgt, aDN1, aDBF, theContext, aProjPL);
// //
aDTF=aDN1^aDBF; aDTF=aDN1^aDBF;
// //
@ -824,7 +831,7 @@ Standard_Boolean BOPTools_AlgoTools::GetFaceOff
const TopoDS_Face& aF2=(*(TopoDS_Face*)(&aCS.Shape2())); const TopoDS_Face& aF2=(*(TopoDS_Face*)(&aCS.Shape2()));
// //
aDTgt2 = (aE2.Orientation()==aOr) ? aDTgt : aDTgt.Reversed(); aDTgt2 = (aE2.Orientation()==aOr) ? aDTgt : aDTgt.Reversed();
GetFaceDir(aE2, aF2, aPx, aT, aDTgt2, aDN2, aDBF2, theContext); GetFaceDir(aE2, aF2, aPx, aT, aDTgt2, aDN2, aDBF2, theContext, aProjPL);
//Angle //Angle
aAngle=AngleWithRef(aDBF, aDBF2, aDTF); aAngle=AngleWithRef(aDBF, aDBF2, aDTF);
// //
@ -856,9 +863,9 @@ Standard_Boolean BOPTools_AlgoTools::GetFaceOff
//function : GetEdgeOff //function : GetEdgeOff
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Boolean BOPTools_AlgoTools::GetEdgeOff(const TopoDS_Edge& theE1, Standard_Boolean BOPTools_AlgoTools::GetEdgeOff(const TopoDS_Edge& theE1,
const TopoDS_Face& theF2, const TopoDS_Face& theF2,
TopoDS_Edge& theE2) TopoDS_Edge& theE2)
{ {
Standard_Boolean bFound; Standard_Boolean bFound;
TopAbs_Orientation aOr1, aOr1C, aOr2; TopAbs_Orientation aOr1, aOr1C, aOr2;
@ -887,9 +894,9 @@ Standard_Boolean BOPTools_AlgoTools::GetFaceOff
//function : AreFacesSameDomain //function : AreFacesSameDomain
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Boolean BOPTools_AlgoTools::AreFacesSameDomain(const TopoDS_Face& theF1, Standard_Boolean BOPTools_AlgoTools::AreFacesSameDomain(const TopoDS_Face& theF1,
const TopoDS_Face& theF2, const TopoDS_Face& theF2,
Handle(BOPInt_Context)& theContext) Handle(BOPInt_Context)& theContext)
{ {
Standard_Boolean bFlag; Standard_Boolean bFlag;
Standard_Integer iErr; Standard_Integer iErr;
@ -933,9 +940,9 @@ Standard_Boolean BOPTools_AlgoTools::GetFaceOff
//function : CheckSameGeom //function : CheckSameGeom
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Boolean BOPTools_AlgoTools::CheckSameGeom(const TopoDS_Face& theF1, Standard_Boolean BOPTools_AlgoTools::CheckSameGeom(const TopoDS_Face& theF1,
const TopoDS_Face& theF2, const TopoDS_Face& theF2,
Handle(BOPInt_Context)& theContext) Handle(BOPInt_Context)& theContext)
{ {
Standard_Boolean bRet; Standard_Boolean bRet;
Standard_Real aTolF1, aTolF2, aTol; Standard_Real aTolF1, aTolF2, aTol;
@ -962,8 +969,8 @@ Standard_Boolean BOPTools_AlgoTools::GetFaceOff
// function: Sense // function: Sense
// purpose: // purpose:
//======================================================================= //=======================================================================
Standard_Integer BOPTools_AlgoTools::Sense (const TopoDS_Face& theF1, Standard_Integer BOPTools_AlgoTools::Sense (const TopoDS_Face& theF1,
const TopoDS_Face& theF2) const TopoDS_Face& theF2)
{ {
Standard_Integer iSense=0; Standard_Integer iSense=0;
gp_Dir aDNF1, aDNF2; gp_Dir aDNF1, aDNF2;
@ -1008,9 +1015,9 @@ Standard_Boolean BOPTools_AlgoTools::GetFaceOff
// function: IsSplitToReverse // function: IsSplitToReverse
// purpose: // purpose:
//======================================================================= //=======================================================================
Standard_Boolean BOPTools_AlgoTools::IsSplitToReverse(const TopoDS_Shape& theSp, Standard_Boolean BOPTools_AlgoTools::IsSplitToReverse(const TopoDS_Shape& theSp,
const TopoDS_Shape& theSr, const TopoDS_Shape& theSr,
Handle(BOPInt_Context)& theContext) Handle(BOPInt_Context)& theContext)
{ {
Standard_Boolean bRet; Standard_Boolean bRet;
TopAbs_ShapeEnum aType; TopAbs_ShapeEnum aType;
@ -1042,9 +1049,9 @@ Standard_Boolean BOPTools_AlgoTools::GetFaceOff
//function :IsSplitToReverse //function :IsSplitToReverse
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Boolean BOPTools_AlgoTools::IsSplitToReverse(const TopoDS_Face& theFSp, Standard_Boolean BOPTools_AlgoTools::IsSplitToReverse(const TopoDS_Face& theFSp,
const TopoDS_Face& theFSr, const TopoDS_Face& theFSr,
Handle(BOPInt_Context)& theContext) Handle(BOPInt_Context)& theContext)
{ {
Standard_Boolean bRet, bFound, bInFace; Standard_Boolean bRet, bFound, bInFace;
Standard_Real aT1, aT2, aT, aU, aV, aScPr; Standard_Real aT1, aT2, aT, aU, aV, aScPr;
@ -1131,9 +1138,9 @@ Standard_Boolean BOPTools_AlgoTools::GetFaceOff
//function :IsSplitToReverse //function :IsSplitToReverse
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Boolean BOPTools_AlgoTools::IsSplitToReverse(const TopoDS_Edge& aEF1, Standard_Boolean BOPTools_AlgoTools::IsSplitToReverse(const TopoDS_Edge& aEF1,
const TopoDS_Edge& aEF2, const TopoDS_Edge& aEF2,
Handle(BOPInt_Context)& theContext) Handle(BOPInt_Context)& theContext)
{ {
Standard_Boolean bRet, bIsDegenerated; Standard_Boolean bRet, bIsDegenerated;
// //
@ -1182,8 +1189,8 @@ Standard_Boolean BOPTools_AlgoTools::GetFaceOff
//function : IsHole //function : IsHole
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Boolean BOPTools_AlgoTools::IsHole(const TopoDS_Shape& aW, Standard_Boolean BOPTools_AlgoTools::IsHole(const TopoDS_Shape& aW,
const TopoDS_Shape& aFace) const TopoDS_Shape& aFace)
{ {
Standard_Boolean bIsHole; Standard_Boolean bIsHole;
Standard_Integer i, aNbS; Standard_Integer i, aNbS;
@ -1255,8 +1262,8 @@ Standard_Boolean BOPTools_AlgoTools::GetFaceOff
// function: MakeContainer // function: MakeContainer
// purpose: // purpose:
//======================================================================= //=======================================================================
void BOPTools_AlgoTools::MakeContainer(const TopAbs_ShapeEnum theType, void BOPTools_AlgoTools::MakeContainer(const TopAbs_ShapeEnum theType,
TopoDS_Shape& theC) TopoDS_Shape& theC)
{ {
BRep_Builder aBB; BRep_Builder aBB;
// //
@ -1305,12 +1312,12 @@ Standard_Boolean BOPTools_AlgoTools::GetFaceOff
// function: MakePCurve // function: MakePCurve
// purpose: // purpose:
//======================================================================= //=======================================================================
void BOPTools_AlgoTools::MakePCurve(const TopoDS_Edge& aE, void BOPTools_AlgoTools::MakePCurve(const TopoDS_Edge& aE,
const TopoDS_Face& aF1, const TopoDS_Face& aF1,
const TopoDS_Face& aF2, const TopoDS_Face& aF2,
const IntTools_Curve& aIC, const IntTools_Curve& aIC,
const Standard_Boolean bPC1, const Standard_Boolean bPC1,
const Standard_Boolean bPC2) const Standard_Boolean bPC2)
{ {
Standard_Integer i; Standard_Integer i;
@ -1366,13 +1373,13 @@ Standard_Boolean BOPTools_AlgoTools::GetFaceOff
// function: MakeEdge // function: MakeEdge
// purpose: // purpose:
//======================================================================= //=======================================================================
void BOPTools_AlgoTools::MakeEdge(const IntTools_Curve& theIC, void BOPTools_AlgoTools::MakeEdge(const IntTools_Curve& theIC,
const TopoDS_Vertex& theV1, const TopoDS_Vertex& theV1,
const Standard_Real theT1, const Standard_Real theT1,
const TopoDS_Vertex& theV2, const TopoDS_Vertex& theV2,
const Standard_Real theT2, const Standard_Real theT2,
const Standard_Real theTolR3D, const Standard_Real theTolR3D,
TopoDS_Edge& theE) TopoDS_Edge& theE)
{ {
Standard_Real aTolV; Standard_Real aTolV;
BRep_Builder aBB; BRep_Builder aBB;
@ -1395,9 +1402,9 @@ Standard_Boolean BOPTools_AlgoTools::GetFaceOff
// function: ComputeVV // function: ComputeVV
// purpose: // purpose:
//======================================================================= //=======================================================================
Standard_Integer BOPTools_AlgoTools::ComputeVV(const TopoDS_Vertex& aV1, Standard_Integer BOPTools_AlgoTools::ComputeVV(const TopoDS_Vertex& aV1,
const gp_Pnt& aP2, const gp_Pnt& aP2,
const Standard_Real aTolP2) const Standard_Real aTolP2)
{ {
Standard_Real aTolV1, aTolSum, aTolSum2, aD2; Standard_Real aTolV1, aTolSum, aTolSum2, aD2;
gp_Pnt aP1; gp_Pnt aP1;
@ -1419,8 +1426,8 @@ Standard_Boolean BOPTools_AlgoTools::GetFaceOff
// function: ComputeVV // function: ComputeVV
// purpose: // purpose:
//======================================================================= //=======================================================================
Standard_Integer BOPTools_AlgoTools::ComputeVV(const TopoDS_Vertex& aV1, Standard_Integer BOPTools_AlgoTools::ComputeVV(const TopoDS_Vertex& aV1,
const TopoDS_Vertex& aV2) const TopoDS_Vertex& aV2)
{ {
Standard_Real aTolV1, aTolV2, aTolSum, aTolSum2, aD2; Standard_Real aTolV1, aTolV2, aTolSum, aTolSum2, aD2;
gp_Pnt aP1, aP2; gp_Pnt aP1, aP2;
@ -1443,8 +1450,8 @@ Standard_Boolean BOPTools_AlgoTools::GetFaceOff
// function: MakeVertex // function: MakeVertex
// purpose : // purpose :
//======================================================================= //=======================================================================
void BOPTools_AlgoTools::MakeVertex(BOPCol_ListOfShape& aLV, void BOPTools_AlgoTools::MakeVertex(BOPCol_ListOfShape& aLV,
TopoDS_Vertex& aVnew) TopoDS_Vertex& aVnew)
{ {
Standard_Integer aNb; Standard_Integer aNb;
Standard_Real aTi, aDi, aDmax; Standard_Real aTi, aDi, aDmax;
@ -1487,9 +1494,9 @@ Standard_Boolean BOPTools_AlgoTools::GetFaceOff
//function : GetEdgeOnFace //function : GetEdgeOnFace
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Boolean BOPTools_AlgoTools::GetEdgeOnFace(const TopoDS_Edge& theE1, Standard_Boolean BOPTools_AlgoTools::GetEdgeOnFace(const TopoDS_Edge& theE1,
const TopoDS_Face& theF2, const TopoDS_Face& theF2,
TopoDS_Edge& theE2) TopoDS_Edge& theE2)
{ {
Standard_Boolean bFound; Standard_Boolean bFound;
TopoDS_Iterator aItF, aItW; TopoDS_Iterator aItF, aItW;
@ -1660,10 +1667,10 @@ Standard_Real fsqrt(Standard_Real val)
// function: IsBlockInOnFace // function: IsBlockInOnFace
// purpose: // purpose:
//======================================================================= //=======================================================================
Standard_Boolean BOPTools_AlgoTools::IsBlockInOnFace (const IntTools_Range& aShrR, Standard_Boolean BOPTools_AlgoTools::IsBlockInOnFace (const IntTools_Range& aShrR,
const TopoDS_Face& aF, const TopoDS_Face& aF,
const TopoDS_Edge& aE1, const TopoDS_Edge& aE1,
Handle(BOPInt_Context)& aContext) Handle(BOPInt_Context)& aContext)
{ {
Standard_Boolean bFlag; Standard_Boolean bFlag;
Standard_Real f1, l1, ULD, VLD; Standard_Real f1, l1, ULD, VLD;
@ -1750,8 +1757,8 @@ Standard_Real fsqrt(Standard_Real val)
//function : IsMicroEdge //function : IsMicroEdge
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Boolean BOPTools_AlgoTools::IsMicroEdge(const TopoDS_Edge& aE, Standard_Boolean BOPTools_AlgoTools::IsMicroEdge(const TopoDS_Edge& aE,
const Handle(BOPInt_Context)& aCtx) const Handle(BOPInt_Context)& aCtx)
{ {
Standard_Boolean bRet; Standard_Boolean bRet;
Standard_Integer iErr; Standard_Integer iErr;
@ -1788,14 +1795,15 @@ Standard_Real fsqrt(Standard_Real val)
//function : GetFaceDir //function : GetFaceDir
//purpose : Get binormal direction for the face in the point aP //purpose : Get binormal direction for the face in the point aP
//======================================================================= //=======================================================================
void GetFaceDir(const TopoDS_Edge& aE, void GetFaceDir(const TopoDS_Edge& aE,
const TopoDS_Face& aF, const TopoDS_Face& aF,
const gp_Pnt& aP, const gp_Pnt& aP,
const Standard_Real aT, const Standard_Real aT,
const gp_Dir& aDTgt, const gp_Dir& aDTgt,
gp_Dir& aDN, gp_Dir& aDN,
gp_Dir& aDB, gp_Dir& aDB,
Handle(BOPInt_Context)& theContext) Handle(BOPInt_Context)& theContext,
GeomAPI_ProjectPointOnSurf& aProjPL)
{ {
BOPTools_AlgoTools3D::GetNormalToFaceOnEdge(aE, aF, aT, aDN); BOPTools_AlgoTools3D::GetNormalToFaceOnEdge(aE, aF, aT, aDN);
if (aF.Orientation()==TopAbs_REVERSED){ if (aF.Orientation()==TopAbs_REVERSED){
@ -1803,22 +1811,13 @@ Standard_Real fsqrt(Standard_Real val)
} }
aDB = aDN^aDTgt; aDB = aDN^aDTgt;
// //
Handle(Geom_Surface) aS = BRep_Tool::Surface(aF); gp_Pnt aPx;
GeomAdaptor_Surface aGAS(aS); if (!FindPointInFace(aE, aF, aP, aDB, aPx, theContext, aProjPL)) {
if (aGAS.GetType()!=GeomAbs_Plane) { BOPTools_AlgoTools3D::GetApproxNormalToFaceOnEdge(aE, aF, aT, aPx, aDN, theContext);
gp_Pnt aPx; aProjPL.Perform(aPx);
if (!FindPointInFace(aE, aF, aP, aT, aDB, aPx, theContext, aGAS)) { aPx = aProjPL.NearestPoint();
gp_Pnt2d aPx2D; gp_Vec aVec(aP, aPx);
Handle(Geom_Plane) aPL; aDB.SetXYZ(aVec.XYZ());
GeomAPI_ProjectPointOnSurf aProj;
//
BOPTools_AlgoTools3D::PointNearEdge(aE, aF, aT, aPx2D, aPx, theContext);
aPL = new Geom_Plane(aP, aDTgt);
aProj.Init(aPx, aPL);
aPx = aProj.NearestPoint();
gp_Vec aVec(aP, aPx);
aDB.SetXYZ(aVec.XYZ());
}
} }
} }
@ -1826,41 +1825,42 @@ Standard_Real fsqrt(Standard_Real val)
//function : FindPointInFace //function : FindPointInFace
//purpose : Find a point in the face in direction of <aDB> //purpose : Find a point in the face in direction of <aDB>
//======================================================================= //=======================================================================
Standard_Boolean FindPointInFace(const TopoDS_Edge& aE, Standard_Boolean FindPointInFace(const TopoDS_Edge& aE,
const TopoDS_Face& aF, const TopoDS_Face& aF,
const gp_Pnt& aP, const gp_Pnt& aP,
const Standard_Real /*aT*/, gp_Dir& aDB,
gp_Dir& aDB, gp_Pnt& aPOut,
gp_Pnt& aPOut, Handle(BOPInt_Context)& theContext,
Handle(BOPInt_Context)& theContext, GeomAPI_ProjectPointOnSurf& aProjPL)
const GeomAdaptor_Surface& aGAS)
{ {
Standard_Integer aNbItMax; Standard_Integer aNbItMax;
Standard_Real aDt, aDtMin, aTolE, aTolF, aDist; Standard_Real aDt, aDtMin, aTolE, aTolF, aDist;
Standard_Boolean bRet; Standard_Boolean bRet;
gp_Pnt aP1; gp_Pnt aP1;
BRepAdaptor_Surface aBAS;
// //
bRet = Standard_False; bRet = Standard_False;
aTolE = BRep_Tool::Tolerance(aE); aTolE = BRep_Tool::Tolerance(aE);
aTolF = BRep_Tool::Tolerance(aF); aTolF = BRep_Tool::Tolerance(aF);
aDt = 2*(aTolE+aTolF); aDt = 2*(aTolE+aTolF);
aBAS.Initialize(aF, Standard_False);
// //
aDtMin=5.e-4; aDtMin=5.e-4;
if (aDt < aDtMin) { if (aDt < aDtMin) {
Standard_Real aR; Standard_Real aR;
GeomAbs_SurfaceType aSType=aGAS.GetType(); GeomAbs_SurfaceType aSType=aBAS.GetType();
switch (aSType) { switch (aSType) {
case GeomAbs_Cylinder: case GeomAbs_Cylinder:
aR = aGAS.Cylinder().Radius(); aR = aBAS.Cylinder().Radius();
break; break;
case GeomAbs_Cone: case GeomAbs_Cone:
aR = aGAS.Cone().RefRadius(); aR = aBAS.Cone().RefRadius();
break; break;
case GeomAbs_Sphere: case GeomAbs_Sphere:
aR = aGAS.Sphere().Radius(); aR = aBAS.Sphere().Radius();
break; break;
case GeomAbs_Torus: case GeomAbs_Torus:
aR = aGAS.Torus().MinorRadius(); aR = aBAS.Torus().MinorRadius();
break; break;
case GeomAbs_SurfaceOfRevolution: case GeomAbs_SurfaceOfRevolution:
aR=1.; aR=1.;
@ -1894,6 +1894,9 @@ Standard_Real fsqrt(Standard_Real val)
aPOut = aProj.NearestPoint(); aPOut = aProj.NearestPoint();
aDist = aProj.LowerDistance(); aDist = aProj.LowerDistance();
// //
aProjPL.Perform(aPOut);
aPOut = aProjPL.NearestPoint();
//
gp_Vec aV(aP, aPOut); gp_Vec aV(aP, aPOut);
aDB.SetXYZ(aV.XYZ()); aDB.SetXYZ(aV.XYZ());
} while (aDist>Precision::Angular() && --aNbItMax); } while (aDist>Precision::Angular() && --aNbItMax);

29
tests/bugs/modalg_5/bug24154 Normal file
View File

@ -0,0 +1,29 @@
puts "============"
puts "OCC24154"
puts "============"
puts ""
######################################################
# Wrong result of CUT operation
######################################################
restore [locate_data_file bug24154_t.brep] b1
restore [locate_data_file bug24154_b.brep] b2
bop b1 b2
bopcut result
set square 2.68434e+06
set volume 7.35468e+07
# Analysis of "nbshapes res"
set nb_v_good 18
set nb_e_good 27
set nb_w_good 11
set nb_f_good 11
set nb_sh_good 1
set nb_sol_good 1
set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 70
set 2dviewer 1