OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0030422: Random behaviour of BRepAdaptor_CompCurve

Browse Source 
BRepTools/BRepTools_WireExplorer.cxx - replace MapOfShape vmap by IndexedMapOfShape
to avoid random behavior of algorithm

bugs/moddata_3/bug30422 - new test case added
This commit is contained in:
ifv
2021-08-19 15:05:53 +03:00
committed by smoskvin
parent 1e6b2065b5
commit e2421df543
2 changed files with 83 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/BRepTools/BRepTools_WireExplorer.cxx
View File

@@ -226,7 +226,7 @@ void BRepTools_WireExplorer::Init(const TopoDS_Wire& W,
}
// map of vertices to know if the wire is open
TopTools_MapOfShape vmap;
TopTools_IndexedMapOfShape vmap;
// map of infinite edges
TopTools_MapOfShape anInfEmap;
@@ -254,15 +254,23 @@ void BRepTools_WireExplorer::Init(const TopoDS_Wire& W,
// add or remove in the vertex map
V1.Orientation(TopAbs_FORWARD);
if (!vmap.Add(V1))
vmap.Remove(V1);
Standard_Integer currsize = vmap.Extent(),
ind = vmap.Add(V1);
if (currsize >= ind)
{
vmap.RemoveKey(V1);
}
}
if (!V2.IsNull())
{
V2.Orientation(TopAbs_REVERSED);
if (!vmap.Add(V2))
vmap.Remove(V2);
Standard_Integer currsize = vmap.Extent(),
ind = vmap.Add(V2);
if (currsize >= ind)
{
vmap.RemoveKey(V2);
}
}
if (V1.IsNull() || V2.IsNull())
@@ -295,12 +303,21 @@ void BRepTools_WireExplorer::Init(const TopoDS_Wire& W,
// if vmap is not empty the wire is open, let us find the first vertex
if (!vmap.IsEmpty()) {
TopTools_MapIteratorOfMapOfShape itt(vmap);
while (itt.Key().Orientation() != TopAbs_FORWARD) {
itt.Next();
if (!itt.More()) break;
//TopTools_MapIteratorOfMapOfShape itt(vmap);
//while (itt.Key().Orientation() != TopAbs_FORWARD) {
// itt.Next();
// if (!itt.More()) break;
//}
//if (itt.More()) V1 = TopoDS::Vertex(itt.Key());
Standard_Integer ind = 0;
for (ind = 1; ind <= vmap.Extent(); ++ind)
{
if (vmap(ind).Orientation() == TopAbs_FORWARD)
{
V1 = TopoDS::Vertex(vmap(ind));
break;
}
}
if (itt.More()) V1 = TopoDS::Vertex(itt.Key());
}
else {
// The wire is infinite Try to find the first vertex. It may be NULL.