ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-05-14 01:50:48 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug 15567: MakeFuse() for compounds of faces raises error.

Browse Source
This commit is contained in:
jfa 2007-04-12 09:33:42 +00:00
parent ca2d793695
commit 1d4b5b2a08
1 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/GEOMImpl/GEOMImpl_BooleanDriver.cxx
View File

@ -237,20 +237,23 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(TFunction_Logbook& log) const
AddSimpleShapes(aShape1, listShape1); AddSimpleShapes(aShape1, listShape1);
AddSimpleShapes(aShape2, listShape2); AddSimpleShapes(aShape2, listShape2);
if (listShape1.Extent() > 1) { Standard_Boolean isIntersect = Standard_False;
if (listShape1.Extent() > 1 && !isIntersect) {
// check intersections inside the first compound
TopTools_ListIteratorOfListOfShape it1 (listShape1); TopTools_ListIteratorOfListOfShape it1 (listShape1);
for (; it1.More(); it1.Next()) { for (; it1.More() && !isIntersect; it1.Next()) {
TopoDS_Shape aValue1 = it1.Value(); TopoDS_Shape aValue1 = it1.Value();
TopTools_ListIteratorOfListOfShape it2 (listShape1); TopTools_ListIteratorOfListOfShape it2 (listShape1);
for (; it2.More(); it2.Next()) { for (; it2.More() && !isIntersect; it2.Next()) {
TopoDS_Shape aValue2 = it2.Value(); TopoDS_Shape aValue2 = it2.Value();
if (aValue2 != aValue1) { if (aValue2 != aValue1) {
BRepAlgoAPI_Section BO (aValue1, aValue2); BRepAlgoAPI_Section BO (aValue1, aValue2);
if (BO.IsDone()) { if (BO.IsDone()) {
TopoDS_Shape aSect = BO.Shape(); TopoDS_Shape aSect = BO.Shape();
TopExp_Explorer anExp (aSect, TopAbs_VERTEX); TopExp_Explorer anExp (aSect, TopAbs_EDGE);
if (anExp.More()) { if (anExp.More()) {
StdFail_NotDone::Raise("Bad first shape for Fuse: compound with intersecting sub-shapes"); isIntersect = Standard_True;
} }
} }
} }
@ -258,8 +261,32 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(TFunction_Logbook& log) const
} }
} }
if (listShape2.Extent() > 1) { if (listShape2.Extent() > 1 && !isIntersect) {
// check intersections inside the second compound
TopTools_ListIteratorOfListOfShape it1 (listShape2); TopTools_ListIteratorOfListOfShape it1 (listShape2);
for (; it1.More() && !isIntersect; it1.Next()) {
TopoDS_Shape aValue1 = it1.Value();
TopTools_ListIteratorOfListOfShape it2 (listShape2);
for (; it2.More() && !isIntersect; it2.Next()) {
TopoDS_Shape aValue2 = it2.Value();
if (aValue2 != aValue1) {
BRepAlgoAPI_Section BO (aValue1, aValue2);
if (BO.IsDone()) {
TopoDS_Shape aSect = BO.Shape();
TopExp_Explorer anExp (aSect, TopAbs_EDGE);
if (anExp.More()) {
isIntersect = Standard_True;
}
}
}
}
}
}
if (isIntersect) {
// have intersections inside compounds
// check intersections between compounds
TopTools_ListIteratorOfListOfShape it1 (listShape1);
for (; it1.More(); it1.Next()) { for (; it1.More(); it1.Next()) {
TopoDS_Shape aValue1 = it1.Value(); TopoDS_Shape aValue1 = it1.Value();
TopTools_ListIteratorOfListOfShape it2 (listShape2); TopTools_ListIteratorOfListOfShape it2 (listShape2);
@ -269,9 +296,9 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(TFunction_Logbook& log) const
BRepAlgoAPI_Section BO (aValue1, aValue2); BRepAlgoAPI_Section BO (aValue1, aValue2);
if (BO.IsDone()) { if (BO.IsDone()) {
TopoDS_Shape aSect = BO.Shape(); TopoDS_Shape aSect = BO.Shape();
TopExp_Explorer anExp (aSect, TopAbs_VERTEX); TopExp_Explorer anExp (aSect, TopAbs_EDGE);
if (anExp.More()) { if (anExp.More()) {
StdFail_NotDone::Raise("Bad second shape for Fuse: compound with intersecting sub-shapes"); StdFail_NotDone::Raise("Bad argument for Fuse: compound with intersecting sub-shapes");
} }
} }
} }