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

0024597: Missing internal vertex in the result of General Fuse Operation

Browse Source 
Changes:
class BOPDS_DS
   - method:
void BOPDS_DS::Init()
   - method:
void BOPDS_DS::FaceInfoIn
  (const Standard_Integer theF,
   BOPDS_IndexedMapOfPaveBlock& theMPB,
   BOPCol_MapOfInteger& theMI)
Add the information about internal vertices on faces to the Data Structure

Test case for issue CR24597
This commit is contained in:
pkv 2014-02-06 11:21:47 +04:00 committed by abv
parent a6b634c30a
commit 8849da168a
2 changed files with 69 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/BOPDS/BOPDS_DS.cxx
View File

@ -322,6 +322,7 @@ void BOPDS_DS::Init()
Standard_Integer n1, n2, n3; Standard_Integer n1, n2, n3;
Standard_Real aTol; Standard_Real aTol;
TopAbs_ShapeEnum aTS; TopAbs_ShapeEnum aTS;
TopoDS_Iterator aItS;
BOPCol_ListIteratorOfListOfInteger aIt1, aIt2, aIt3; BOPCol_ListIteratorOfListOfInteger aIt1, aIt2, aIt3;
BOPCol_ListIteratorOfListOfShape aIt; BOPCol_ListIteratorOfListOfShape aIt;
BOPDS_IndexRange aR; BOPDS_IndexRange aR;
@ -522,6 +523,16 @@ void BOPDS_DS::Init()
} }
}//for (; aIt1.More(); aIt1.Next()) { }//for (; aIt1.More(); aIt1.Next()) {
// //
// pure internal vertices on the face
aItS.Initialize(aS);
for (; aItS.More(); aItS.Next()) {
const TopoDS_Shape& aSx=aItS.Value();
if (aSx.ShapeType()==TopAbs_VERTEX){
nV=Index(aSx);
aMI.Add(nV);
}
}
//
// //
// For a Face: change wires for BRep sub-shapes // For a Face: change wires for BRep sub-shapes
aLW.Clear(); aLW.Clear();
@ -1272,9 +1283,25 @@ void BOPDS_DS::FaceInfoIn(const Standard_Integer theF,
BOPDS_IndexedMapOfPaveBlock& theMPB, BOPDS_IndexedMapOfPaveBlock& theMPB,
BOPCol_MapOfInteger& theMI) BOPCol_MapOfInteger& theMI)
{ {
Standard_Integer i, aNbVF, aNbEF, nV, nE; Standard_Integer i, aNbVF, aNbEF, nV, nE, nVSD;
TopoDS_Iterator aItS;
BOPDS_ListIteratorOfListOfPaveBlock aItPB; BOPDS_ListIteratorOfListOfPaveBlock aItPB;
// //
// 1. Pure internal vertices on the face
const TopoDS_Shape& aF=Shape(theF);
aItS.Initialize(aF);
for (; aItS.More(); aItS.Next()) {
const TopoDS_Shape& aSx=aItS.Value();
if (aSx.ShapeType()==TopAbs_VERTEX){
nV=Index(aSx);
if (HasShapeSD(nV, nVSD)) {
nV=nVSD;
}
theMI.Add(nV);
}
}
//
// 2. aVFs
BOPDS_VectorOfInterfVF& aVFs=InterfVF(); BOPDS_VectorOfInterfVF& aVFs=InterfVF();
aNbVF=aVFs.Extent(); aNbVF=aVFs.Extent();
for (i=0; i<aNbVF; ++i) { for (i=0; i<aNbVF; ++i) {
@ -1285,6 +1312,7 @@ void BOPDS_DS::FaceInfoIn(const Standard_Integer theF,
} }
} }
// //
// 3. aEFs
BOPDS_VectorOfInterfEF& aEFs=InterfEF(); BOPDS_VectorOfInterfEF& aEFs=InterfEF();
aNbEF=aEFs.Extent(); aNbEF=aEFs.Extent();
for (i=0; i<aNbEF; ++i) { for (i=0; i<aNbEF; ++i) {

40
tests/bugs/modalg_5/bug24597 Normal file
View File

@ -0,0 +1,40 @@
puts "========="
puts "OCC24597"
puts "========="
puts ""
###########################################################
# Missing internal vertex in the result of General Fuse Operation
###########################################################
cylinder c1 20
trimv c1 c1 0 50
mkface b1 c1
vertex v1 0 20 25
orientation v1 I
add v1 b1
box b2 -30 -30 5 60 60 40
# add the arguments
bclearobjects
bcleartools
baddobjects b1 b2
# intersection step
bfillds
# building step
bbuild result
set square 33136.3
set nb_v_good 13
set nb_e_good 19
set nb_w_good 13
set nb_f_good 11
set nb_sh_good 2
set nb_sol_good 2
set nb_compsol_good 0
set nb_compound_good 1
set nb_shape_good 61
set 2dviewer 1