OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0027032: [Regression to 6.9.1] Result of bcut has the same volume as the object

Browse Source 
- Avoid reducing tolerance of the original edges in BOPAlgo_PaveFiller::CorrectToleranceOfSE
- If a boundary edge is considered coincident with a section curve then increase its tolerance more carefully, using real distance instead of extended reached tolerance.
- New test case bugs/modalg_6/bug27032
- Test cases boolean/gdml_private/E4-F3 have been amended to check area of the result.

- Puts TODO in test cases boolean gdml_private ZI5,ZI7,ZJ7.
This commit is contained in:
msv 2015-12-28 14:48:06 +03:00 committed by bugmaster
parent 7d83504007
commit 05cf4d98b0
17 changed files with 57 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/BOPAlgo/BOPAlgo_PaveFiller.hxx
View File

@ -188,7 +188,10 @@ protected:
Standard_EXPORT void PutBoundPaveOnCurve (const TopoDS_Face& theF1, const TopoDS_Face& theF2, const Standard_Real theTolR3D, BOPDS_Curve& theNC, BOPCol_ListOfInteger& theLBV);
Standard_EXPORT Standard_Boolean IsExistingPaveBlock (const Handle(BOPDS_PaveBlock)& thePB, const BOPDS_Curve& theNC, const Standard_Real theTolR3D, const BOPDS_IndexedMapOfPaveBlock& theMPB, Handle(BOPDS_PaveBlock)& thePBOut);
Standard_EXPORT Standard_Boolean IsExistingPaveBlock
(const Handle(BOPDS_PaveBlock)& thePB, const BOPDS_Curve& theNC,
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);

30
src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx
View File

@ -521,7 +521,8 @@ void BOPAlgo_PaveFiller::MakeBlocks()
continue;
}
//
bExist=IsExistingPaveBlock(aPB, aNC, aTolR3D, aMPBOnIn, aPBOut);
Standard_Real aTolNew;
bExist=IsExistingPaveBlock(aPB, aNC, aTolR3D, aMPBOnIn, aPBOut, aTolNew);
if (bExist) {
if (aMPBAdd.Add(aPBOut)) {
Standard_Boolean bInBothFaces = Standard_True;
@ -532,8 +533,10 @@ void BOPAlgo_PaveFiller::MakeBlocks()
nE = aPBOut->Edge();
const TopoDS_Edge& aE = *(TopoDS_Edge*)&myDS->Shape(nE);
aTolE = BRep_Tool::Tolerance(aE);
if (aTolR3D > aTolE) {
UpdateEdgeTolerance(nE, aTolR3D);
if (aTolNew < aFF.TolReal())
aTolNew = aFF.TolReal(); // use real tolerance of intersection
if (aTolNew > aTolE) {
UpdateEdgeTolerance(nE, aTolNew);
}
bInBothFaces = Standard_False;
}
@ -1097,7 +1100,7 @@ Standard_Boolean BOPAlgo_PaveFiller::IsExistingPaveBlock
return !bRet;
}
//
Standard_Real aT1, aT2, aTm, aTx, aTol;
Standard_Real aT1, aT2, aTm, aTx, aTol, aDist;
Standard_Integer nE, iFlag;
gp_Pnt aPm;
Bnd_Box aBoxPm;
@ -1120,7 +1123,7 @@ Standard_Boolean BOPAlgo_PaveFiller::IsExistingPaveBlock
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);
iFlag=myContext->ComputePE(aPm, aTol, aE, aTx, aDist);
if (!iFlag) {
return bRet;
}
@ -1138,7 +1141,8 @@ Standard_Boolean BOPAlgo_PaveFiller::IsExistingPaveBlock
const BOPDS_Curve& theNC,
const Standard_Real theTolR3D,
const BOPDS_IndexedMapOfPaveBlock& theMPBOnIn,
Handle(BOPDS_PaveBlock)& aPBOut)
Handle(BOPDS_PaveBlock)& aPBOut,
Standard_Real& theTolNew)
{
Standard_Boolean bRet;
Standard_Real aT1, aT2, aTm, aTx;
@ -1165,6 +1169,7 @@ Standard_Boolean BOPAlgo_PaveFiller::IsExistingPaveBlock
aBoxP2.Add(aP2);
aBoxP2.Enlarge(theTolR3D);
//
theTolNew = 0.;
aNbPB = theMPBOnIn.Extent();
for (i = 1; i <= aNbPB; ++i) {
const Handle(BOPDS_PaveBlock)& aPB = theMPBOnIn(i);
@ -1181,19 +1186,24 @@ Standard_Boolean BOPAlgo_PaveFiller::IsExistingPaveBlock
iFlag2 = (nV12 == nV21 || nV12 == nV22) ? 2 :
(!aBoxSp.IsOut(aBoxP2) ? 1 : 0);
if (iFlag1 && iFlag2) {
Standard_Real aDist;
if (aBoxSp.IsOut(aBoxPm) || myContext->ComputePE(aPm,
theTolR3D,
aSp,
aTx)) {
aTx, theTolNew)) {
continue;
}
//
if (iFlag1 == 1) {
iFlag1 = !myContext->ComputePE(aP1, theTolR3D, aSp, aTx);
iFlag1 = !myContext->ComputePE(aP1, theTolR3D, aSp, aTx, aDist);
if (theTolNew < aDist)
theTolNew = aDist;
}
//
if (iFlag2 == 1) {
iFlag2 = !myContext->ComputePE(aP2, theTolR3D, aSp, aTx);
iFlag2 = !myContext->ComputePE(aP2, theTolR3D, aSp, aTx, aDist);
if (theTolNew < aDist)
theTolNew = aDist;
}
//
if (iFlag1 && iFlag2) {
@ -2525,7 +2535,7 @@ void BOPAlgo_PaveFiller::CorrectToleranceOfSE()
for (; aItLPB.More(); aItLPB.Next()) {
const Handle(BOPDS_PaveBlock)& aPB = aItLPB.Value();
Standard_Integer nE;
if (!aPB->HasEdge(nE)) {
if (!aPB->HasEdge(nE) || aPB->OriginalEdge() >= 0) {
continue;
}
const TopoDS_Edge& aE = TopoDS::Edge(myDS->Shape(nE));

5
src/IntTools/IntTools_Context.cxx
View File

@ -481,12 +481,13 @@ Standard_Integer IntTools_Context::ComputePE
(const gp_Pnt& aP1,
const Standard_Real aTolP1,
const TopoDS_Edge& aE2,
Standard_Real& aT)
Standard_Real& aT,
Standard_Real& aDist)
{
if (!BRep_Tool::IsGeometric(aE2)) {
return -2;
}
Standard_Real aDist, aTolE2, aTolSum;
Standard_Real aTolE2, aTolSum;
Standard_Integer aNbProj;
//
GeomAPI_ProjectPointOnCurve& aProjector=ProjPC(aE2);

4
src/IntTools/IntTools_Context.hxx
View File

@ -108,7 +108,9 @@ Standard_EXPORT virtual ~IntTools_Context();
//! 1. the edge is degenerated (-1)
//! 2. the edge does not contain 3d curve and pcurves (-2)
//! 3. projection algorithm failed (-3)
Standard_EXPORT Standard_Integer ComputePE (const gp_Pnt& theP, const Standard_Real theTolP, const TopoDS_Edge& theE, Standard_Real& theT);
Standard_EXPORT Standard_Integer ComputePE (const gp_Pnt& theP, const Standard_Real theTolP,
const TopoDS_Edge& theE, Standard_Real& theT,
Standard_Real& theDist);
//! Computes parameter of the vertex aV on

2
tests/boolean/gdml_private/E4
View File

@ -1,2 +1,2 @@
source [locate_data_file 20000_casemate-inf.prt.2.gdml.tcl]
checkprops result -s 2.94595e+006

2
tests/boolean/gdml_private/E5
View File

@ -1,2 +1,2 @@
source [locate_data_file 20000_casemate-sup.prt.2.gdml.tcl]
checkprops result -s 3.02422e+006

2
tests/boolean/gdml_private/E6
View File

@ -1,2 +1,2 @@
source [locate_data_file 20000_casemate.asm.2.gdml.tcl]
checkprops result -s 5.97016e+006

2
tests/boolean/gdml_private/E7
View File

@ -1,2 +1,2 @@
source [locate_data_file 20000_casemate_inf.asm.2.gdml.tcl]
checkprops result -s 2.94595e+006

2
tests/boolean/gdml_private/E8
View File

@ -1,2 +1,2 @@
source [locate_data_file 20000_casemate_ne.asm.2.gdml.tcl]
checkprops result -s 5.97016e+006

2
tests/boolean/gdml_private/E9
View File

@ -1,2 +1,2 @@
source [locate_data_file 20000_casemate_no.asm.2.gdml.tcl]
checkprops result -s 5.97016e+006

2
tests/boolean/gdml_private/F1
View File

@ -1,2 +1,2 @@
source [locate_data_file 20000_casemate_se.asm.2.gdml.tcl]
checkprops result -s 5.97016e+006

2
tests/boolean/gdml_private/F2
View File

@ -1,2 +1,2 @@
source [locate_data_file 20000_casemate_so.asm.2.gdml.tcl]
checkprops result -s 5.97016e+006

2
tests/boolean/gdml_private/F3
View File

@ -1,2 +1,2 @@
source [locate_data_file 20000_casemate_sup.asm.2.gdml.tcl]
checkprops result -s 3.02422e+006

2
tests/boolean/gdml_private/ZI5
View File

@ -1,2 +1,4 @@
puts "TODO ?OCC27052 All: Faulty shapes in variables faulty_1 to"
source [locate_data_file equipement_chambre.asm.1.gdml.tcl]

1
tests/boolean/gdml_private/ZI7
View File

@ -1,3 +1,4 @@
puts "TODO ?OCC27052 All: Faulty shapes in variables faulty_1 to"
puts "TODO OCC26018 ALL: bopcheck failed"
source [locate_data_file mos2014-asm-scf-final.asm.1.gdml.tcl]

1
tests/boolean/gdml_private/ZJ7
View File

@ -1,3 +1,4 @@
puts "TODO ?OCC27052 All: Faulty shapes in variables faulty_1 to"
puts "TODO OCC26018 ALL: bopcheck failed"
source [locate_data_file mos2014-scf-final.prt.1.gdml.tcl]

14
tests/bugs/modalg_6/bug27032 Normal file
View File

@ -0,0 +1,14 @@
puts "========"
puts "OCC27032"
puts "========"
puts ""
##########################################################################################
# Result of bcut has the same volume as the object
##########################################################################################
restore [locate_data_file OCC27032_sh.brep] a
explode a
bcut result a_1 a_2
checkprops result -s 1.80949e+006