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

0026841: Boolean operation "bsection" produce invalid result on the attached cases

Browse Source 
Porting the fix to OCCT 6.7.0
This commit is contained in:
nbv
2015-12-14 17:14:52 +03:00
parent 2748a46ef7
commit dd65d9dff5
2 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/IntTools/IntTools_FaceFace.cxx
View File

@@ -842,7 +842,11 @@ static Standard_Boolean isTreatAnalityc(const TopoDS_Face& theF1,
aType2=myHS2->Surface().GetType(); aType2=myHS2->Surface().GetType();
// //
bCase1=((aType1==GeomAbs_Plane && aType2==GeomAbs_SurfaceOfExtrusion) || bCase1=((aType1==GeomAbs_Plane && aType2==GeomAbs_SurfaceOfExtrusion) ||
(aType2==GeomAbs_Plane && aType1==GeomAbs_SurfaceOfExtrusion)); (aType2==GeomAbs_Plane && aType1==GeomAbs_SurfaceOfExtrusion));
bCase1 = bCase1 || ((aType1==GeomAbs_Cylinder && aType2==GeomAbs_BSplineSurface) ||
(aType2==GeomAbs_Cylinder && aType1==GeomAbs_BSplineSurface));
// //
if (aType1==GeomAbs_Cylinder && aType2==GeomAbs_Cylinder) { if (aType1==GeomAbs_Cylinder && aType2==GeomAbs_Cylinder) {
if (aNbLin==2){ if (aNbLin==2){
@@ -1220,9 +1224,9 @@ reapprox:;
DumpWLine(aWLineX); DumpWLine(aWLineX);
#endif #endif
// //
if(!myListOfPnts.IsEmpty()) { //if(!myListOfPnts.IsEmpty()) {
bAvoidLineConstructor = Standard_True; // bAvoidLineConstructor = Standard_True;
} //}
Standard_Integer nbp = aWLine->NbPnts(); Standard_Integer nbp = aWLine->NbPnts();
const IntSurf_PntOn2S& p1 = aWLine->Point(1); const IntSurf_PntOn2S& p1 = aWLine->Point(1);

59
src/IntWalk/IntWalk_IWalking_1.gxx
View File

@@ -1638,14 +1638,14 @@ Standard_Boolean IntWalk_IWalking::
if(aNbPoints >= theMinNbPoints) if(aNbPoints >= theMinNbPoints)
return Standard_True; return Standard_True;
const Standard_Real aU1bFirst = theASurf1->FirstUParameter(); //const Standard_Real aU1bFirst = theASurf1->FirstUParameter();
const Standard_Real aU1bLast = theASurf1->LastUParameter(); //const Standard_Real aU1bLast = theASurf1->LastUParameter();
const Standard_Real aU2bFirst = theASurf2->FirstUParameter(); //const Standard_Real aU2bFirst = theASurf2->FirstUParameter();
const Standard_Real aU2bLast = theASurf2->LastUParameter(); //const Standard_Real aU2bLast = theASurf2->LastUParameter();
const Standard_Real aV1bFirst = theASurf1->FirstVParameter(); //const Standard_Real aV1bFirst = theASurf1->FirstVParameter();
const Standard_Real aV1bLast = theASurf1->LastVParameter(); //const Standard_Real aV1bLast = theASurf1->LastVParameter();
const Standard_Real aV2bFirst = theASurf2->FirstVParameter(); //const Standard_Real aV2bFirst = theASurf2->FirstVParameter();
const Standard_Real aV2bLast = theASurf2->LastVParameter(); //const Standard_Real aV2bLast = theASurf2->LastVParameter();
Standard_Integer aLastPoint = theToPoint; Standard_Integer aLastPoint = theToPoint;
@@ -1667,28 +1667,28 @@ Standard_Boolean IntWalk_IWalking::
line->Value(lp).Parameters(U1l, V1l, U2l, V2l); line->Value(lp).Parameters(U1l, V1l, U2l, V2l);
U1prec = 0.5*(U1f+U1l); U1prec = 0.5*(U1f+U1l);
if(U1prec < aU1bFirst) //if(U1prec < aU1bFirst)
U1prec = aU1bFirst; // U1prec = aU1bFirst;
if(U1prec > aU1bLast) //if(U1prec > aU1bLast)
U1prec = aU1bLast; // U1prec = aU1bLast;
V1prec = 0.5*(V1f+V1l); V1prec = 0.5*(V1f+V1l);
if(V1prec < aV1bFirst) //if(V1prec < aV1bFirst)
V1prec = aV1bFirst; // V1prec = aV1bFirst;
if(V1prec > aV1bLast) //if(V1prec > aV1bLast)
V1prec = aV1bLast; // V1prec = aV1bLast;
U2prec = 0.5*(U2f+U2l); U2prec = 0.5*(U2f+U2l);
if(U2prec < aU2bFirst) //if(U2prec < aU2bFirst)
U2prec = aU2bFirst; // U2prec = aU2bFirst;
if(U2prec > aU2bLast) //if(U2prec > aU2bLast)
U2prec = aU2bLast; // U2prec = aU2bLast;
V2prec = 0.5*(V2f+V2l); V2prec = 0.5*(V2f+V2l);
if(V2prec < aV2bFirst) //if(V2prec < aV2bFirst)
V2prec = aV2bFirst; // V2prec = aV2bFirst;
if(V2prec > aV2bLast) //if(V2prec > aV2bLast)
V2prec = aV2bLast; // V2prec = aV2bLast;
Standard_Boolean aStatus = Standard_False; Standard_Boolean aStatus = Standard_False;
Standard_Integer aNbIter = 5; Standard_Integer aNbIter = 5;
@@ -1725,6 +1725,17 @@ Standard_Boolean IntWalk_IWalking::
if(aStatus) if(aStatus)
{ {
//const Standard_Real aU1Rf = !theASurf1->IsUPeriodic() ? aU1bFirst : Min(U1f, aU1bFirst);
const Standard_Real aU1bFirst = Min(U1f, U1l);
const Standard_Real aU1bLast = Max(U1f, U1l);
const Standard_Real aU2bFirst = Min(U2f, U2l);
const Standard_Real aU2bLast = Max(U2f, U2l);
const Standard_Real aV1bFirst = Min(V1f, V1l);
const Standard_Real aV1bLast = Max(V1f, V1l);
const Standard_Real aV2bFirst = Min(V2f, V2l);
const Standard_Real aV2bLast = Max(V2f, V2l);
if(U1prec < aU1bFirst) if(U1prec < aU1bFirst)
U1prec = aU1bFirst; U1prec = aU1bFirst;
if(U1prec > aU1bLast) if(U1prec > aU1bLast)