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

0027987: CellsBuilder algorithm does not find shared common parts of the arguments

Browse Source 
Treatment of the possibility of shared parts has been added.
This commit is contained in:
emv 2016-10-21 11:09:34 +03:00 committed by apn
parent 73ddbb9acc
commit dd115e1227
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/BOPAlgo/BOPAlgo_CellsBuilder.cxx
View File

@ -203,27 +203,25 @@ void BOPAlgo_CellsBuilder::IndexParts()
aExp.Init(aS, myType); aExp.Init(aS, myType);
for (; aExp.More(); aExp.Next()) { for (; aExp.More(); aExp.Next()) {
const TopoDS_Shape& aST = aExp.Current(); const TopoDS_Shape& aST = aExp.Current();
if (!myImages.IsBound(aST)) { const BOPCol_ListOfShape* pLSIm = myImages.Seek(aST);
BOPCol_ListOfShape aLS; if (!pLSIm) {
aLS.Append(aS); BOPCol_ListOfShape* pLS = myIndex.ChangeSeek(aST);
myIndex.Add(aST, aLS); if (!pLS) {
pLS = &myIndex(myIndex.Add(aST, BOPCol_ListOfShape()));
}
pLS ->Append(aS);
continue; continue;
} }
// //
const BOPCol_ListOfShape& aLSIm = myImages.Find(aST); aItIm.Initialize(*pLSIm);
aItIm.Initialize(aLSIm);
for (; aItIm.More(); aItIm.Next()) { for (; aItIm.More(); aItIm.Next()) {
const TopoDS_Shape& aSTIm = aItIm.Value(); const TopoDS_Shape& aSTIm = aItIm.Value();
// //
if (myIndex.Contains(aSTIm)) { BOPCol_ListOfShape* pLS = myIndex.ChangeSeek(aSTIm);
BOPCol_ListOfShape& aLS = myIndex.ChangeFromKey(aSTIm); if (!pLS) {
aLS.Append(aS); pLS = &myIndex(myIndex.Add(aSTIm, BOPCol_ListOfShape()));
}
else {
BOPCol_ListOfShape aLS;
aLS.Append(aS);
myIndex.Add(aSTIm, aLS);
} }
pLS ->Append(aS);
} // for (; aItIm.More(); aItIm.Next()) { } // for (; aItIm.More(); aItIm.Next()) {
} // for (; aExp.More(); aExp.Next()) { } // for (; aExp.More(); aExp.Next()) {
} // for (; aIt.More(); aIt.Next()) { } // for (; aIt.More(); aIt.Next()) {

21
tests/bugs/modalg_6/bug27987 Normal file
View File

@ -0,0 +1,21 @@
puts "========"
puts "OCC27987"
puts "========"
puts ""
#################################################
# CellsBuilder algorithm does not find shared common parts of the arguments
#################################################
restore [locate_data_file bug27987.brep] b
explode b
bclearobjects
bcleartools
baddobjects b_1
baddtools b_2
bfillds
bcbuild rx
bcadd result b_1 1 b_2 1
checknbshapes result -face 1
checkview -display result -2d -path ${imagedir}/${test_image}.png