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

0026314: Method SetShape working not correctly.

Browse Source 
Test-cases for issues #25441 and #26314
small correction

Small corrections of test-cases for issues #25441 and #26314
This commit is contained in:
ink
2015-06-18 13:54:09 +03:00
committed by bugmaster
parent ea764884ab
commit e2df45413e
6 changed files with 118 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/XCAFDoc/XCAFDoc_ShapeTool.cxx
View File

@@ -401,26 +401,32 @@ TDF_Label XCAFDoc_ShapeTool::NewShape() const
//=======================================================================
void XCAFDoc_ShapeTool::SetShape (const TDF_Label& L, const TopoDS_Shape& S)
{
{
if(IsReference(L) || !IsTopLevel(L) || /*IsAssembly(L) ||*/ !S.Location().IsIdentity())
return;
TDF_LabelSequence aSubShapes;
GetSubShapes(L, aSubShapes);
TNaming_Builder tnBuild(L);
tnBuild.Generated(S);
Handle(XCAFDoc_ShapeMapTool) A = XCAFDoc_ShapeMapTool::Set(L);
// if ( ! L.FindAttribute(XCAFDoc_ShapeMapTool::GetID(), A) ) {
// A = XCAFDoc_ShapeMapTool::Set(L);
// L.AddAttribute(A);
// }
A->SetShape(S);
for(Standard_Integer i = 1; i<=aSubShapes.Length(); i++)
{
TDF_Label aSubLabel = aSubShapes(i);
if (!IsSubShape(L, GetShape(aSubLabel)))
{
aSubLabel.ForgetAllAttributes();
}
}
if(!myShapeLabels.IsBound(S)) {
myShapeLabels.Bind(S,L);
}
//:abv 31.10.01: update assemblies that refer a shape
TDF_LabelSequence Labels;
if ( GetUsers ( L, Labels, Standard_True ) ) {
for ( Standard_Integer i=Labels.Length(); i >=1; i-- )
UpdateAssembly ( Labels(i) );
}
UpdateAssociatedAssembly(L);
}
//=======================================================================
@@ -991,6 +997,26 @@ void XCAFDoc_ShapeTool::RemoveComponent (const TDF_Label& comp) const
}
}
//=======================================================================
//function : UpdateAssociatedAssembly
//purpose :
//=======================================================================
void XCAFDoc_ShapeTool::UpdateAssociatedAssembly (const TDF_Label& L) const
{
TDF_LabelSequence Labels;
if ( GetUsers ( L, Labels ) ) {
for ( Standard_Integer i=Labels.Length(); i >=1; i-- )
{
TDF_Label anAssemblyLabel = Labels(i).Father();
if(!anAssemblyLabel.IsNull())
{
UpdateAssembly(anAssemblyLabel);
}
}
}
}
//=======================================================================
//function : UpdateAssembly
//purpose :
@@ -1000,19 +1026,38 @@ void XCAFDoc_ShapeTool::UpdateAssembly (const TDF_Label& L) const
{
if ( ! IsAssembly(L) ) return;
TopoDS_Compound newassembly;
BRep_Builder b;
b.MakeCompound(newassembly);
TopoDS_Shape aShape = GetShape(L);
Standard_Boolean isFree = aShape.Free();
if (!isFree)
aShape.Free(Standard_True);
TopTools_SequenceOfShape aSubShapeSeq;
TopoDS_Iterator Iterator(aShape);
for (; Iterator.More(); Iterator.Next())
aSubShapeSeq.Append(Iterator.Value());
for (Standard_Integer i = 1; i <= aSubShapeSeq.Length(); i++)
b.Remove(aShape, aSubShapeSeq.Value(i));
TDF_ChildIterator chldLabIt(L);
for (; chldLabIt.More(); chldLabIt.Next() ) {
TDF_Label subLabel = chldLabIt.Value();
if ( IsComponent ( subLabel ) ) {
b.Add(newassembly, GetShape(subLabel));
b.Add(aShape, GetShape(subLabel));
}
}
if (!isFree)
aShape.Free(Standard_False);
TNaming_Builder tnBuild(L);
tnBuild.Generated(newassembly);
tnBuild.Generated(aShape);
Handle(XCAFDoc_ShapeMapTool) A = XCAFDoc_ShapeMapTool::Set(L);
A->SetShape(aShape);
UpdateAssociatedAssembly(L);
}
//=======================================================================