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

0028782: Shape sewing behavior not consistent for the same CAD file

Browse Source 
Get rid of iterations on maps with shape key by replacing simple maps with indexed maps. So iteration is done on integer key.

The map containers have been updated to insert into them type definitions of key and value.

The new methods RemoveKey() and RemoveFromIndex() have been added to indexed [data] map to be able to remove an arbitrary key from the map.

All the code in OCCT has been updated where RemoveLast() and Substitute() methods were used to remove a key from indexed [data] map.
This commit is contained in:
msv 2017-05-25 17:02:07 +03:00 committed by bugmaster
parent 58e5d30edc
commit 3f5aa017e7
16 changed files with 268 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/BRepAlgo/BRepAlgo_Loop.cxx
View File

@ -203,31 +203,6 @@ static TopoDS_Vertex UpdateClosedEdge(const TopoDS_Edge& E,
return VRes; return VRes;
} }
//=======================================================================
//function : RemoveFromMVE
//purpose :
//=======================================================================
static void RemoveFromMVE(TopTools_IndexedDataMapOfShapeListOfShape& MVE,
const TopoDS_Shape& theVertex)
{
// remove from the indexed data map by substituting last item instead of removed
Standard_Integer iV = MVE.FindIndex(theVertex);
if (iV > 0)
{
Standard_Integer iLast = MVE.Extent();
if (iV == iLast)
MVE.RemoveLast();
else
{
TopoDS_Shape aVertex = MVE.FindKey(iLast);
TopTools_ListOfShape anEdges = MVE(iLast);
MVE.RemoveLast();
MVE.Substitute(iV, aVertex, anEdges);
}
}
}
//======================================================================= //=======================================================================
//function : RemovePendingEdges //function : RemovePendingEdges
//purpose : //purpose :
@ -267,7 +242,7 @@ static void RemovePendingEdges(TopTools_IndexedDataMapOfShapeListOfShape& MVE)
if (!VToRemove.IsEmpty()) { if (!VToRemove.IsEmpty()) {
YaSupress = Standard_True; YaSupress = Standard_True;
for (itl.Initialize(VToRemove); itl.More(); itl.Next()) { for (itl.Initialize(VToRemove); itl.More(); itl.Next()) {
RemoveFromMVE(MVE, itl.Value()); MVE.RemoveKey(itl.Value());
} }
if (!EToRemove.IsEmpty()) { if (!EToRemove.IsEmpty()) {
for (Standard_Integer iV = 1; iV <= MVE.Extent(); iV++) { for (Standard_Integer iV = 1; iV <= MVE.Extent(); iV++) {
@ -667,7 +642,7 @@ void BRepAlgo_Loop::Perform()
if (!End) { if (!End) {
CE = NE; CE = NE;
if (MVE.FindFromKey(CV).IsEmpty()) if (MVE.FindFromKey(CV).IsEmpty())
RemoveFromMVE(MVE, CV); MVE.RemoveKey(CV);
} }
} }
} }

326
src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
View File

@ -98,12 +98,9 @@
#include <TColStd_Array1OfInteger.hxx> #include <TColStd_Array1OfInteger.hxx>
#include <TColStd_Array1OfReal.hxx> #include <TColStd_Array1OfReal.hxx>
#include <TColStd_Array2OfReal.hxx> #include <TColStd_Array2OfReal.hxx>
#include <TColStd_DataMapIteratorOfDataMapOfIntegerListOfInteger.hxx>
#include <TColStd_DataMapOfIntegerListOfInteger.hxx>
#include <TColStd_IndexedMapOfInteger.hxx> #include <TColStd_IndexedMapOfInteger.hxx>
#include <TColStd_ListIteratorOfListOfInteger.hxx> #include <TColStd_ListIteratorOfListOfInteger.hxx>
#include <TColStd_ListOfInteger.hxx> #include <TColStd_ListOfInteger.hxx>
#include <TColStd_MapIteratorOfMapOfInteger.hxx>
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>
#include <TColStd_SequenceOfReal.hxx> #include <TColStd_SequenceOfReal.hxx>
#include <TopAbs.hxx> #include <TopAbs.hxx>
@ -120,13 +117,9 @@
#include <TopoDS_Vertex.hxx> #include <TopoDS_Vertex.hxx>
#include <TopoDS_Wire.hxx> #include <TopoDS_Wire.hxx>
#include <TopTools_Array1OfShape.hxx> #include <TopTools_Array1OfShape.hxx>
#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
#include <TopTools_DataMapOfShapeInteger.hxx>
#include <TopTools_DataMapOfShapeListOfShape.hxx> #include <TopTools_DataMapOfShapeListOfShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx> #include <TopTools_ListIteratorOfListOfShape.hxx>
#include <TopTools_ListOfShape.hxx> #include <TopTools_ListOfShape.hxx>
#include <TopTools_MapIteratorOfMapOfShape.hxx>
#include <TopTools_MapOfShape.hxx> #include <TopTools_MapOfShape.hxx>
#include <TopTools_SequenceOfShape.hxx> #include <TopTools_SequenceOfShape.hxx>
@ -1438,7 +1431,6 @@ void BRepBuilderAPI_Sewing::AnalysisNearestEdges(const TopTools_SequenceOfShape&
} }
} }
} }
} }
Standard_Integer i2 = seqIndCandidate.Length(); Standard_Integer i2 = seqIndCandidate.Length();
@ -1449,12 +1441,7 @@ void BRepBuilderAPI_Sewing::AnalysisNearestEdges(const TopTools_SequenceOfShape&
seqIndCandidate.Remove(i2); seqIndCandidate.Remove(i2);
seqOrientations.Remove(i2); seqOrientations.Remove(i2);
} }
} }
//for(TColStd_MapIteratorOfMapOfInteger IMap(MapIndex); IMap.More(); IMap.Next()) {
// seqIndCandidate.Remove(IMap.Key());
// seqOrientations.Remove(IMap.Key());
//}
} }
//======================================================================= //=======================================================================
@ -2245,7 +2232,7 @@ void BRepBuilderAPI_Sewing::FaceAnalysis(const Handle(Message_ProgressIndicator)
BRep_Builder B; BRep_Builder B;
TopTools_MapOfShape SmallEdges; TopTools_MapOfShape SmallEdges;
TopTools_DataMapOfShapeListOfShape GluedVertices; TopTools_IndexedDataMapOfShapeListOfShape GluedVertices;
Standard_Integer i = 1; Standard_Integer i = 1;
Message_ProgressSentry aPS (thePI, "Shape analysis", 0, myOldShapes.Extent(), 1); Message_ProgressSentry aPS (thePI, "Shape analysis", 0, myOldShapes.Extent(), 1);
for (i = 1; i <= myOldShapes.Extent() && aPS.More(); i++, aPS.Next()) { for (i = 1; i <= myOldShapes.Extent() && aPS.More(); i++, aPS.Next()) {
@ -2336,18 +2323,18 @@ void BRepBuilderAPI_Sewing::FaceAnalysis(const Handle(Message_ProgressIndicator)
// Store glued vertices // Store glued vertices
if (!nv1.IsSame(v1)) { if (!nv1.IsSame(v1)) {
TopTools_ListOfShape& vlist1 = GluedVertices(nv1); TopTools_ListOfShape& vlist1 = GluedVertices.ChangeFromKey(nv1);
// First vertex was already glued // First vertex was already glued
if (!nv2.IsSame(v2)) { if (!nv2.IsSame(v2)) {
// Merge lists of glued vertices // Merge lists of glued vertices
if (!nv1.IsSame(nv2)) { if (!nv1.IsSame(nv2)) {
TopTools_ListIteratorOfListOfShape liter(GluedVertices(nv2)); TopTools_ListIteratorOfListOfShape liter(GluedVertices.FindFromKey(nv2));
for (; liter.More(); liter.Next()) { for (; liter.More(); liter.Next()) {
TopoDS_Shape v = liter.Value(); TopoDS_Shape v = liter.Value();
myReShape->Replace(v,nv1.Oriented(v.Orientation())); myReShape->Replace(v,nv1.Oriented(v.Orientation()));
vlist1.Append(v); vlist1.Append(v);
} }
GluedVertices.UnBind(nv2); GluedVertices.RemoveKey(nv2);
} }
} }
else { else {
@ -2358,7 +2345,7 @@ void BRepBuilderAPI_Sewing::FaceAnalysis(const Handle(Message_ProgressIndicator)
} }
else if (!nv2.IsSame(v2)) { else if (!nv2.IsSame(v2)) {
// Add first vertex to the existing list // Add first vertex to the existing list
GluedVertices(nv2).Append(v1); GluedVertices.ChangeFromKey(nv2).Append(v1);
myReShape->Replace(v1,nv2.Oriented(v1.Orientation())); myReShape->Replace(v1,nv2.Oriented(v1.Orientation()));
} }
else if (!v1.IsSame(v2)) { else if (!v1.IsSame(v2)) {
@ -2368,7 +2355,7 @@ void BRepBuilderAPI_Sewing::FaceAnalysis(const Handle(Message_ProgressIndicator)
TopTools_ListOfShape vlist; TopTools_ListOfShape vlist;
vlist.Append(v1); vlist.Append(v1);
vlist.Append(v2); vlist.Append(v2);
GluedVertices.Bind(nv,vlist); GluedVertices.Add(nv,vlist);
myReShape->Replace(v1,nv.Oriented(v1.Orientation())); myReShape->Replace(v1,nv.Oriented(v1.Orientation()));
myReShape->Replace(v2,nv.Oriented(v2.Orientation())); myReShape->Replace(v2,nv.Oriented(v2.Orientation()));
} }
@ -2428,12 +2415,12 @@ void BRepBuilderAPI_Sewing::FaceAnalysis(const Handle(Message_ProgressIndicator)
} }
// Update glued vertices // Update glued vertices
TopTools_DataMapIteratorOfDataMapOfShapeListOfShape miter(GluedVertices); TopTools_IndexedDataMapOfShapeListOfShape::Iterator aMIter(GluedVertices);
for (; miter.More(); miter.Next()) { for (; aMIter.More(); aMIter.Next()) {
TopoDS_Vertex vnew = TopoDS::Vertex(miter.Key()); const TopoDS_Vertex& vnew = TopoDS::Vertex(aMIter.Key());
gp_XYZ coord(0.,0.,0.); gp_XYZ coord(0.,0.,0.);
Standard_Integer nbPoints = 0; Standard_Integer nbPoints = 0;
const TopTools_ListOfShape& vlist = miter.Value(); const TopTools_ListOfShape& vlist = aMIter.Value();
TopTools_ListIteratorOfListOfShape liter1(vlist); TopTools_ListIteratorOfListOfShape liter1(vlist);
for (; liter1.More(); liter1.Next()) { for (; liter1.More(); liter1.Next()) {
coord += BRep_Tool::Pnt(TopoDS::Vertex(liter1.Value())).XYZ(); coord += BRep_Tool::Pnt(TopoDS::Vertex(liter1.Value())).XYZ();
@ -2486,12 +2473,12 @@ void BRepBuilderAPI_Sewing::FindFreeBoundaries()
Standard_Integer i, nbShapes = myOldShapes.Extent(); Standard_Integer i, nbShapes = myOldShapes.Extent();
for (i = 1; i <= nbShapes; i++) { for (i = 1; i <= nbShapes; i++) {
// Retrieve new shape // Retrieve new shape
TopoDS_Shape shape = myOldShapes(i); const TopoDS_Shape& shape = myOldShapes(i);
if (shape.IsNull()) continue; if (shape.IsNull()) continue;
NewShapes.Add(shape); NewShapes.Add(shape);
// Explore shape to find all boundaries // Explore shape to find all boundaries
for (TopExp_Explorer eExp(shape,TopAbs_EDGE); eExp.More(); eExp.Next()) { for (TopExp_Explorer eExp(shape,TopAbs_EDGE); eExp.More(); eExp.Next()) {
TopoDS_Shape edge = eExp.Current(); const TopoDS_Shape& edge = eExp.Current();
if (!EdgeFaces.Contains(edge)) { if (!EdgeFaces.Contains(edge)) {
TopTools_ListOfShape listFaces; TopTools_ListOfShape listFaces;
EdgeFaces.Add(edge,listFaces); EdgeFaces.Add(edge,listFaces);
@ -2500,12 +2487,12 @@ void BRepBuilderAPI_Sewing::FindFreeBoundaries()
} }
// Fill map Edge -> Faces // Fill map Edge -> Faces
nbShapes = NewShapes.Extent(); nbShapes = NewShapes.Extent();
TopTools_MapOfShape mapFaces; TopTools_MapOfShape mapFaces;
for (i = 1; i <= nbShapes; i++) { for (i = 1; i <= nbShapes; i++) {
// Explore shape to find all faces // Explore shape to find all faces
TopExp_Explorer fExp(NewShapes.FindKey(i),TopAbs_FACE); TopExp_Explorer fExp(NewShapes.FindKey(i),TopAbs_FACE);
for (; fExp.More(); fExp.Next()) { for (; fExp.More(); fExp.Next()) {
TopoDS_Shape face = fExp.Current(); const TopoDS_Shape& face = fExp.Current();
if(mapFaces.Contains(face)) continue; if(mapFaces.Contains(face)) continue;
else else
mapFaces.Add(face); mapFaces.Add(face);
@ -2514,7 +2501,7 @@ void BRepBuilderAPI_Sewing::FindFreeBoundaries()
if(aIw.Value().ShapeType() != TopAbs_WIRE) continue; if(aIw.Value().ShapeType() != TopAbs_WIRE) continue;
for (TopoDS_Iterator aIIe(aIw.Value()); aIIe.More(); aIIe.Next()) { for (TopoDS_Iterator aIIe(aIw.Value()); aIIe.More(); aIIe.Next()) {
TopoDS_Shape edge = aIIe.Value(); const TopoDS_Shape& edge = aIIe.Value();
if (EdgeFaces.Contains(edge)) { if (EdgeFaces.Contains(edge)) {
EdgeFaces.ChangeFromKey(edge).Append(face); EdgeFaces.ChangeFromKey(edge).Append(face);
@ -2530,11 +2517,11 @@ void BRepBuilderAPI_Sewing::FindFreeBoundaries()
} }
} }
// Find free boundaries // Find free boundaries
nbShapes = EdgeFaces.Extent(); TopTools_IndexedDataMapOfShapeListOfShape::Iterator anIterEF(EdgeFaces);
for (i = 1; i <= nbShapes; i++) { for (; anIterEF.More(); anIterEF.Next()) {
TopTools_ListOfShape& listFaces = EdgeFaces(i); TopTools_ListOfShape& listFaces = anIterEF.ChangeValue();
Standard_Integer nbFaces = listFaces.Extent(); Standard_Integer nbFaces = listFaces.Extent();
TopoDS_Shape edge = EdgeFaces.FindKey(i); TopoDS_Shape edge = anIterEF.Key();
if(edge.Orientation() == TopAbs_INTERNAL) if(edge.Orientation() == TopAbs_INTERNAL)
continue; continue;
Standard_Boolean isSeam = Standard_False; Standard_Boolean isSeam = Standard_False;
@ -2624,47 +2611,46 @@ static Standard_Boolean CreateNewNodes(const TopTools_IndexedDataMapOfShapeShape
TopTools_IndexedDataMapOfShapeShape& aVertexNode, TopTools_IndexedDataMapOfShapeShape& aVertexNode,
TopTools_DataMapOfShapeListOfShape& aNodeEdges) TopTools_DataMapOfShapeListOfShape& aNodeEdges)
{ {
Standard_Integer i, nbNearest = NodeNearestNode.Extent();
// Create new nodes // Create new nodes
BRep_Builder B; BRep_Builder B;
TopTools_DataMapOfShapeShape OldNodeNewNode; TopTools_DataMapOfShapeShape OldNodeNewNode;
TopTools_DataMapOfShapeListOfShape NewNodeOldNodes; TopTools_IndexedDataMapOfShapeListOfShape NewNodeOldNodes;
for (i = 1; i <= nbNearest; i++) { TopTools_IndexedDataMapOfShapeShape::Iterator anIter(NodeNearestNode);
for (; anIter.More(); anIter.Next()) {
// Retrieve a pair of nodes to merge // Retrieve a pair of nodes to merge
TopoDS_Shape oldnode1 = NodeNearestNode.FindKey(i); const TopoDS_Shape& oldnode1 = anIter.Key();
TopoDS_Shape oldnode2 = NodeNearestNode(i); const TopoDS_Shape& oldnode2 = anIter.Value();
// Second node should also be in the map // Second node should also be in the map
if (!NodeNearestNode.Contains(oldnode2)) continue; if (!NodeNearestNode.Contains(oldnode2)) continue;
// Get new node for old node #1 // Get new node for old node #1
if (OldNodeNewNode.IsBound(oldnode1)) { if (OldNodeNewNode.IsBound(oldnode1)) {
TopoDS_Shape newnode1 = OldNodeNewNode(oldnode1); const TopoDS_Shape& newnode1 = OldNodeNewNode(oldnode1);
if (OldNodeNewNode.IsBound(oldnode2)) { if (OldNodeNewNode.IsBound(oldnode2)) {
TopoDS_Shape newnode2 = OldNodeNewNode(oldnode2); TopoDS_Shape newnode2 = OldNodeNewNode(oldnode2);
if (!newnode1.IsSame(newnode2)) { if (!newnode1.IsSame(newnode2)) {
// Change data for new node #2 // Change data for new node #2
TopTools_ListOfShape& lnode1 = NewNodeOldNodes(newnode1); TopTools_ListOfShape& lnode1 = NewNodeOldNodes.ChangeFromKey(newnode1);
TopTools_ListIteratorOfListOfShape itn(NewNodeOldNodes(newnode2)); TopTools_ListIteratorOfListOfShape itn(NewNodeOldNodes.FindFromKey(newnode2));
for (; itn.More(); itn.Next()) { for (; itn.More(); itn.Next()) {
TopoDS_Shape node2 = itn.Value(); const TopoDS_Shape& node2 = itn.Value();
lnode1.Append(node2); lnode1.Append(node2);
OldNodeNewNode(node2) = newnode1; OldNodeNewNode(node2) = newnode1;
} }
NewNodeOldNodes.UnBind(newnode2); NewNodeOldNodes.RemoveKey(newnode2);
} }
} }
else { else {
// Old node #2 is not bound - add to old node #1 // Old node #2 is not bound - add to old node #1
OldNodeNewNode.Bind(oldnode2,newnode1); OldNodeNewNode.Bind(oldnode2,newnode1);
NewNodeOldNodes(newnode1).Append(oldnode2); NewNodeOldNodes.ChangeFromKey(newnode1).Append(oldnode2);
} }
} }
else { else {
if (OldNodeNewNode.IsBound(oldnode2)) { if (OldNodeNewNode.IsBound(oldnode2)) {
// Old node #1 is not bound - add to old node #2 // Old node #1 is not bound - add to old node #2
TopoDS_Shape newnode2 = OldNodeNewNode(oldnode2); const TopoDS_Shape& newnode2 = OldNodeNewNode(oldnode2);
OldNodeNewNode.Bind(oldnode1,newnode2); OldNodeNewNode.Bind(oldnode1,newnode2);
NewNodeOldNodes(newnode2).Append(oldnode1); NewNodeOldNodes.ChangeFromKey(newnode2).Append(oldnode1);
} }
else { else {
// Nodes are not bound - create new node // Nodes are not bound - create new node
@ -2675,7 +2661,7 @@ static Standard_Boolean CreateNewNodes(const TopTools_IndexedDataMapOfShapeShape
TopTools_ListOfShape lnodes; TopTools_ListOfShape lnodes;
lnodes.Append(oldnode1); lnodes.Append(oldnode1);
lnodes.Append(oldnode2); lnodes.Append(oldnode2);
NewNodeOldNodes.Bind(newnode,lnodes); NewNodeOldNodes.Add(newnode,lnodes);
} }
} }
} }
@ -2683,22 +2669,22 @@ static Standard_Boolean CreateNewNodes(const TopTools_IndexedDataMapOfShapeShape
// Stop if no new nodes created // Stop if no new nodes created
if (!NewNodeOldNodes.Extent()) return Standard_False; if (!NewNodeOldNodes.Extent()) return Standard_False;
TopTools_DataMapIteratorOfDataMapOfShapeListOfShape iter1(NewNodeOldNodes); TopTools_IndexedDataMapOfShapeListOfShape::Iterator anIter1(NewNodeOldNodes);
for (; iter1.More(); iter1.Next()) { for (; anIter1.More(); anIter1.Next()) {
const TopoDS_Vertex& newnode = TopoDS::Vertex(iter1.Key()); const TopoDS_Vertex& newnode = TopoDS::Vertex(anIter1.Key());
// Calculate new node center point // Calculate new node center point
gp_XYZ theCoordinates(0.,0.,0.); gp_XYZ theCoordinates(0.,0.,0.);
TopTools_ListOfShape lvert; // Accumulate node vertices TopTools_ListOfShape lvert; // Accumulate node vertices
TopTools_MapOfShape medge; TopTools_MapOfShape medge;
TopTools_ListOfShape ledge; // Accumulate node edges TopTools_ListOfShape ledge; // Accumulate node edges
// Iterate on old nodes // Iterate on old nodes
TopTools_ListIteratorOfListOfShape itn(iter1.Value()); TopTools_ListIteratorOfListOfShape itn(anIter1.Value());
for (; itn.More(); itn.Next()) { for (; itn.More(); itn.Next()) {
const TopoDS_Shape& oldnode = itn.Value(); const TopoDS_Shape& oldnode = itn.Value();
// Iterate on node vertices // Iterate on node vertices
TopTools_ListIteratorOfListOfShape itv(NodeVertices.FindFromKey(oldnode)); TopTools_ListIteratorOfListOfShape itv(NodeVertices.FindFromKey(oldnode));
for (; itv.More(); itv.Next()) { for (; itv.More(); itv.Next()) {
TopoDS_Vertex vertex = TopoDS::Vertex(itv.Value()); const TopoDS_Vertex& vertex = TopoDS::Vertex(itv.Value());
// Change node for vertex // Change node for vertex
aVertexNode.ChangeFromKey(vertex) = newnode; aVertexNode.ChangeFromKey(vertex) = newnode;
// Accumulate coordinates // Accumulate coordinates
@ -2709,7 +2695,7 @@ static Standard_Boolean CreateNewNodes(const TopTools_IndexedDataMapOfShapeShape
const TopTools_ListOfShape& edges = aNodeEdges(oldnode); const TopTools_ListOfShape& edges = aNodeEdges(oldnode);
TopTools_ListIteratorOfListOfShape ite(edges); TopTools_ListIteratorOfListOfShape ite(edges);
for (; ite.More(); ite.Next()) { for (; ite.More(); ite.Next()) {
TopoDS_Shape edge = ite.Value(); const TopoDS_Shape& edge = ite.Value();
if (!medge.Contains(edge)) { medge.Add(edge); ledge.Append(edge); } if (!medge.Contains(edge)) { medge.Add(edge); ledge.Append(edge); }
} }
// Unbind old node edges // Unbind old node edges
@ -2781,14 +2767,14 @@ static Standard_Boolean GlueVertices(TopTools_IndexedDataMapOfShapeShape& aVerte
const Standard_Real Tolerance, const Standard_Real Tolerance,
const Handle(Message_ProgressIndicator)& theProgress) const Handle(Message_ProgressIndicator)& theProgress)
{ {
Standard_Integer i, nbVertices = aVertexNode.Extent();
// Create map of node -> vertices // Create map of node -> vertices
TopTools_IndexedDataMapOfShapeListOfShape NodeVertices; TopTools_IndexedDataMapOfShapeListOfShape NodeVertices;
BRepBuilderAPI_CellFilter aFilter (Tolerance); BRepBuilderAPI_CellFilter aFilter (Tolerance);
BRepBuilderAPI_VertexInspector anInspector (Tolerance); BRepBuilderAPI_VertexInspector anInspector (Tolerance);
for (i = 1; i <= nbVertices; i++) { TopTools_IndexedDataMapOfShapeShape::Iterator anIter1(aVertexNode);
TopoDS_Shape vertex = aVertexNode.FindKey(i); for (; anIter1.More(); anIter1.Next()) {
TopoDS_Vertex node = TopoDS::Vertex(aVertexNode(i)); const TopoDS_Shape& vertex = anIter1.Key();
const TopoDS_Vertex& node = TopoDS::Vertex(anIter1.Value());
if (NodeVertices.Contains(node)) { if (NodeVertices.Contains(node)) {
NodeVertices.ChangeFromKey(node).Append(vertex); NodeVertices.ChangeFromKey(node).Append(vertex);
} }
@ -2808,8 +2794,8 @@ static Standard_Boolean GlueVertices(TopTools_IndexedDataMapOfShapeShape& aVerte
// Merge nearest nodes // Merge nearest nodes
TopTools_IndexedDataMapOfShapeShape NodeNearestNode; TopTools_IndexedDataMapOfShapeShape NodeNearestNode;
Message_ProgressSentry aPS (theProgress, "Glueing nodes", 0, nbNodes, 1, Standard_True); Message_ProgressSentry aPS (theProgress, "Glueing nodes", 0, nbNodes, 1, Standard_True);
for (i = 1; i <= nbNodes && aPS.More(); i++, aPS.Next()) { for (Standard_Integer i = 1; i <= nbNodes && aPS.More(); i++, aPS.Next()) {
TopoDS_Vertex node1 = TopoDS::Vertex(NodeVertices.FindKey(i)); const TopoDS_Vertex& node1 = TopoDS::Vertex(NodeVertices.FindKey(i));
// Find near nodes // Find near nodes
gp_Pnt pt1 = BRep_Tool::Pnt (node1); gp_Pnt pt1 = BRep_Tool::Pnt (node1);
anInspector.SetCurrent (pt1.XYZ()); anInspector.SetCurrent (pt1.XYZ());
@ -2825,7 +2811,7 @@ static Standard_Boolean GlueVertices(TopTools_IndexedDataMapOfShapeShape& aVerte
//gp_Pnt pt1 = BRep_Tool::Pnt(node1); //gp_Pnt pt1 = BRep_Tool::Pnt(node1);
TColStd_ListIteratorOfListOfInteger iter1(anInspector.ResInd()); TColStd_ListIteratorOfListOfInteger iter1(anInspector.ResInd());
for (; iter1.More(); iter1.Next()) { for (; iter1.More(); iter1.Next()) {
TopoDS_Vertex node2 = TopoDS::Vertex(NodeVertices.FindKey(iter1.Value())); const TopoDS_Vertex& node2 = TopoDS::Vertex(NodeVertices.FindKey(iter1.Value()));
if (node1 == node2) continue; if (node1 == node2) continue;
// Retrieve list of edges for the second node // Retrieve list of edges for the second node
const TopTools_ListOfShape& ledges2 = aNodeEdges(node2); const TopTools_ListOfShape& ledges2 = aNodeEdges(node2);
@ -3140,14 +3126,15 @@ void BRepBuilderAPI_Sewing::Merging(const Standard_Boolean /* firstTime */,
BRep_Builder B; BRep_Builder B;
// TopTools_MapOfShape MergedEdges; // TopTools_MapOfShape MergedEdges;
Message_ProgressSentry aPS (thePI, "Merging bounds", 0, myBoundFaces.Extent(), 1); Message_ProgressSentry aPS (thePI, "Merging bounds", 0, myBoundFaces.Extent(), 1);
for (Standard_Integer i = 1; i <= myBoundFaces.Extent() && aPS.More(); i++, aPS.Next()) { TopTools_IndexedDataMapOfShapeListOfShape::Iterator anIterB(myBoundFaces);
for (; anIterB.More() && aPS.More(); anIterB.Next(), aPS.Next()) {
TopoDS_Shape bound = myBoundFaces.FindKey(i); const TopoDS_Shape& bound = anIterB.Key();
// If bound was already merged - continue // If bound was already merged - continue
if (myMergedEdges.Contains(bound)) continue; if (myMergedEdges.Contains(bound)) continue;
if (!myBoundFaces(i).Extent()) { if (!anIterB.Value().Extent()) {
// Merge free edge - only vertices // Merge free edge - only vertices
TopoDS_Vertex no1, no2; TopoDS_Vertex no1, no2;
TopExp::Vertices(TopoDS::Edge(bound),no1,no2); TopExp::Vertices(TopoDS::Edge(bound),no1,no2);
@ -3185,21 +3172,21 @@ void BRepBuilderAPI_Sewing::Merging(const Standard_Boolean /* firstTime */,
} }
// Merge with bound // Merge with bound
TopTools_DataMapOfShapeShape MergedWithBound; TopTools_IndexedDataMapOfShapeShape MergedWithBound;
if (!isPrevSplit) { if (!isPrevSplit) {
// Obtain sequence of edges merged with bound // Obtain sequence of edges merged with bound
TopTools_SequenceOfShape seqMergedWithBound; TopTools_SequenceOfShape seqMergedWithBound;
TColStd_SequenceOfBoolean seqMergedWithBoundOri; TColStd_SequenceOfBoolean seqMergedWithBoundOri;
if (MergedNearestEdges(bound,seqMergedWithBound,seqMergedWithBoundOri)) { if (MergedNearestEdges(bound,seqMergedWithBound,seqMergedWithBoundOri)) {
// Store bound in the map // Store bound in the map
MergedWithBound.Bind(bound,bound); MergedWithBound.Add(bound,bound);
// Iterate on edges merged with bound // Iterate on edges merged with bound
Standard_Integer ii = 1; Standard_Integer ii = 1;
while (ii <= seqMergedWithBound.Length()) { while (ii <= seqMergedWithBound.Length()) {
TopoDS_Shape iedge = seqMergedWithBound.Value(ii); TopoDS_Shape iedge = seqMergedWithBound.Value(ii);
// Remove edge if recorded as merged // Remove edge if recorded as merged
Standard_Boolean isRejected = (myMergedEdges.Contains(iedge) || Standard_Boolean isRejected = (myMergedEdges.Contains(iedge) ||
MergedWithBound.IsBound(iedge)); MergedWithBound.Contains(iedge));
if (!isRejected) { if (!isRejected) {
if (myBoundSections.IsBound(iedge)) { if (myBoundSections.IsBound(iedge)) {
// Edge is splitted - check sections // Edge is splitted - check sections
@ -3207,7 +3194,7 @@ void BRepBuilderAPI_Sewing::Merging(const Standard_Boolean /* firstTime */,
for (; lit.More() && !isRejected; lit.Next()) { for (; lit.More() && !isRejected; lit.Next()) {
const TopoDS_Shape& sec = lit.Value(); const TopoDS_Shape& sec = lit.Value();
// Remove edge (bound) if at least one of its sections already merged // Remove edge (bound) if at least one of its sections already merged
isRejected = (myMergedEdges.Contains(sec) || MergedWithBound.IsBound(sec)); isRejected = (myMergedEdges.Contains(sec) || MergedWithBound.Contains(sec));
} }
} }
if (!isRejected) { if (!isRejected) {
@ -3215,7 +3202,7 @@ void BRepBuilderAPI_Sewing::Merging(const Standard_Boolean /* firstTime */,
// Edge is a section - check bound // Edge is a section - check bound
const TopoDS_Shape& bnd = mySectionBound(iedge); const TopoDS_Shape& bnd = mySectionBound(iedge);
// Remove edge (section) if its bound already merged // Remove edge (section) if its bound already merged
isRejected = (myMergedEdges.Contains(bnd) || MergedWithBound.IsBound(bnd)); isRejected = (myMergedEdges.Contains(bnd) || MergedWithBound.Contains(bnd));
} }
} }
} }
@ -3227,7 +3214,7 @@ void BRepBuilderAPI_Sewing::Merging(const Standard_Boolean /* firstTime */,
} }
else { else {
// Process accepted edge // Process accepted edge
MergedWithBound.Bind(iedge,iedge); MergedWithBound.Add(iedge,iedge);
ii++; ii++;
} }
} }
@ -3243,34 +3230,36 @@ void BRepBuilderAPI_Sewing::Merging(const Standard_Boolean /* firstTime */,
// Process actually merged edges // Process actually merged edges
Standard_Integer nbActuallyMerged = 0; Standard_Integer nbActuallyMerged = 0;
for (ii = 1; ii <= nbMerged; ii++) { for (ii = 1; ii <= nbMerged; ii++) {
TopoDS_Shape iedge = seqMergedWithBound(ii); const TopoDS_Shape& iedge = seqMergedWithBound(ii);
if (ActuallyMerged.Contains(iedge)) { if (ActuallyMerged.Contains(iedge)) {
nbActuallyMerged++; nbActuallyMerged++;
// Record merged edge in the map // Record merged edge in the map
TopAbs_Orientation orient = iedge.Orientation(); TopAbs_Orientation orient = iedge.Orientation();
if (!isForward) orient = TopAbs::Reverse(orient); if (!isForward) orient = TopAbs::Reverse(orient);
if (!seqMergedWithBoundOri(ii)) orient = TopAbs::Reverse(orient); if (!seqMergedWithBoundOri(ii)) orient = TopAbs::Reverse(orient);
MergedWithBound.ChangeFind(iedge) = MergedEdge.Oriented(orient); MergedWithBound.ChangeFromKey(iedge) = MergedEdge.Oriented(orient);
} }
else MergedWithBound.UnBind(iedge); else
MergedWithBound.RemoveKey(iedge);
} }
if (nbActuallyMerged) { if (nbActuallyMerged) {
// Record merged bound in the map // Record merged bound in the map
TopAbs_Orientation orient = bound.Orientation(); TopAbs_Orientation orient = bound.Orientation();
if (!isForward) orient = TopAbs::Reverse(orient); if (!isForward) orient = TopAbs::Reverse(orient);
MergedWithBound.ChangeFind(bound) = MergedEdge.Oriented(orient); MergedWithBound.ChangeFromKey(bound) = MergedEdge.Oriented(orient);
} }
nbMerged = nbActuallyMerged; nbMerged = nbActuallyMerged;
} }
// Remove bound from the map if not finally merged // Remove bound from the map if not finally merged
if (!nbMerged) MergedWithBound.UnBind(bound); if (!nbMerged)
MergedWithBound.RemoveKey(bound);
} }
} }
const Standard_Boolean isMerged = !MergedWithBound.IsEmpty(); const Standard_Boolean isMerged = !MergedWithBound.IsEmpty();
// Merge with cutting sections // Merge with cutting sections
Handle(BRepTools_ReShape) SectionsReShape = new BRepTools_ReShape; Handle(BRepTools_ReShape) SectionsReShape = new BRepTools_ReShape;
TopTools_DataMapOfShapeShape MergedWithSections; TopTools_IndexedDataMapOfShapeShape MergedWithSections;
if (hasCuttingSections) { if (hasCuttingSections) {
// Iterate on cutting sections // Iterate on cutting sections
TopTools_ListIteratorOfListOfShape its(myBoundSections(bound)); TopTools_ListIteratorOfListOfShape its(myBoundSections(bound));
@ -3284,13 +3273,14 @@ void BRepBuilderAPI_Sewing::Merging(const Standard_Boolean /* firstTime */,
TColStd_SequenceOfBoolean seqMergedWithSectionOri; TColStd_SequenceOfBoolean seqMergedWithSectionOri;
if (MergedNearestEdges(section,seqMergedWithSection,seqMergedWithSectionOri)) { if (MergedNearestEdges(section,seqMergedWithSection,seqMergedWithSectionOri)) {
// Store section in the map // Store section in the map
MergedWithSections.Bind(section,section); MergedWithSections.Add(section,section);
// Iterate on edges merged with section // Iterate on edges merged with section
Standard_Integer ii = 1; Standard_Integer ii = 1;
while (ii <= seqMergedWithSection.Length()) { while (ii <= seqMergedWithSection.Length()) {
TopoDS_Shape iedge = seqMergedWithSection.Value(ii); TopoDS_Shape iedge = seqMergedWithSection.Value(ii);
// Remove edge if recorded as merged // Remove edge if recorded as merged
Standard_Boolean isRejected = (myMergedEdges.Contains(iedge) || MergedWithSections.IsBound(iedge)); Standard_Boolean isRejected = (myMergedEdges.Contains(iedge) ||
MergedWithSections.Contains(iedge));
if (!isRejected) { if (!isRejected) {
if (myBoundSections.IsBound(iedge)) { if (myBoundSections.IsBound(iedge)) {
// Edge is splitted - check sections // Edge is splitted - check sections
@ -3298,7 +3288,7 @@ void BRepBuilderAPI_Sewing::Merging(const Standard_Boolean /* firstTime */,
for (; lit.More() && !isRejected; lit.Next()) { for (; lit.More() && !isRejected; lit.Next()) {
const TopoDS_Shape& sec = lit.Value(); const TopoDS_Shape& sec = lit.Value();
// Remove edge (bound) if at least one of its sections already merged // Remove edge (bound) if at least one of its sections already merged
isRejected = (myMergedEdges.Contains(sec) || MergedWithSections.IsBound(sec)); isRejected = (myMergedEdges.Contains(sec) || MergedWithSections.Contains(sec));
} }
} }
if (!isRejected) { if (!isRejected) {
@ -3306,7 +3296,7 @@ void BRepBuilderAPI_Sewing::Merging(const Standard_Boolean /* firstTime */,
// Edge is a section - check bound // Edge is a section - check bound
const TopoDS_Shape& bnd = mySectionBound(iedge); const TopoDS_Shape& bnd = mySectionBound(iedge);
// Remove edge (section) if its bound already merged // Remove edge (section) if its bound already merged
isRejected = (myMergedEdges.Contains(bnd) || MergedWithSections.IsBound(bnd)); isRejected = (myMergedEdges.Contains(bnd) || MergedWithSections.Contains(bnd));
} }
} }
} }
@ -3318,7 +3308,7 @@ void BRepBuilderAPI_Sewing::Merging(const Standard_Boolean /* firstTime */,
} }
else { else {
// Process accepted edge // Process accepted edge
MergedWithSections.Bind(iedge,iedge); MergedWithSections.Add(iedge, iedge);
ii++; ii++;
} }
} }
@ -3334,31 +3324,33 @@ void BRepBuilderAPI_Sewing::Merging(const Standard_Boolean /* firstTime */,
// Process actually merged edges // Process actually merged edges
Standard_Integer nbActuallyMerged = 0; Standard_Integer nbActuallyMerged = 0;
for (ii = 1; ii <= nbMerged; ii++) { for (ii = 1; ii <= nbMerged; ii++) {
TopoDS_Shape iedge = seqMergedWithSection(ii); const TopoDS_Shape& iedge = seqMergedWithSection(ii);
if (ActuallyMerged.Contains(iedge)) { if (ActuallyMerged.Contains(iedge)) {
nbActuallyMerged++; nbActuallyMerged++;
// Record merged edge in the map // Record merged edge in the map
TopAbs_Orientation orient = iedge.Orientation(); TopAbs_Orientation orient = iedge.Orientation();
if (!isForward) orient = TopAbs::Reverse(orient); if (!isForward) orient = TopAbs::Reverse(orient);
if (!seqMergedWithSectionOri(ii)) orient = TopAbs::Reverse(orient); if (!seqMergedWithSectionOri(ii)) orient = TopAbs::Reverse(orient);
TopoDS_Shape oedge = MergedEdge.Oriented(orient); const TopoDS_Shape& oedge = MergedEdge.Oriented(orient);
MergedWithSections.ChangeFind(iedge) = oedge; MergedWithSections.ChangeFromKey(iedge) = oedge;
ReplaceEdge(myReShape->Apply(iedge),oedge,SectionsReShape); ReplaceEdge(myReShape->Apply(iedge),oedge,SectionsReShape);
} }
else MergedWithSections.UnBind(iedge); else
MergedWithSections.RemoveKey(iedge);
} }
if (nbActuallyMerged) { if (nbActuallyMerged) {
// Record merged section in the map // Record merged section in the map
TopAbs_Orientation orient = section.Orientation(); TopAbs_Orientation orient = section.Orientation();
if (!isForward) orient = TopAbs::Reverse(orient); if (!isForward) orient = TopAbs::Reverse(orient);
TopoDS_Shape oedge = MergedEdge.Oriented(orient); const TopoDS_Shape& oedge = MergedEdge.Oriented(orient);
MergedWithSections.ChangeFind(section) = oedge; MergedWithSections.ChangeFromKey(section) = oedge;
ReplaceEdge(myReShape->Apply(section),oedge,SectionsReShape); ReplaceEdge(myReShape->Apply(section),oedge,SectionsReShape);
} }
nbMerged = nbActuallyMerged; nbMerged = nbActuallyMerged;
} }
// Remove section from the map if not finally merged // Remove section from the map if not finally merged
if (!nbMerged) MergedWithSections.UnBind(section); if (!nbMerged)
MergedWithSections.RemoveKey(section);
} }
else if (isMerged) { else if (isMerged) {
// Reject merging of sections // Reject merging of sections
@ -3387,37 +3379,40 @@ void BRepBuilderAPI_Sewing::Merging(const Standard_Boolean /* firstTime */,
// Choose between bound and sections merging // Choose between bound and sections merging
if (isMerged && isMergedSplit && !isPrevSplit) { if (isMerged && isMergedSplit && !isPrevSplit) {
// Fill map of merged cutting sections // Fill map of merged cutting sections
TopTools_MapOfShape MapSplitEdges; TopTools_IndexedMapOfShape MapSplitEdges;
TopTools_DataMapIteratorOfDataMapOfShapeShape itm; TopTools_IndexedDataMapOfShapeShape::Iterator anItm(MergedWithSections);
for (itm.Initialize(MergedWithSections); itm.More(); itm.Next()) { for (; anItm.More(); anItm.Next()) {
TopoDS_Shape edge = itm.Key(); const TopoDS_Shape& edge = anItm.Key();
MapSplitEdges.Add(edge); MapSplitEdges.Add(edge);
} }
// Iterate on edges merged with bound // Iterate on edges merged with bound
for (itm.Initialize(MergedWithBound); itm.More(); itm.Next()) { TopTools_IndexedDataMapOfShapeShape::Iterator anItm1(MergedWithBound);
for (; anItm1.More(); anItm1.Next()) {
// Retrieve edge merged with bound // Retrieve edge merged with bound
TopoDS_Shape edge = itm.Key(); const TopoDS_Shape& edge = anItm1.Key();
// Remove edge from the map // Remove edge from the map
if (MapSplitEdges.Contains(edge)) MapSplitEdges.Remove(edge); if (MapSplitEdges.Contains(edge))
MapSplitEdges.RemoveKey(edge);
if (myBoundSections.IsBound(edge)) { if (myBoundSections.IsBound(edge)) {
// Edge has cutting sections // Edge has cutting sections
TopTools_ListIteratorOfListOfShape its(myBoundSections(edge)); TopTools_ListIteratorOfListOfShape its(myBoundSections(edge));
for (; its.More(); its.Next()) { for (; its.More(); its.Next()) {
TopoDS_Shape sec = its.Value(); const TopoDS_Shape& sec = its.Value();
// Remove section from the map // Remove section from the map
if (MapSplitEdges.Contains(sec)) MapSplitEdges.Remove(sec); if (MapSplitEdges.Contains(sec))
MapSplitEdges.RemoveKey(sec);
} }
} }
} }
// Calculate section merging tolerance // Calculate section merging tolerance
Standard_Real MinSplitTol = RealLast(); Standard_Real MinSplitTol = RealLast();
TopTools_MapIteratorOfMapOfShape im(MapSplitEdges); for (Standard_Integer ii = 1; ii <= MapSplitEdges.Extent(); ii++) {
for (; im.More(); im.Next()) { const TopoDS_Edge& edge = TopoDS::Edge
TopoDS_Edge edge = TopoDS::Edge(MergedWithSections(im.Key())); (MergedWithSections.FindFromKey(MapSplitEdges.FindKey(ii)));
MinSplitTol = Min(MinSplitTol,BRep_Tool::Tolerance(edge)); MinSplitTol = Min(MinSplitTol,BRep_Tool::Tolerance(edge));
} }
// Calculate bound merging tolerance // Calculate bound merging tolerance
TopoDS_Edge BoundEdge = TopoDS::Edge(MergedWithBound(bound)); const TopoDS_Edge& BoundEdge = TopoDS::Edge(MergedWithBound.FindFromKey(bound));
Standard_Real BoundEdgeTol = BRep_Tool::Tolerance(BoundEdge); Standard_Real BoundEdgeTol = BRep_Tool::Tolerance(BoundEdge);
isSplitted = ((MinSplitTol < BoundEdgeTol+MinTolerance()) || myNonmanifold); isSplitted = ((MinSplitTol < BoundEdgeTol+MinTolerance()) || myNonmanifold);
isSplitted = (!MapSplitEdges.IsEmpty() && isSplitted); isSplitted = (!MapSplitEdges.IsEmpty() && isSplitted);
@ -3427,28 +3422,30 @@ void BRepBuilderAPI_Sewing::Merging(const Standard_Boolean /* firstTime */,
// Merging of cutting sections // Merging of cutting sections
//myMergedEdges.Add(bound); //myMergedEdges.Add(bound);
myReShape->Replace(myReShape->Apply(bound),myReShape->Apply(BoundWire)); myReShape->Replace(myReShape->Apply(bound),myReShape->Apply(BoundWire));
TopTools_DataMapIteratorOfDataMapOfShapeShape itm(MergedWithSections); TopTools_IndexedDataMapOfShapeShape::Iterator anItm(MergedWithSections);
for (; itm.More(); itm.Next()) { for (; anItm.More(); anItm.Next()) {
TopoDS_Shape oldedge = itm.Key(); const TopoDS_Shape& oldedge = anItm.Key();
TopoDS_Shape newedge = SectionsReShape->Apply(itm.Value()); TopoDS_Shape newedge = SectionsReShape->Apply(anItm.Value());
ReplaceEdge(myReShape->Apply(oldedge),newedge,myReShape); ReplaceEdge(myReShape->Apply(oldedge),newedge,myReShape);
myMergedEdges.Add(oldedge); myMergedEdges.Add(oldedge);
if (myBoundSections.IsBound(oldedge)) myBoundSections.UnBind(oldedge); if (myBoundSections.IsBound(oldedge))
myBoundSections.UnBind(oldedge);
} }
} }
else { else {
// Merging of initial bound // Merging of initial bound
TopTools_DataMapIteratorOfDataMapOfShapeShape itm(MergedWithBound);
//myMergedEdges.Add(bound); //myMergedEdges.Add(bound);
for (; itm.More(); itm.Next()) { TopTools_IndexedDataMapOfShapeShape::Iterator anItm(MergedWithBound);
TopoDS_Shape oldedge = itm.Key(); for (; anItm.More(); anItm.Next()) {
TopoDS_Shape newedge = itm.Value(); const TopoDS_Shape& oldedge = anItm.Key();
const TopoDS_Shape& newedge = anItm.Value();
ReplaceEdge(myReShape->Apply(oldedge),newedge,myReShape); ReplaceEdge(myReShape->Apply(oldedge),newedge,myReShape);
myMergedEdges.Add(oldedge); myMergedEdges.Add(oldedge);
if (myBoundSections.IsBound(oldedge)) myBoundSections.UnBind(oldedge); if (myBoundSections.IsBound(oldedge))
myBoundSections.UnBind(oldedge);
} }
if (myBoundSections.IsBound(bound)) myBoundSections.UnBind(bound); if (myBoundSections.IsBound(bound))
myBoundSections.UnBind(bound);
if(!myMergedEdges.Contains(bound)) if(!myMergedEdges.Contains(bound))
myMergedEdges.Add(bound); myMergedEdges.Add(bound);
} }
@ -3480,7 +3477,7 @@ Standard_Boolean BRepBuilderAPI_Sewing::MergedNearestEdges(const TopoDS_Shape& e
if (isNode2) nno2 = myVertexNode.FindFromKey(no2); if (isNode2) nno2 = myVertexNode.FindFromKey(no2);
// Fill map of nodes connected to the node #1 // Fill map of nodes connected to the node #1
TopTools_MapOfShape mapVert1; TopTools_IndexedMapOfShape mapVert1;
mapVert1.Add(nno1); mapVert1.Add(nno1);
if (myCuttingNode.IsBound(nno1)) { if (myCuttingNode.IsBound(nno1)) {
TopTools_ListIteratorOfListOfShape ilv(myCuttingNode(nno1)); TopTools_ListIteratorOfListOfShape ilv(myCuttingNode(nno1));
@ -3520,8 +3517,8 @@ Standard_Boolean BRepBuilderAPI_Sewing::MergedNearestEdges(const TopoDS_Shape& e
seqEdges.Append(edge); seqEdges.Append(edge);
TopTools_MapOfShape mapEdges; TopTools_MapOfShape mapEdges;
mapEdges.Add(edge); mapEdges.Add(edge);
for (TopTools_MapIteratorOfMapOfShape imv1(mapVert1); imv1.More(); imv1.Next()) { for (Standard_Integer i = 1; i <= mapVert1.Extent(); i++) {
TopoDS_Shape node1 = imv1.Key(); TopoDS_Shape node1 = mapVert1.FindKey(i);
if (!myNodeSections.IsBound(node1)) continue; if (!myNodeSections.IsBound(node1)) continue;
TopTools_ListIteratorOfListOfShape ilsec(myNodeSections(node1)); TopTools_ListIteratorOfListOfShape ilsec(myNodeSections(node1));
for (; ilsec.More(); ilsec.Next()) { for (; ilsec.More(); ilsec.Next()) {
@ -3638,10 +3635,11 @@ void BRepBuilderAPI_Sewing::Cutting(const Handle(Message_ProgressIndicator)& the
// Iterate on all boundaries // Iterate on all boundaries
Standard_Integer nbBounds = myBoundFaces.Extent(); Standard_Integer nbBounds = myBoundFaces.Extent();
Message_ProgressSentry aPS (thePI, "Cutting bounds", 0, nbBounds, 1); Message_ProgressSentry aPS (thePI, "Cutting bounds", 0, nbBounds, 1);
for (i = 1; i <= nbBounds && aPS.More(); i++, aPS.Next()) { TopTools_IndexedDataMapOfShapeListOfShape::Iterator anIterB(myBoundFaces);
const TopoDS_Edge& bound = TopoDS::Edge(myBoundFaces.FindKey(i)); for (; anIterB.More() && aPS.More(); anIterB.Next(), aPS.Next()) {
const TopoDS_Edge& bound = TopoDS::Edge(anIterB.Key());
// Do not cut floating edges // Do not cut floating edges
if (!myBoundFaces(i).Extent()) continue; if (!anIterB.Value().Extent()) continue;
// Obtain bound curve // Obtain bound curve
c3d = BRep_Tool::Curve(bound, loc, first, last); c3d = BRep_Tool::Curve(bound, loc, first, last);
if (c3d.IsNull()) continue; if (c3d.IsNull()) continue;
@ -3743,12 +3741,12 @@ static void GetSeqEdges(const TopoDS_Shape& edge,
{ {
Standard_Integer numV = 0; Standard_Integer numV = 0;
for (TopoDS_Iterator Iv(edge,Standard_False); Iv.More(); Iv.Next()) { for (TopoDS_Iterator Iv(edge,Standard_False); Iv.More(); Iv.Next()) {
TopoDS_Vertex V1 = TopoDS::Vertex(Iv.Value()); const TopoDS_Vertex& V1 = TopoDS::Vertex(Iv.Value());
numV++; numV++;
if (VertEdge.IsBound(V1)) { if (VertEdge.IsBound(V1)) {
const TopTools_ListOfShape& listEdges = VertEdge.Find(V1); const TopTools_ListOfShape& listEdges = VertEdge.Find(V1);
for (TopTools_ListIteratorOfListOfShape lIt(listEdges); lIt.More(); lIt.Next()) { for (TopTools_ListIteratorOfListOfShape lIt(listEdges); lIt.More(); lIt.Next()) {
TopoDS_Shape edge1 = lIt.Value(); const TopoDS_Shape& edge1 = lIt.Value();
if (edge1.IsSame(edge)) continue; if (edge1.IsSame(edge)) continue;
Standard_Boolean isContained = Standard_False; Standard_Boolean isContained = Standard_False;
Standard_Integer i, index = 1; Standard_Integer i, index = 1;
@ -3771,16 +3769,16 @@ static void GetSeqEdges(const TopoDS_Shape& edge,
//purpose : //purpose :
//======================================================================= //=======================================================================
void BRepBuilderAPI_Sewing::GetFreeWires(TopTools_MapOfShape& MapFreeEdges, TopTools_SequenceOfShape& seqWires) void BRepBuilderAPI_Sewing::GetFreeWires(TopTools_IndexedMapOfShape& MapFreeEdges,
TopTools_SequenceOfShape& seqWires)
{ {
TopTools_DataMapOfShapeListOfShape VertEdge; TopTools_DataMapOfShapeListOfShape VertEdge;
TopTools_MapIteratorOfMapOfShape itMap(MapFreeEdges);
TopTools_SequenceOfShape seqFreeEdges; TopTools_SequenceOfShape seqFreeEdges;
for (; itMap.More(); itMap.Next()) { for (Standard_Integer i = 1; i <= MapFreeEdges.Extent(); i++) {
TopoDS_Shape edge = itMap.Key(); const TopoDS_Shape& edge = MapFreeEdges.FindKey(i);
seqFreeEdges.Append(edge); seqFreeEdges.Append(edge);
for (TopoDS_Iterator Iv(edge,Standard_False); Iv.More(); Iv.Next()) { for (TopoDS_Iterator Iv(edge,Standard_False); Iv.More(); Iv.Next()) {
TopoDS_Vertex V1 = TopoDS::Vertex(Iv.Value()); const TopoDS_Vertex& V1 = TopoDS::Vertex(Iv.Value());
if (VertEdge.IsBound(V1)) if (VertEdge.IsBound(V1))
VertEdge.ChangeFind(V1).Append(edge); VertEdge.ChangeFind(V1).Append(edge);
else { else {
@ -3794,7 +3792,7 @@ void BRepBuilderAPI_Sewing::GetFreeWires(TopTools_MapOfShape& MapFreeEdges, TopT
Standard_Integer i, j; Standard_Integer i, j;
for (i = 1; i <= seqFreeEdges.Length(); i++) { for (i = 1; i <= seqFreeEdges.Length(); i++) {
TopTools_SequenceOfShape seqEdges; TopTools_SequenceOfShape seqEdges;
TopoDS_Shape edge = seqFreeEdges.Value(i); const TopoDS_Shape& edge = seqFreeEdges.Value(i);
if (!MapFreeEdges.Contains(edge)) continue; if (!MapFreeEdges.Contains(edge)) continue;
seqEdges.Append(edge); seqEdges.Append(edge);
GetSeqEdges(edge,seqEdges,VertEdge); GetSeqEdges(edge,seqEdges,VertEdge);
@ -3802,7 +3800,7 @@ void BRepBuilderAPI_Sewing::GetFreeWires(TopTools_MapOfShape& MapFreeEdges, TopT
B.MakeWire(wire); B.MakeWire(wire);
for (j = 1; j <= seqEdges.Length(); j++) { for (j = 1; j <= seqEdges.Length(); j++) {
B.Add(wire,seqEdges.Value(j)); B.Add(wire,seqEdges.Value(j));
MapFreeEdges.Remove(seqEdges.Value(j)); MapFreeEdges.RemoveKey(seqEdges.Value(j));
} }
seqWires.Append(wire); seqWires.Append(wire);
if (MapFreeEdges.IsEmpty()) break; if (MapFreeEdges.IsEmpty()) break;
@ -3979,20 +3977,21 @@ static TopoDS_Edge DegeneratedSection(const TopoDS_Shape& section, const TopoDS_
void BRepBuilderAPI_Sewing::EdgeProcessing(const Handle(Message_ProgressIndicator)& thePI) void BRepBuilderAPI_Sewing::EdgeProcessing(const Handle(Message_ProgressIndicator)& thePI)
{ {
// constructs sectionEdge // constructs sectionEdge
TopTools_MapOfShape MapFreeEdges; TopTools_IndexedMapOfShape MapFreeEdges;
TopTools_DataMapOfShapeShape EdgeFace; TopTools_DataMapOfShapeShape EdgeFace;
Message_ProgressSentry aPS (thePI, "Edge processing", 0, myBoundFaces.Extent(), 1); Message_ProgressSentry aPS (thePI, "Edge processing", 0, myBoundFaces.Extent(), 1);
for (Standard_Integer i = 1; i <= myBoundFaces.Extent() && aPS.More(); i++, aPS.Next()) { TopTools_IndexedDataMapOfShapeListOfShape::Iterator anIterB(myBoundFaces);
const TopoDS_Shape& bound = myBoundFaces.FindKey(i); for (; anIterB.More() && aPS.More(); anIterB.Next(), aPS.Next()) {
const TopTools_ListOfShape& listFaces = myBoundFaces(i); const TopoDS_Shape& bound = anIterB.Key();
const TopTools_ListOfShape& listFaces = anIterB.Value();
if (listFaces.Extent() == 1) { if (listFaces.Extent() == 1) {
if (myBoundSections.IsBound(bound)) { if (myBoundSections.IsBound(bound)) {
TopTools_ListIteratorOfListOfShape liter(myBoundSections(bound)); TopTools_ListIteratorOfListOfShape liter(myBoundSections(bound));
for (; liter.More(); liter.Next()) { for (; liter.More(); liter.Next()) {
if (!myMergedEdges.Contains(liter.Value())) { //myReShape->IsRecorded(liter.Value())) { if (!myMergedEdges.Contains(liter.Value())) { //myReShape->IsRecorded(liter.Value())) {
TopoDS_Shape edge = myReShape->Apply(liter.Value()); const TopoDS_Shape& edge = myReShape->Apply(liter.Value());
if (!MapFreeEdges.Contains(edge)) { if (!MapFreeEdges.Contains(edge)) {
TopoDS_Shape face = listFaces.First(); const TopoDS_Shape& face = listFaces.First();
EdgeFace.Bind(edge,face); EdgeFace.Bind(edge,face);
MapFreeEdges.Add(edge); MapFreeEdges.Add(edge);
} }
@ -4001,9 +4000,9 @@ void BRepBuilderAPI_Sewing::EdgeProcessing(const Handle(Message_ProgressIndicato
} }
else { else {
if (!myMergedEdges.Contains(bound)) { if (!myMergedEdges.Contains(bound)) {
TopoDS_Shape edge = myReShape->Apply(bound); const TopoDS_Shape& edge = myReShape->Apply(bound);
if (!MapFreeEdges.Contains(edge)) { if (!MapFreeEdges.Contains(edge)) {
TopoDS_Shape face = listFaces.First(); const TopoDS_Shape& face = listFaces.First();
EdgeFace.Bind(edge,face); EdgeFace.Bind(edge,face);
MapFreeEdges.Add(edge); MapFreeEdges.Add(edge);
} }
@ -4016,11 +4015,11 @@ void BRepBuilderAPI_Sewing::EdgeProcessing(const Handle(Message_ProgressIndicato
TopTools_SequenceOfShape seqWires; TopTools_SequenceOfShape seqWires;
GetFreeWires(MapFreeEdges,seqWires); GetFreeWires(MapFreeEdges,seqWires);
for (Standard_Integer j = 1; j <= seqWires.Length(); j++) { for (Standard_Integer j = 1; j <= seqWires.Length(); j++) {
TopoDS_Wire wire = TopoDS::Wire(seqWires.Value(j)); const TopoDS_Wire& wire = TopoDS::Wire(seqWires.Value(j));
if (!IsDegeneratedWire(wire)) continue; if (!IsDegeneratedWire(wire)) continue;
for (TopoDS_Iterator Ie(wire,Standard_False); Ie.More(); Ie.Next()) { for (TopoDS_Iterator Ie(wire,Standard_False); Ie.More(); Ie.Next()) {
TopoDS_Shape aTmpShape = myReShape->Apply(Ie.Value()); //for porting TopoDS_Shape aTmpShape = myReShape->Apply(Ie.Value()); //for porting
TopoDS_Edge edge = TopoDS::Edge(aTmpShape); const TopoDS_Edge& edge = TopoDS::Edge(aTmpShape);
TopoDS_Shape face; TopoDS_Shape face;
if (EdgeFace.IsBound(edge)) if (EdgeFace.IsBound(edge))
face = EdgeFace.Find(edge); face = EdgeFace.Find(edge);
@ -4075,12 +4074,12 @@ void BRepBuilderAPI_Sewing::CreateSewedShape()
TopoDS_Shape ns = myReShape->Apply(myShape); TopoDS_Shape ns = myReShape->Apply(myShape);
aQuilt.Add(ns); aQuilt.Add(ns);
} }
Standard_Integer i; TopTools_IndexedDataMapOfShapeShape::Iterator anIter(myOldShapes);
for (i = 1; i <= myOldShapes.Extent(); i++) { for (; anIter.More(); anIter.Next()) {
TopoDS_Shape sh = myOldShapes(i); TopoDS_Shape sh = anIter.Value();
if (!sh.IsNull()) { if (!sh.IsNull()) {
sh = myReShape->Apply(sh); sh = myReShape->Apply(sh);
myOldShapes(i) = sh; anIter.ChangeValue() = sh;
if (!isLocal) aQuilt.Add(sh); if (!isLocal) aQuilt.Add(sh);
} }
} }
@ -4128,7 +4127,7 @@ void BRepBuilderAPI_Sewing::CreateSewedShape()
Standard_Integer nbOldShells = OldShells.Extent(); Standard_Integer nbOldShells = OldShells.Extent();
if (nbOldShells == 1) { if (nbOldShells == 1) {
// Single shell - check for single face // Single shell - check for single face
TopoDS_Shape sh = OldShells.FindKey(1); const TopoDS_Shape& sh = OldShells.FindKey(1);
TopoDS_Shape face; TopoDS_Shape face;
Standard_Integer numf = 0; Standard_Integer numf = 0;
for (TopExp_Explorer aExpF(sh,TopAbs_FACE); aExpF.More() && (numf < 2); aExpF.Next()) { for (TopExp_Explorer aExpF(sh,TopAbs_FACE); aExpF.More() && (numf < 2); aExpF.Next()) {
@ -4145,9 +4144,9 @@ void BRepBuilderAPI_Sewing::CreateSewedShape()
while (IndexMerged.Extent() < nbOldShells) { while (IndexMerged.Extent() < nbOldShells) {
TopoDS_Shell NewShell; TopoDS_Shell NewShell;
TopTools_MapOfShape NewEdges; TopTools_MapOfShape NewEdges;
for (i = 1; i <= nbOldShells; i++) { for (Standard_Integer i = 1; i <= nbOldShells; i++) {
if (IndexMerged.Contains(i)) continue; if (IndexMerged.Contains(i)) continue;
TopoDS_Shell shell = TopoDS::Shell(OldShells.FindKey(i)); const TopoDS_Shell& shell = TopoDS::Shell(OldShells.FindKey(i));
if (NewShell.IsNull()) { if (NewShell.IsNull()) {
aB.MakeShell(NewShell); aB.MakeShell(NewShell);
TopoDS_Iterator aItSS(shell) ; TopoDS_Iterator aItSS(shell) ;
@ -4156,7 +4155,7 @@ void BRepBuilderAPI_Sewing::CreateSewedShape()
; ;
// Fill map of edges // Fill map of edges
for (TopExp_Explorer eexp(shell,TopAbs_EDGE); eexp.More(); eexp.Next()) { for (TopExp_Explorer eexp(shell,TopAbs_EDGE); eexp.More(); eexp.Next()) {
TopoDS_Shape edge = eexp.Current(); const TopoDS_Shape& edge = eexp.Current();
NewEdges.Add(edge); NewEdges.Add(edge);
} }
IndexMerged.Add(i); IndexMerged.Add(i);
@ -4169,12 +4168,12 @@ void BRepBuilderAPI_Sewing::CreateSewedShape()
if (hasSharedEdge) { if (hasSharedEdge) {
// Add edges to the map // Add edges to the map
for (TopExp_Explorer eexp1(shell,TopAbs_EDGE); eexp1.More(); eexp1.Next()) { for (TopExp_Explorer eexp1(shell,TopAbs_EDGE); eexp1.More(); eexp1.Next()) {
TopoDS_Shape edge = eexp1.Current(); const TopoDS_Shape& edge = eexp1.Current();
NewEdges.Add(edge); NewEdges.Add(edge);
} }
// Add faces to the shell // Add faces to the shell
for (TopExp_Explorer fexp(shell,TopAbs_FACE); fexp.More(); fexp.Next()) { for (TopExp_Explorer fexp(shell,TopAbs_FACE); fexp.More(); fexp.Next()) {
TopoDS_Shape face = fexp.Current(); const TopoDS_Shape& face = fexp.Current();
aB.Add(NewShell,face); aB.Add(NewShell,face);
} }
IndexMerged.Add(i); IndexMerged.Add(i);
@ -4227,7 +4226,8 @@ void BRepBuilderAPI_Sewing::CreateOutputInformations()
if (myBoundSections.IsBound(bound)) lsect = myBoundSections(bound); if (myBoundSections.IsBound(bound)) lsect = myBoundSections(bound);
TopExp_Explorer aExp(myReShape->Apply(bound),TopAbs_EDGE); TopExp_Explorer aExp(myReShape->Apply(bound),TopAbs_EDGE);
for (; aExp.More(); aExp.Next()) { for (; aExp.More(); aExp.Next()) {
TopoDS_Shape sec = bound, edge = aExp.Current(); TopoDS_Shape sec = bound;
const TopoDS_Shape& edge = aExp.Current();
TopTools_ListIteratorOfListOfShape aI(lsect); TopTools_ListIteratorOfListOfShape aI(lsect);
for (; aI.More(); aI.Next()) { for (; aI.More(); aI.Next()) {
const TopoDS_Shape& section = aI.Value(); const TopoDS_Shape& section = aI.Value();
@ -4244,10 +4244,10 @@ void BRepBuilderAPI_Sewing::CreateOutputInformations()
} }
// Fill maps of Free, Contigous and Multiple edges // Fill maps of Free, Contigous and Multiple edges
//TopTools_DataMapIteratorOfDataMapOfShapeListOfShape iter2(edgeSections); TopTools_IndexedDataMapOfShapeListOfShape::Iterator anIter(edgeSections);
for (i = 1; i <= edgeSections.Extent(); i++) { for (; anIter.More(); anIter.Next()) {
const TopoDS_Shape& edge = edgeSections.FindKey(i); const TopoDS_Shape& edge = anIter.Key();
const TopTools_ListOfShape& listSection = edgeSections(i); const TopTools_ListOfShape& listSection = anIter.Value();
if (listSection.Extent() == 1) { if (listSection.Extent() == 1) {
if (BRep_Tool::Degenerated(TopoDS::Edge(edge))) if (BRep_Tool::Degenerated(TopoDS::Edge(edge)))
myDegenerated.Add(edge); myDegenerated.Add(edge);
@ -4265,11 +4265,11 @@ void BRepBuilderAPI_Sewing::CreateOutputInformations()
// constructs myContigSectBound // constructs myContigSectBound
TopTools_DataMapOfShapeListOfShape aEdgeMap; //gka TopTools_DataMapOfShapeListOfShape aEdgeMap; //gka
for (i = 1; i <= myBoundFaces.Extent(); i++) { for (i = 1; i <= myBoundFaces.Extent(); i++) {
TopoDS_Shape bound = myBoundFaces.FindKey(i); const TopoDS_Shape& bound = myBoundFaces.FindKey(i);
if (myBoundSections.IsBound(bound)) { if (myBoundSections.IsBound(bound)) {
TopTools_ListIteratorOfListOfShape iter(myBoundSections(bound)); TopTools_ListIteratorOfListOfShape iter(myBoundSections(bound));
for (; iter.More(); iter.Next()) { for (; iter.More(); iter.Next()) {
TopoDS_Shape section = iter.Value(); const TopoDS_Shape& section = iter.Value();
if(!myMergedEdges.Contains(section)) continue; if(!myMergedEdges.Contains(section)) continue;
//if (!myReShape->IsRecorded(section)) continue; // section is free //if (!myReShape->IsRecorded(section)) continue; // section is free
TopoDS_Shape nedge = myReShape->Apply(section); TopoDS_Shape nedge = myReShape->Apply(section);
@ -4437,7 +4437,7 @@ void BRepBuilderAPI_Sewing::CreateCuttingNodes(const TopTools_IndexedMapOfShape&
seqPnt.Prepend(GAC.Value(first)); seqPnt.Append(GAC.Value(last)); seqPnt.Prepend(GAC.Value(first)); seqPnt.Append(GAC.Value(last));
} }
TopTools_DataMapOfShapeShape NodeCuttingVertex; TopTools_IndexedDataMapOfShapeShape NodeCuttingVertex;
for (i = 1; i <= nbProj; i++) { for (i = 1; i <= nbProj; i++) {
const Standard_Integer index = seqOrderedIndex(i); const Standard_Integer index = seqOrderedIndex(i);
@ -4446,7 +4446,7 @@ void BRepBuilderAPI_Sewing::CreateCuttingNodes(const TopTools_IndexedMapOfShape&
// Skip node if already bound to cutting vertex // Skip node if already bound to cutting vertex
TopoDS_Shape node = myVertexNode.FindFromKey(MapVert(index)); TopoDS_Shape node = myVertexNode.FindFromKey(MapVert(index));
if (NodeCuttingVertex.IsBound(node)) continue; if (NodeCuttingVertex.Contains(node)) continue;
// Find the closest vertex // Find the closest vertex
Standard_Integer indexMin = 1; Standard_Integer indexMin = 1;
@ -4464,11 +4464,11 @@ void BRepBuilderAPI_Sewing::CreateCuttingNodes(const TopTools_IndexedMapOfShape&
// Bind new cutting node (end vertex only) // Bind new cutting node (end vertex only)
seqDist.SetValue(indexMin,disProj); seqDist.SetValue(indexMin,disProj);
TopoDS_Shape cvertex = seqVert.Value(indexMin); TopoDS_Shape cvertex = seqVert.Value(indexMin);
NodeCuttingVertex.Bind(node,cvertex); NodeCuttingVertex.Add(node,cvertex);
} }
else { else {
// Bind secondary cutting nodes // Bind secondary cutting nodes
NodeCuttingVertex.Bind(node,TopoDS_Vertex()); NodeCuttingVertex.Add(node,TopoDS_Vertex());
} }
} }
else { else {
@ -4476,7 +4476,7 @@ void BRepBuilderAPI_Sewing::CreateCuttingNodes(const TopTools_IndexedMapOfShape&
TopoDS_Vertex cvertex; TopoDS_Vertex cvertex;
aBuilder.MakeVertex(cvertex, pntProj, Precision::Confusion()); aBuilder.MakeVertex(cvertex, pntProj, Precision::Confusion());
// Bind new cutting vertex // Bind new cutting vertex
NodeCuttingVertex.Bind(node,cvertex); NodeCuttingVertex.Add(node,cvertex);
// Insert cutting vertex in the sequences // Insert cutting vertex in the sequences
Standard_Real parProj = arrPara(index); Standard_Real parProj = arrPara(index);
for (j = 2; j <= seqPara.Length(); j++) { for (j = 2; j <= seqPara.Length(); j++) {
@ -4492,13 +4492,13 @@ void BRepBuilderAPI_Sewing::CreateCuttingNodes(const TopTools_IndexedMapOfShape&
} }
// filling map for cutting nodes // filling map for cutting nodes
TopTools_DataMapIteratorOfDataMapOfShapeShape mit(NodeCuttingVertex); TopTools_IndexedDataMapOfShapeShape::Iterator aMIt(NodeCuttingVertex);
for (; mit.More(); mit.Next()) { for (; aMIt.More(); aMIt.Next()) {
TopoDS_Shape cnode = mit.Value(); TopoDS_Shape cnode = aMIt.Value();
// Skip secondary nodes // Skip secondary nodes
if (cnode.IsNull()) continue; if (cnode.IsNull()) continue;
// Obtain vertex node // Obtain vertex node
TopoDS_Shape node = mit.Key(); const TopoDS_Shape& node = aMIt.Key();
if (myVertexNode.Contains(cnode)) { if (myVertexNode.Contains(cnode)) {
// This is an end vertex // This is an end vertex
cnode = myVertexNode.FindFromKey(cnode); cnode = myVertexNode.FindFromKey(cnode);

3
src/BRepBuilderAPI/BRepBuilderAPI_Sewing.hxx
View File

@ -295,7 +295,8 @@ protected:
//! Get wire from free edges. //! Get wire from free edges.
//! This method is called from EdgeProcessing only //! This method is called from EdgeProcessing only
Standard_EXPORT virtual void GetFreeWires (TopTools_MapOfShape& MapFreeEdges, TopTools_SequenceOfShape& seqWires); Standard_EXPORT virtual void GetFreeWires (TopTools_IndexedMapOfShape& MapFreeEdges,
TopTools_SequenceOfShape& seqWires);
//! This method is called from MergingOfSections only //! This method is called from MergingOfSections only

48
src/BRepFill/BRepFill_OffsetWire.cxx
View File

@ -452,13 +452,7 @@ const TopTools_ListOfShape& BRepFill_OffsetWire::GeneratedShapes
} }
if ( !it.Value().IsSame(it.Key())) { if ( !it.Value().IsSame(it.Key())) {
myMap.ChangeFromKey(it.Value()).Append(myMap.ChangeFromKey(it.Key())); myMap.ChangeFromKey(it.Value()).Append(myMap.ChangeFromKey(it.Key()));
//myMap.UnBind(it.Key()); myMap.RemoveKey(it.Key());
TopoDS_Shape LastShape = myMap.FindKey(myMap.Extent());
TopTools_ListOfShape LastList;
LastList.Append(myMap(myMap.Extent()));
myMap.RemoveLast();
if (myMap.FindIndex(it.Key()) != 0)
myMap.Substitute(myMap.FindIndex(it.Key()), LastShape, LastList);
} }
} }
if (myMap.Contains(it.Key().Reversed())) { if (myMap.Contains(it.Key().Reversed())) {
@ -468,13 +462,7 @@ const TopTools_ListOfShape& BRepFill_OffsetWire::GeneratedShapes
} }
if ( !it.Value().IsSame(it.Key())) { if ( !it.Value().IsSame(it.Key())) {
myMap.ChangeFromKey(it.Value().Reversed()).Append(myMap.ChangeFromKey(it.Key().Reversed())); myMap.ChangeFromKey(it.Value().Reversed()).Append(myMap.ChangeFromKey(it.Key().Reversed()));
//myMap.UnBind(it.Key().Reversed()); myMap.RemoveKey(it.Key().Reversed());
TopoDS_Shape LastShape = myMap.FindKey(myMap.Extent());
TopTools_ListOfShape LastList;
LastList.Append(myMap(myMap.Extent()));
myMap.RemoveLast();
if (myMap.FindIndex(it.Key().Reversed()) != 0)
myMap.Substitute(myMap.FindIndex(it.Key().Reversed()), LastShape, LastList);
} }
} }
} }
@ -821,13 +809,7 @@ void BRepFill_OffsetWire::PerformWithBiLo
if (!myMap.IsEmpty() && if (!myMap.IsEmpty() &&
myMap.FindKey(1).ShapeType() == TopAbs_VERTEX) myMap.FindKey(1).ShapeType() == TopAbs_VERTEX)
{ {
//myMap.RemoveFirst(); myMap.RemoveFromIndex(1);
TopoDS_Shape LastShape = myMap.FindKey(myMap.Extent());
TopTools_ListOfShape LastList;
LastList.Append(myMap(myMap.Extent()));
myMap.RemoveLast();
if (!myMap.IsEmpty())
myMap.Substitute(1, LastShape, LastList);
} }
if (!myMap.IsEmpty() && if (!myMap.IsEmpty() &&
myMap.FindKey(myMap.Extent()).ShapeType() == TopAbs_VERTEX) myMap.FindKey(myMap.Extent()).ShapeType() == TopAbs_VERTEX)
@ -1447,13 +1429,7 @@ void BRepFill_OffsetWire::MakeWires()
if (myIsOpenResult && MVE.FindFromKey(CV).IsEmpty()) if (myIsOpenResult && MVE.FindFromKey(CV).IsEmpty())
{ {
//MVE.UnBind(CV); MVE.RemoveKey(CV);
TopoDS_Shape LastShape = MVE.FindKey(MVE.Extent());
TopTools_ListOfShape LastList;
LastList.Append(MVE(MVE.Extent()));
MVE.RemoveLast();
if (MVE.FindIndex(CV) != 0)
MVE.Substitute(MVE.FindIndex(CV), LastShape, LastList);
} }
@ -1476,13 +1452,7 @@ void BRepFill_OffsetWire::MakeWires()
isClosed = VF.IsSame(CV); isClosed = VF.IsSame(CV);
// Modified by Sergey KHROMOV - Thu Mar 14 11:30:15 2002 End // Modified by Sergey KHROMOV - Thu Mar 14 11:30:15 2002 End
End = Standard_True; End = Standard_True;
//MVE.UnBind(VF); MVE.RemoveKey(VF);
TopoDS_Shape LastShape = MVE.FindKey(MVE.Extent());
TopTools_ListOfShape LastList;
LastList.Append(MVE(MVE.Extent()));
MVE.RemoveLast();
if (MVE.FindIndex(VF) != 0)
MVE.Substitute(MVE.FindIndex(VF), LastShape, LastList);
} }
if (!End) { if (!End) {
@ -1504,13 +1474,7 @@ void BRepFill_OffsetWire::MakeWires()
if (MVE.FindFromKey(CV).IsEmpty()) if (MVE.FindFromKey(CV).IsEmpty())
{ {
//MVE.UnBind(CV); MVE.RemoveKey(CV);
TopoDS_Shape LastShape = MVE.FindKey(MVE.Extent());
TopTools_ListOfShape LastList;
LastList.Append(MVE(MVE.Extent()));
MVE.RemoveLast();
if (MVE.FindIndex(CV) != 0)
MVE.Substitute(MVE.FindIndex(CV), LastShape, LastList);
} }
} }
} }

8
src/BRepOffset/BRepOffset_MakeOffset.cxx
View File

@ -680,13 +680,7 @@ static void RemoveCorks (TopoDS_Shape& S,
B.Add(SS,Cork); B.Add(SS,Cork);
} }
else { else {
//Faces.Remove (Cork); Faces.RemoveKey(Cork);
//begin instead of Remove//
TopoDS_Shape LastShape = Faces(Faces.Extent());
Faces.RemoveLast();
if (Faces.FindIndex(Cork) != 0)
Faces.Substitute(Faces.FindIndex(Cork), LastShape);
//end instead of Remove //
Faces.Add(Cork); // to reset it with proper orientation. Faces.Add(Cork); // to reset it with proper orientation.
} }
} }

14
src/BiTgte/BiTgte_Blend.cxx
View File

@ -986,12 +986,7 @@ void BiTgte_Blend::Perform(const Standard_Boolean BuildShape)
for ( ; expf.More(); expf.Next()) { for ( ; expf.More(); expf.Next()) {
const TopoDS_Shape& F = expf.Current(); const TopoDS_Shape& F = expf.Current();
if ( myFaces.Contains(F) && Sew->IsModified(F)) { if ( myFaces.Contains(F) && Sew->IsModified(F)) {
//myFaces.Remove(F); myFaces.RemoveKey(F);
TopoDS_Shape LastFace = myFaces(myFaces.Extent());
myFaces.RemoveLast();
if (myFaces.FindIndex(F) != 0)
myFaces.Substitute(myFaces.FindIndex(F), LastFace);
////////////////////
myFaces.Add(Sew->Modified(F)); myFaces.Add(Sew->Modified(F));
} }
} }
@ -1014,12 +1009,7 @@ void BiTgte_Blend::Perform(const Standard_Boolean BuildShape)
for ( ; exp.More(); exp.Next()) { for ( ; exp.More(); exp.Next()) {
const TopoDS_Shape& F = exp.Current(); const TopoDS_Shape& F = exp.Current();
if ( myFaces.Contains(F)) { if ( myFaces.Contains(F)) {
//myFaces.Remove(F); myFaces.RemoveKey(F);
TopoDS_Shape LastFace = myFaces(myFaces.Extent());
myFaces.RemoveLast();
if (myFaces.FindIndex(F) != 0)
myFaces.Substitute(myFaces.FindIndex(F), LastFace);
////////////////////
myFaces.Add(F); myFaces.Add(F);
} }
else if ( myStopFaces.Contains(F)) { else if ( myStopFaces.Contains(F)) {

23
src/Draft/Draft_Modification.cxx
View File

@ -149,18 +149,8 @@ void Draft_Modification::Remove(const TopoDS_Face& F)
} }
ltod.Initialize(conneF); ltod.Initialize(conneF);
Standard_Integer IndToReplace = 0;
while (ltod.More()) { while (ltod.More()) {
IndToReplace = myFMap.FindIndex(TopoDS::Face(ltod.Value())); myFMap.RemoveKey(TopoDS::Face(ltod.Value()));
if (IndToReplace)
{
Standard_Integer LInd = myFMap.Extent();
TopoDS_Face LF = myFMap.FindKey(LInd);
Draft_FaceInfo LFInfo = myFMap.FindFromIndex(LInd);
myFMap.RemoveLast();
if (IndToReplace != LInd)
myFMap.Substitute(IndToReplace, LF, LFInfo);
}
ltod.Next(); ltod.Next();
} }
@ -173,16 +163,7 @@ void Draft_Modification::Remove(const TopoDS_Face& F)
} }
ltod.Initialize(conneF); ltod.Initialize(conneF);
while (ltod.More()) { while (ltod.More()) {
IndToReplace = myFMap.FindIndex(TopoDS::Face(ltod.Value())); myEMap.RemoveKey(TopoDS::Edge(ltod.Value()));
if (IndToReplace)
{
Standard_Integer LInd = myEMap.Extent();
TopoDS_Edge LF = myEMap.FindKey(LInd);
Draft_EdgeInfo LFInfo = myEMap.FindFromIndex(LInd);
myEMap.RemoveLast();
if (IndToReplace != LInd)
myEMap.Substitute(IndToReplace, LF, LFInfo);
}
ltod.Next(); ltod.Next();
} }
} }

23
src/Draft/Draft_Modification_1.cxx
View File

@ -380,30 +380,11 @@ Standard_Boolean Draft_Modification::InternalAdd(const TopoDS_Face& F,
typS == STANDARD_TYPE(Geom_SurfaceOfLinearExtrusion)) { typS == STANDARD_TYPE(Geom_SurfaceOfLinearExtrusion)) {
if ( myFMap.Contains(F)) { if ( myFMap.Contains(F)) {
if ( Flag == Standard_False && !postponed) { if ( Flag == Standard_False && !postponed) {
Standard_Integer IndToReplace = myFMap.FindIndex(F); myFMap.RemoveKey(F);
if (IndToReplace) {
Standard_Integer LInd = myFMap.Extent();
TopoDS_Face LF = myFMap.FindKey(LInd);
Draft_FaceInfo LFInfo = myFMap.FindFromIndex(LInd);
myFMap.RemoveLast();
if (IndToReplace != LInd)
myFMap.Substitute(IndToReplace, LF, LFInfo);
}
TopTools_MapIteratorOfMapOfShape itm(MapOfE); TopTools_MapIteratorOfMapOfShape itm(MapOfE);
for ( ; itm.More(); itm.Next()) for ( ; itm.More(); itm.Next())
{ {
IndToReplace = myEMap.FindIndex(TopoDS::Edge(itm.Key())); myEMap.RemoveKey(TopoDS::Edge(itm.Key()));
if ( IndToReplace )
{
Standard_Integer LInd = myEMap.Extent();
TopoDS_Edge LE = myEMap.FindKey(LInd);
Draft_EdgeInfo LEInfo = myEMap.FindFromIndex(LInd);
myEMap.RemoveLast();
if (IndToReplace != LInd)
myEMap.Substitute(IndToReplace, LE, LEInfo);
}
} }
} }
} }

7
src/LocOpe/LocOpe_WiresOnShape.cxx
View File

@ -270,12 +270,7 @@ void LocOpe_WiresOnShape::BindAll()
continue; continue;
TopoDS_Shape aFace = myMapEF.FindFromKey(anEdge); TopoDS_Shape aFace = myMapEF.FindFromKey(anEdge);
//Remove "anEdge" from "myMapEF" //Remove "anEdge" from "myMapEF"
TopoDS_Shape LastEdge = myMapEF.FindKey(myMapEF.Extent()); myMapEF.RemoveKey(anEdge);
TopoDS_Shape LastFace = myMapEF(myMapEF.Extent());
myMapEF.RemoveLast();
if (myMapEF.FindIndex(anEdge) != 0)
myMapEF.Substitute(myMapEF.FindIndex(anEdge), LastEdge, LastFace);
////////////////////////////////
TopTools_ListIteratorOfListOfShape itl(Splits(Ind)); TopTools_ListIteratorOfListOfShape itl(Splits(Ind));
for (; itl.More(); itl.Next()) for (; itl.More(); itl.Next())
myMapEF.Add(itl.Value(), aFace); myMapEF.Add(itl.Value(), aFace);

8
src/NCollection/NCollection_DataMap.hxx
View File

@ -47,8 +47,14 @@ template < class TheKeyType,
class Hasher = NCollection_DefaultHasher<TheKeyType> > class Hasher = NCollection_DefaultHasher<TheKeyType> >
class NCollection_DataMap : public NCollection_BaseMap class NCollection_DataMap : public NCollection_BaseMap
{ {
public:
//! STL-compliant typedef for key type
typedef TheKeyType key_type;
//! STL-compliant typedef for value type
typedef TheItemType value_type;
public:
// **************** Adaptation of the TListNode to the DATAmap // **************** Adaptation of the TListNode to the DATAmap
public:
class DataMapNode : public NCollection_TListNode<TheItemType> class DataMapNode : public NCollection_TListNode<TheItemType>
{ {
public: public:

8
src/NCollection/NCollection_DoubleMap.hxx
View File

@ -40,8 +40,14 @@ template < class TheKey1Type,
class Hasher2 = NCollection_DefaultHasher<TheKey2Type> > class Hasher2 = NCollection_DefaultHasher<TheKey2Type> >
class NCollection_DoubleMap : public NCollection_BaseMap class NCollection_DoubleMap : public NCollection_BaseMap
{ {
public:
//! STL-compliant typedef for key1 type
typedef TheKey1Type key1_type;
//! STL-compliant typedef for key2 type
typedef TheKey2Type key2_type;
public:
// **************** Adaptation of the TListNode to the DOUBLEmap // **************** Adaptation of the TListNode to the DOUBLEmap
public:
class DoubleMapNode : public NCollection_TListNode<TheKey2Type> class DoubleMapNode : public NCollection_TListNode<TheKey2Type>
{ {
public: public:

29
src/NCollection/NCollection_IndexedDataMap.hxx
View File

@ -49,8 +49,14 @@ template < class TheKeyType,
class Hasher = NCollection_DefaultHasher<TheKeyType> > class Hasher = NCollection_DefaultHasher<TheKeyType> >
class NCollection_IndexedDataMap : public NCollection_BaseMap class NCollection_IndexedDataMap : public NCollection_BaseMap
{ {
public:
//! STL-compliant typedef for key type
typedef TheKeyType key_type;
//! STL-compliant typedef for value type
typedef TheItemType value_type;
private:
//! Adaptation of the TListNode to the INDEXEDDatamap //! Adaptation of the TListNode to the INDEXEDDatamap
private:
class IndexedDataMapNode : public NCollection_TListNode<TheItemType> class IndexedDataMapNode : public NCollection_TListNode<TheItemType>
{ {
public: public:
@ -435,6 +441,27 @@ class NCollection_IndexedDataMap : public NCollection_BaseMap
Decrement(); Decrement();
} }
//! Remove the key of the given index.
//! Caution! The index of the last key can be changed.
void RemoveFromIndex(const Standard_Integer theKey2)
{
Standard_OutOfRange_Raise_if(theKey2 < 1 || theKey2 > Extent(), "NCollection_IndexedDataMap::Remove");
Standard_Integer aLastInd = Extent();
if (theKey2 != aLastInd)
Swap(theKey2, aLastInd);
RemoveLast();
}
//! Remove the given key.
//! Caution! The index of the last key can be changed.
void RemoveKey(const TheKeyType& theKey1)
{
Standard_Integer anIndToRemove = FindIndex(theKey1);
if (anIndToRemove > 0) {
RemoveFromIndex(anIndToRemove);
}
}
//! FindKey //! FindKey
const TheKeyType& FindKey (const Standard_Integer theKey2) const const TheKeyType& FindKey (const Standard_Integer theKey2) const
{ {

29
src/NCollection/NCollection_IndexedMap.hxx
View File

@ -40,9 +40,13 @@ template < class TheKeyType,
class Hasher = NCollection_DefaultHasher<TheKeyType> > class Hasher = NCollection_DefaultHasher<TheKeyType> >
class NCollection_IndexedMap : public NCollection_BaseMap class NCollection_IndexedMap : public NCollection_BaseMap
{ {
// **************** Adaptation of the TListNode to the INDEXEDmap public:
//! STL-compliant typedef for key type
typedef TheKeyType key_type;
private: private:
class IndexedMapNode : public NCollection_TListNode<TheKeyType> // **************** Adaptation of the TListNode to the INDEXEDmap
class IndexedMapNode : public NCollection_TListNode<TheKeyType>
{ {
public: public:
//! Constructor with 'Next' //! Constructor with 'Next'
@ -398,6 +402,27 @@ class NCollection_IndexedMap : public NCollection_BaseMap
Decrement(); Decrement();
} }
//! Remove the key of the given index.
//! Caution! The index of the last key can be changed.
void RemoveFromIndex(const Standard_Integer theKey2)
{
Standard_OutOfRange_Raise_if(theKey2 < 1 || theKey2 > Extent(), "NCollection_IndexedMap::Remove");
Standard_Integer aLastInd = Extent();
if (theKey2 != aLastInd)
Swap(theKey2, aLastInd);
RemoveLast();
}
//! Remove the given key.
//! Caution! The index of the last key can be changed.
void RemoveKey(const TheKeyType& theKey1)
{
Standard_Integer anIndToRemove = FindIndex(theKey1);
if (anIndToRemove > 0) {
RemoveFromIndex(anIndToRemove);
}
}
//! FindKey //! FindKey
const TheKeyType& FindKey (const Standard_Integer theKey2) const const TheKeyType& FindKey (const Standard_Integer theKey2) const
{ {

7
src/NCollection/NCollection_Map.hxx
View File

@ -56,9 +56,12 @@ template < class TheKeyType,
class Hasher = NCollection_DefaultHasher<TheKeyType> > class Hasher = NCollection_DefaultHasher<TheKeyType> >
class NCollection_Map : public NCollection_BaseMap class NCollection_Map : public NCollection_BaseMap
{ {
//! Adaptation of the TListNode to the map notations public:
public: //! STL-compliant typedef for key type
typedef TheKeyType key_type;
public:
//! Adaptation of the TListNode to the map notations
class MapNode : public NCollection_TListNode<TheKeyType> class MapNode : public NCollection_TListNode<TheKeyType>
{ {
public: public:

16
src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx
View File

@ -186,14 +186,7 @@ static Standard_Boolean AddOrdinaryEdges(TopTools_SequenceOfShape& edges,
for(TopExp_Explorer exp(aShape,TopAbs_EDGE); exp.More(); exp.Next()) { for(TopExp_Explorer exp(aShape,TopAbs_EDGE); exp.More(); exp.Next()) {
TopoDS_Shape edge = exp.Current(); TopoDS_Shape edge = exp.Current();
if(aNewEdges.Contains(edge)) if(aNewEdges.Contains(edge))
{ aNewEdges.RemoveKey(edge);
//aNewEdges.Remove(edge);
TopoDS_Shape LastEdge = aNewEdges(aNewEdges.Extent());
aNewEdges.RemoveLast();
if (aNewEdges.FindIndex(edge) != 0)
aNewEdges.Substitute(aNewEdges.FindIndex(edge), LastEdge);
/////////////////////////
}
else else
aNewEdges.Add(edge); aNewEdges.Add(edge);
} }
@ -205,12 +198,7 @@ static Standard_Boolean AddOrdinaryEdges(TopTools_SequenceOfShape& edges,
TopoDS_Shape current = edges(i); TopoDS_Shape current = edges(i);
if(aNewEdges.Contains(current)) { if(aNewEdges.Contains(current)) {
//aNewEdges.Remove(current); aNewEdges.RemoveKey(current);
TopoDS_Shape LastEdge = aNewEdges(aNewEdges.Extent());
aNewEdges.RemoveLast();
if (aNewEdges.FindIndex(current) != 0)
aNewEdges.Substitute(aNewEdges.FindIndex(current), LastEdge);
/////////////////////////
edges.Remove(i); edges.Remove(i);
i--; i--;

11
tests/bugs/modalg_6/bug28782 Normal file
View File

@ -0,0 +1,11 @@
puts "========"
puts "0028782: Shape sewing behavior not consistent for the same CAD file"
puts "========"
puts ""
binrestore [locate_data_file bug28782.bbrep] a
tcopy a a1
sewing r 0.001 a
sewing r1 0.001 a1
checknbshapes r1 -ref [nbshapes r]