From: jfa Date: Thu, 12 Apr 2007 09:33:42 +0000 (+0000) Subject: Fix bug 15567: MakeFuse() for compounds of faces raises error. X-Git-Tag: V3_2_6pre4 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1d4b5b2a08784fdcf51a4bb0aba832ead67e8d9a;p=modules%2Fgeom.git Fix bug 15567: MakeFuse() for compounds of faces raises error. --- diff --git a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx index 1ee33f4e1..4bf020b61 100644 --- a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx @@ -237,20 +237,23 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(TFunction_Logbook& log) const AddSimpleShapes(aShape1, listShape1); 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); - for (; it1.More(); it1.Next()) { + for (; it1.More() && !isIntersect; it1.Next()) { TopoDS_Shape aValue1 = it1.Value(); TopTools_ListIteratorOfListOfShape it2 (listShape1); - for (; it2.More(); it2.Next()) { + 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_VERTEX); + TopExp_Explorer anExp (aSect, TopAbs_EDGE); 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); + 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()) { TopoDS_Shape aValue1 = it1.Value(); TopTools_ListIteratorOfListOfShape it2 (listShape2); @@ -269,9 +296,9 @@ Standard_Integer GEOMImpl_BooleanDriver::Execute(TFunction_Logbook& log) const BRepAlgoAPI_Section BO (aValue1, aValue2); if (BO.IsDone()) { TopoDS_Shape aSect = BO.Shape(); - TopExp_Explorer anExp (aSect, TopAbs_VERTEX); + TopExp_Explorer anExp (aSect, TopAbs_EDGE); 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"); } } }