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

0028226: Incorrect history support in ShapeUpgrade_UnifySameDomain algorithm

Browse Source 
- The methods "Modified" and "IsDeleted" have been added for history support in "ShapeUpgrade_UnifySameDomain" class.
- The new Draw commands "unifysamedommod" and "unifysamedomisdel" have been added.
- Adoption of other algorithms using this one to its new behavior.

Removing code duplication

Correcting regressions

Correcting remarks
This commit is contained in:
imn
2017-03-09 19:20:43 +03:00
committed by bugmaster
parent f1191d3099
commit 20aa0d3fdd
7 changed files with 364 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/BRepOffsetAPI/BRepOffsetAPI_MiddlePath.cxx
View File

@@ -257,6 +257,41 @@ BRepOffsetAPI_MiddlePath::BRepOffsetAPI_MiddlePath(const TopoDS_Shape& aShape,
}
*/
//=======================================================================
//function : GetUnifiedWire
//purpose :
//=======================================================================
static TopoDS_Wire GetUnifiedWire(const TopoDS_Wire& theWire,
ShapeUpgrade_UnifySameDomain& theUnifier)
{
BRepLib_MakeWire aWMaker;
BRepTools_WireExplorer wexp(theWire);
TopTools_MapOfShape aGeneratedEdges;
for (; wexp.More(); wexp.Next())
{
TopoDS_Shape anEdge = wexp.Current();
const TopTools_ListOfShape& aLSG = theUnifier.Generated(anEdge);
// take care of processing the result of Generated() before getting Modified()
Standard_Boolean isEmpty = aLSG.IsEmpty();
if (!isEmpty) {
TopTools_ListIteratorOfListOfShape anIt(aLSG);
for (; anIt.More(); anIt.Next()) {
const TopoDS_Shape& aShape = anIt.Value();
//wire shouldn't contain duplicated generated edges
if (aGeneratedEdges.Add(aShape))
aWMaker.Add(TopoDS::Edge(aShape));
}
}
const TopTools_ListOfShape& aLSM = theUnifier.Modified(anEdge);
if (!aLSM.IsEmpty())
aWMaker.Add(aLSM);
else if (isEmpty)
// no change, put original edge
aWMaker.Add(TopoDS::Edge(anEdge));
}
return aWMaker.Wire();
}
//=======================================================================
//function : BRepOffsetAPI_MiddlePath
//purpose : Constructor
@@ -287,28 +322,8 @@ BRepOffsetAPI_MiddlePath::BRepOffsetAPI_MiddlePath(const TopoDS_Shape& aShape,
else
anEndWire = TopoDS::Wire(EndShape);
BRepLib_MakeWire MWstart;
//TopTools_MapOfShape MapEdges;
BRepTools_WireExplorer wexp(aStartWire);
for (; wexp.More(); wexp.Next())
{
TopoDS_Shape anEdge = wexp.Current();
TopoDS_Shape NewEdge = Unifier.Generated(anEdge);
if (!NewEdge.IsNull())
MWstart.Add(TopoDS::Edge(NewEdge));
}
myStartWire = MWstart.Wire();
BRepLib_MakeWire MWend;
//MapEdges.Clear();
for (wexp.Init(anEndWire); wexp.More(); wexp.Next())
{
TopoDS_Shape anEdge = wexp.Current();
TopoDS_Shape NewEdge = Unifier.Generated(anEdge);
if (!NewEdge.IsNull())
MWend.Add(TopoDS::Edge(NewEdge));
}
myEndWire = MWend.Wire();
myStartWire = GetUnifiedWire(aStartWire, Unifier);
myEndWire = GetUnifiedWire(anEndWire, Unifier);
myClosedSection = myStartWire.Closed();
myClosedRing = myStartWire.IsSame(myEndWire);