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

0025365: Regressions after changes in IsClosed flag

Browse Source 
Restore previous behavior of BRep_Tool::IsClosed() for shells: empty shells and shells containing only INTERNAL or EXTERNAL sub-shapes are considered non-closed.
This commit is contained in:
abv 2014-10-13 20:44:33 +04:00 committed by bugmaster
parent 6262a3032c
commit 94dea18e8b
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/BRep/BRep_Tool.cxx
View File

@ -1458,28 +1458,34 @@ Standard_Boolean BRep_Tool::IsClosed (const TopoDS_Shape& theShape)
if (theShape.ShapeType() == TopAbs_SHELL || theShape.ShapeType() == TopAbs_SOLID) if (theShape.ShapeType() == TopAbs_SHELL || theShape.ShapeType() == TopAbs_SOLID)
{ {
NCollection_Map<TopoDS_Shape, TopTools_ShapeMapHasher> aMap (101, new NCollection_IncAllocator); NCollection_Map<TopoDS_Shape, TopTools_ShapeMapHasher> aMap (101, new NCollection_IncAllocator);
for (TopExp_Explorer exp (theShape, TopAbs_EDGE); exp.More(); exp.Next()) TopExp_Explorer exp (theShape.Oriented(TopAbs_FORWARD), TopAbs_EDGE);
Standard_Boolean hasBound = Standard_False;
for (; exp.More(); exp.Next())
{ {
const TopoDS_Edge& E = TopoDS::Edge(exp.Current()); const TopoDS_Edge& E = TopoDS::Edge(exp.Current());
if (BRep_Tool::Degenerated(E) || E.Orientation() == TopAbs_INTERNAL || E.Orientation() == TopAbs_EXTERNAL) if (BRep_Tool::Degenerated(E) || E.Orientation() == TopAbs_INTERNAL || E.Orientation() == TopAbs_EXTERNAL)
continue; continue;
hasBound = Standard_True;
if (!aMap.Add(E)) if (!aMap.Add(E))
aMap.Remove(E); aMap.Remove(E);
} }
return aMap.IsEmpty(); return hasBound && aMap.IsEmpty();
} }
else if (theShape.ShapeType() == TopAbs_WIRE) else if (theShape.ShapeType() == TopAbs_WIRE)
{ {
NCollection_Map<TopoDS_Shape, TopTools_ShapeMapHasher> aMap (101, new NCollection_IncAllocator); NCollection_Map<TopoDS_Shape, TopTools_ShapeMapHasher> aMap (101, new NCollection_IncAllocator);
for (TopExp_Explorer exp (theShape, TopAbs_VERTEX); exp.More(); exp.Next()) TopExp_Explorer exp (theShape.Oriented(TopAbs_FORWARD), TopAbs_VERTEX);
Standard_Boolean hasBound = Standard_False;
for (; exp.More(); exp.Next())
{ {
const TopoDS_Shape& V = exp.Current(); const TopoDS_Shape& V = exp.Current();
if (V.Orientation() == TopAbs_INTERNAL || V.Orientation() == TopAbs_EXTERNAL) if (V.Orientation() == TopAbs_INTERNAL || V.Orientation() == TopAbs_EXTERNAL)
continue; continue;
hasBound = Standard_True;
if (!aMap.Add(V)) if (!aMap.Add(V))
aMap.Remove(V); aMap.Remove(V);
} }
return aMap.IsEmpty(); return hasBound && aMap.IsEmpty();
} }
return theShape.Closed(); return theShape.Closed();
} }