OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0023160: Cut operation with the attached shapes produces a not correct result.

Browse Source
This commit is contained in:
emv 2012-05-18 12:31:31 +04:00
parent c1338f4f64
commit ef8da89204
1 changed files with 104 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
src/BOPTools/BOPTools_Tools3D_1.cxx
View File

@ -50,6 +50,12 @@
#include <BOPTools_Tools2D.hxx> #include <BOPTools_Tools2D.hxx>
static Standard_Boolean CheckPointInside(BRepClass3d_SolidClassifier& aSolidClassifier,
const gp_Pnt& aP3d,
const Standard_Real aTolerance,
const Handle(IntTools_Context)& theContext,
TopAbs_State& aState,
Standard_Boolean& bFoundInFacePoint);
//======================================================================= //=======================================================================
//function : GetApproxNormalToFaceOnEdge //function : GetApproxNormalToFaceOnEdge
@ -909,43 +915,54 @@ Standard_Boolean BOPTools_Tools3D::ComputeFaceState(const TopoDS_Face& theFace,
Standard_Real V = (vmin + vmax) * 0.5; Standard_Real V = (vmin + vmax) * 0.5;
for(j = 1; !bFoundValidPoint && (j <= nbpoints); j++, V+=adeltav) { for(j = 1; !bFoundValidPoint && (j <= nbpoints); j++, V+=adeltav) {
gp_Pnt2d aPoint(U,V); gp_Pnt2d aPoint(U,V);
if(theContext->IsPointInOnFace(theFace, aPoint)) { if(theContext->IsPointInOnFace(theFace, aPoint)) {
bFoundInFacePoint = Standard_True; bFoundInFacePoint = Standard_True;
gp_Pnt aP3d = aSurface->Value(U, V); gp_Pnt aP3d = aSurface->Value(U, V);
aSolidClassifier.Perform(aP3d, aTolerance); bFoundValidPoint = CheckPointInside(aSolidClassifier, aP3d, aTolerance, theContext,
aState = aSolidClassifier.State(); aState, bFoundInFacePoint);
if (bFoundValidPoint) {
if(aState != TopAbs_ON) { break;
}
if(!aSolidClassifier.Rejected()) { }
TopoDS_Face aFace2 = aSolidClassifier.Face(); }
}
if(!aFace2.IsNull()) { }
GeomAPI_ProjectPointOnSurf& aProjector = theContext->ProjPS(aFace2); //emv for salome bug 23160
aProjector.Perform(aP3d); if(!bFoundInFacePoint) {
TopExp_Explorer aExp;
if(aProjector.IsDone()) { Standard_Real aT1, aT2, aT, aDt2D;
Standard_Real U2 = 0., V2 = 0.; gp_Pnt aPx, aP3d;
aProjector.LowerDistanceParameters(U2, V2); gp_Pnt2d aPoint;
gp_Pnt2d aPoint2(U2, V2); aExp.Init(theFace, TopAbs_EDGE);
for(; aExp.More(); aExp.Next()) {
if(aProjector.LowerDistance() < aTolerance) { const TopoDS_Edge& aE=(*(TopoDS_Edge*)(&aExp.Current()));
if(theContext->IsPointInFace(aFace2, aPoint2)) if (aE.Orientation()==TopAbs_INTERNAL) {
aState = TopAbs_ON; continue;
} }
} //
bFoundValidPoint = Standard_True; if (BRep_Tool::Degenerated(aE)){
break; continue;
} }
} //
else { //get point inside face
bFoundInFacePoint = Standard_False; Handle(Geom_Curve)aC3D = BRep_Tool::Curve(aE, aT1, aT2);
} aT=BOPTools_Tools2D::IntermediatePoint(aT1, aT2);
} aC3D->D0(aT, aPx);
} aDt2D = BOPTools_Tools3D::MinStepIn2d();
aDt2D += 2*BRep_Tool::Tolerance(aE);
BOPTools_Tools3D::PointNearEdge (aE, theFace, aT, aDt2D, aPoint, aP3d);
//
if (theContext->IsPointInOnFace(theFace, aPoint)) {
bFoundInFacePoint = Standard_True;
bFoundValidPoint = CheckPointInside(aSolidClassifier, aP3d, aTolerance, theContext,
aState, bFoundInFacePoint);
if (bFoundValidPoint) {
break;
}
} }
} }
} }
@ -957,6 +974,7 @@ Standard_Boolean BOPTools_Tools3D::ComputeFaceState(const TopoDS_Face& theFace,
return Standard_True; return Standard_True;
} }
//modified by NIZNHY-PKV Thu Sep 22 10:55:14 2011f //modified by NIZNHY-PKV Thu Sep 22 10:55:14 2011f
// =========================================================================================== // ===========================================================================================
// function: CheckSameDomainFaceInside // function: CheckSameDomainFaceInside
@ -1022,3 +1040,52 @@ Standard_Boolean BOPTools_Tools3D::CheckSameDomainFaceInside(const TopoDS_Face&
return bFoundON; return bFoundON;
} }
//modified by NIZNHY-PKV Thu Sep 22 10:55:19 2011t //modified by NIZNHY-PKV Thu Sep 22 10:55:19 2011t
// ===========================================================================================
// function: CheckPointInside
// purpose:
// ===========================================================================================
Standard_Boolean CheckPointInside(BRepClass3d_SolidClassifier& aSolidClassifier,
const gp_Pnt& aP3d,
const Standard_Real aTolerance,
const Handle(IntTools_Context)& theContext,
TopAbs_State& aState,
Standard_Boolean& bFoundInFacePoint)
{
Standard_Boolean bFoundValidPoint;
bFoundValidPoint = Standard_False;
aSolidClassifier.Perform(aP3d, aTolerance);
aState = aSolidClassifier.State();
if(aState != TopAbs_ON) {
if(!aSolidClassifier.Rejected()) {
TopoDS_Face aFace2 = aSolidClassifier.Face();
if(!aFace2.IsNull()) {
GeomAPI_ProjectPointOnSurf& aProjector = theContext->ProjPS(aFace2);
aProjector.Perform(aP3d);
if(aProjector.IsDone()) {
Standard_Real U2 = 0., V2 = 0.;
aProjector.LowerDistanceParameters(U2, V2);
gp_Pnt2d aPoint2(U2, V2);
if(aProjector.LowerDistance() < aTolerance) {
if(theContext->IsPointInFace(aFace2, aPoint2)) {
aState = TopAbs_ON;
}
}
}
bFoundValidPoint = Standard_True;
}
}
else {
bFoundInFacePoint = Standard_False;
}
}
return bFoundValidPoint;
}