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

0031517: Data Exchange - wrong result of ShapeTool::UpdateAssemblies()

Browse Source 
Get rid of problem with updating of parents shared one assembly.
This commit is contained in:
ika
2020-04-23 17:58:59 +03:00
committed by bugmaster
parent 7ff18fb9cc
commit 331bcfc0d0
3 changed files with 55 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/XCAFDoc/XCAFDoc_ShapeTool.cxx
View File

@@ -1012,6 +1012,7 @@ void XCAFDoc_ShapeTool::UpdateAssemblies()
GetFreeShapes(aRootLabels);
// Iterate over the free shapes
TDF_LabelMap anUpdated;
for ( TDF_LabelSequence::Iterator anIt(aRootLabels); anIt.More(); anIt.Next() )
{
TDF_Label aRefLabel = anIt.Value();
@@ -1021,7 +1022,7 @@ void XCAFDoc_ShapeTool::UpdateAssemblies()
}
const TDF_Label& aRootLab = aRefLabel;
TopoDS_Shape anAssemblyShape;
updateComponent(aRootLab, anAssemblyShape);
updateComponent(aRootLab, anAssemblyShape, anUpdated);
}
}
@@ -2003,7 +2004,8 @@ void XCAFDoc_ShapeTool::makeSubShape (const TDF_Label& theMainShapeL,
//=======================================================================
Standard_Boolean XCAFDoc_ShapeTool::updateComponent(const TDF_Label& theItemLabel,
TopoDS_Shape& theUpdatedShape) const
TopoDS_Shape& theUpdatedShape,
TDF_LabelMap& theUpdated) const
{
if ( !IsAssembly(theItemLabel) )
return Standard_False; // Do nothing for non-assemblies
@@ -2011,6 +2013,13 @@ Standard_Boolean XCAFDoc_ShapeTool::updateComponent(const TDF_Label& theItemLabe
// Get the currently stored compound for the assembly
TopoDS_Shape aCurrentRootShape;
GetShape(theItemLabel, aCurrentRootShape);
// Check if the given assembly is already updated
if (theUpdated.Contains(theItemLabel)) {
theUpdatedShape = aCurrentRootShape;
return Standard_True;
}
TopTools_MapOfOrientedShape aCurrentRootShapeMap (aCurrentRootShape.NbChildren());
// Get components of the assembly
@@ -2051,11 +2060,9 @@ Standard_Boolean XCAFDoc_ShapeTool::updateComponent(const TDF_Label& theItemLabe
if ( IsAssembly(aComponentRefLab) )
{
// Recursive call
if ( updateComponent(aComponentRefLab, aComponentShape) )
if ( updateComponent(aComponentRefLab, aComponentShape, theUpdated) )
{
if ( !isModified )
isModified = Standard_True;
isModified = Standard_True;
aComponentShape.Location(aComponentLoc); // Apply placement
}
}
@@ -2106,6 +2113,9 @@ Standard_Boolean XCAFDoc_ShapeTool::updateComponent(const TDF_Label& theItemLabe
NB.Generated(theUpdatedShape);
}
if (isModified)
theUpdated.Add(theItemLabel);
return isModified;
}