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

0023933: Self intersection reported after Fuse operation.

Browse Source 
Additional check has been added in IntTools_BeanFaceIntersector::FastComputeExactIntersection() to prevent
creating an Edge/Face intersection for the case when edge lies on the surface of the face, but not on the face itself.
Adding test case for this fix
This commit is contained in:
emv 2013-05-23 11:55:08 +04:00
parent 8b7c9cb469
commit f14190252b
4 changed files with 169 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/BOPAlgo/BOPAlgo_ArgumentAnalyzer.cxx
View File

@ -348,6 +348,13 @@ void BOPAlgo_ArgumentAnalyzer::TestSelfInterferences()
continue; continue;
} }
// //
if (aTypeInt == 4) {
BOPDS_InterfEF& aEF=aEFs(i);
if (aEF.CommonPart().Type()==TopAbs_SHAPE) {
continue;
}
}
//
const TopoDS_Shape& aS1 = theDS->Shape(nI1); const TopoDS_Shape& aS1 = theDS->Shape(nI1);
const TopoDS_Shape& aS2 = theDS->Shape(nI2); const TopoDS_Shape& aS2 = theDS->Shape(nI2);
// //

7
src/BOPTest/BOPTest_CheckCommands.cxx
View File

@ -133,6 +133,13 @@ Standard_Integer bopcheck (Draw_Interpretor& di, Standard_Integer n, const char
continue; continue;
} }
// //
if (aTypeInt == 4) {
BOPDS_InterfEF& aEF=aEFs(i);
if (aEF.CommonPart().Type()==TopAbs_SHAPE) {
continue;
}
}
//
const TopoDS_Shape& aS1 = theDS->Shape(nI1); const TopoDS_Shape& aS1 = theDS->Shape(nI1);
const TopoDS_Shape& aS2 = theDS->Shape(nI2); const TopoDS_Shape& aS2 = theDS->Shape(nI2);
// //

42
src/IntTools/IntTools_BeanFaceIntersector.cxx
View File

@ -62,6 +62,7 @@
#include <BndLib_Add3dCurve.hxx> #include <BndLib_Add3dCurve.hxx>
#include <ElCLib.hxx> #include <ElCLib.hxx>
#include <ElSLib.hxx> #include <ElSLib.hxx>
#include <BOPTools_AlgoTools.hxx>
static Standard_Boolean AdjustPeriodic(const Standard_Real U, static Standard_Boolean AdjustPeriodic(const Standard_Real U,
const Standard_Real UFirst, const Standard_Real UFirst,
@ -743,7 +744,6 @@ Standard_Integer IntTools_BeanFaceIntersector::FastComputeExactIntersection()
if(aCT==GeomAbs_Line) { if(aCT==GeomAbs_Line) {
if((surfPlane.Distance(myCurve.Value(myFirstParameter)) < myCriteria) && if((surfPlane.Distance(myCurve.Value(myFirstParameter)) < myCriteria) &&
(surfPlane.Distance(myCurve.Value(myLastParameter)) < myCriteria)) { (surfPlane.Distance(myCurve.Value(myLastParameter)) < myCriteria)) {
myRangeManager.InsertRange(myFirstParameter, myLastParameter, 2);
aresult = 1; aresult = 1;
} }
} }
@ -821,7 +821,6 @@ Standard_Integer IntTools_BeanFaceIntersector::FastComputeExactIntersection()
} }
// //
if(insertRange) { if(insertRange) {
myRangeManager.InsertRange(myFirstParameter, myLastParameter, 2);
aresult = 1; aresult = 1;
} }
}//if(anAngle < Precision::Angular()) { }//if(anAngle < Precision::Angular()) {
@ -856,7 +855,6 @@ Standard_Integer IntTools_BeanFaceIntersector::FastComputeExactIntersection()
adist = alocdist + Abs(adiff); adist = alocdist + Abs(adiff);
if(adist < myCriteria) { // Abs is important function here if(adist < myCriteria) { // Abs is important function here
myRangeManager.InsertRange(myFirstParameter, myLastParameter, 2);
aresult = 1; aresult = 1;
} }
} }
@ -876,7 +874,6 @@ Standard_Integer IntTools_BeanFaceIntersector::FastComputeExactIntersection()
adist += Abs(adiff); adist += Abs(adiff);
if(adist < myCriteria) { if(adist < myCriteria) {
myRangeManager.InsertRange(myFirstParameter, myLastParameter, 2);
aresult = 1; aresult = 1;
} }
} }
@ -929,36 +926,29 @@ Standard_Integer IntTools_BeanFaceIntersector::FastComputeExactIntersection()
break; break;
} }
} }
//modified by NIZHNY-EMV Fri Apr 20 08:45:29 2012
//
if (!bFlag){ if (!bFlag){
Standard_Real U, V, aTm;
gp_Pnt aPm;
gp_Pnt2d aP2d;
//
aTm = IntTools_Tools::IntermediatePoint(myFirstParameter, myLastParameter);
aPm = myCurve.Value(aTm);
ElSLib::Parameters(aCyl, aPm, U, V);
aP2d.SetCoord(U,V);
//
bFlag = !(myContext->IsPointInOnFace(mySurface.Face(), aP2d));
}
//
if (!bFlag){
myRangeManager.InsertRange(myFirstParameter, myLastParameter, 2);
aresult = 1; aresult = 1;
return aresult;
} }
else {
aresult = 2;
return aresult;
}
//modified by NIZHNY-EMV Fri Apr 20 08:45:32 2012
} }
}//if(aCT==GeomAbs_Line) { }//if(aCT==GeomAbs_Line) {
} }
//modified by NIZNHY-PKV Thu Mar 01 11:54:06 2012t //modified by NIZNHY-PKV Thu Mar 01 11:54:06 2012t
//
//modified by NIZHNY-EMV Fri May 17 09:48:49 2013
if (aresult==1) {
IntTools_Range aRange(myFirstParameter, myLastParameter);
const TopoDS_Face& aF = mySurface.Face();
const TopoDS_Edge& aE = myCurve.Edge();
//
if (BOPTools_AlgoTools::IsBlockInOnFace(aRange, aF, aE, myContext)) {
myRangeManager.InsertRange(aRange, 2);
} else {
aresult=2;
}
}
//modified by NIZHNY-EMV Fri May 17 09:48:53 2013
//
return aresult; return aresult;
} }

24
tests/bugs/modalg_5/bug23933 Executable file
View File

@ -0,0 +1,24 @@
puts "============"
puts "OCC23933"
puts "============"
puts ""
######################################################
# Self intersection reported after Fuse operation
######################################################
restore [locate_data_file bug23933_a.brep] a
restore [locate_data_file bug23933_b.brep] b
checkshape a
checkshape b
bopargcheck a b -F
if { [catch {bfuse result a b} catch_result] } {
puts "Faulty OCC697"
}
checkshape result
bopargcheck result
set square 246487
set 3dviewer 1