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

0029716: Some TDF and XCAFDoc labels-related issues

Browse Source 
1. "Descendants" closure mode is not taken into account by TDF closure tool
2. CopyTool always creates a new label at the target ignoring the relocation table
3. XCAFDoc_GraphNode throws an exception if Child of Father is not found during the unsetting
This commit is contained in:
drazmyslovich 2018-04-23 15:47:52 +02:00 committed by bugmaster
parent cf4bee7c0c
commit 6e7791948b
3 changed files with 85 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/TDF/TDF_ClosureTool.cxx
View File

@ -72,7 +72,8 @@ void TDF_ClosureTool::Closure
const TDF_Label& lab = labLItr.Value();
if (lab.HasAttribute())
TDF_ClosureTool::LabelAttributes(lab,labMap,attMap,aFilter,aMode);
TDF_ClosureTool::Closure(lab,labMap,attMap,aFilter,aMode);
if (aMode.Descendants())
TDF_ClosureTool::Closure(lab,labMap,attMap,aFilter,aMode);
}
}

25
src/TDF/TDF_CopyTool.cxx
View File

@ -153,12 +153,25 @@ void TDF_CopyTool::CopyLabels
// Does the same for the children.
for (TDF_ChildIterator childItr(aSLabel); childItr.More(); childItr.Next()){
const TDF_Label& childSLab = childItr.Value();
if (aSrcLabelMap.Contains(childSLab)) {
TDF_Label childTIns = aTargetLabel.FindChild(childSLab.Tag());
aLabMap.Bind(childSLab,childTIns);
TDF_CopyTool::CopyLabels(childSLab,childTIns,
aLabMap,aAttMap,
aSrcLabelMap,aSrcAttributeMap);
if (aSrcLabelMap.Contains(childSLab))
{
TDF_Label childTIns;
if (aLabMap.IsBound (childSLab))
{
childTIns = aLabMap.Find (childSLab);
}
else
{
childTIns = aTargetLabel.FindChild (childSLab.Tag ());
aLabMap.Bind (childSLab, childTIns);
}
TDF_CopyTool::CopyLabels
(
childSLab,childTIns,
aLabMap,aAttMap,
aSrcLabelMap,aSrcAttributeMap
);
}
}
}

89
src/XCAFDoc/XCAFDoc_GraphNode.cxx
View File

@ -142,8 +142,10 @@ void XCAFDoc_GraphNode::UnSetFather(const Handle(XCAFDoc_GraphNode)& F)
{
Standard_Integer Findex = FatherIndex(F);
if (Findex != 0)
F->UnSetChildlink(this);
UnSetFatherlink(F);
{
F->UnSetChildlink (this);
UnSetFatherlink (F);
}
}
@ -155,7 +157,9 @@ void XCAFDoc_GraphNode::UnSetFather(const Handle(XCAFDoc_GraphNode)& F)
void XCAFDoc_GraphNode::UnSetFather(const Standard_Integer Findex)
{
if (Findex != 0)
UnSetFather( GetFather(Findex) );
{
UnSetFather (GetFather (Findex));
}
}
@ -167,7 +171,11 @@ void XCAFDoc_GraphNode::UnSetFather(const Standard_Integer Findex)
void XCAFDoc_GraphNode::UnSetFatherlink(const Handle(XCAFDoc_GraphNode)& F)
{
Backup();
myFathers.Remove( FatherIndex(F) );
Standard_Integer Findex = FatherIndex (F);
if (Findex != 0)
{
myFathers.Remove( Findex );
}
}
//=======================================================================
@ -178,9 +186,11 @@ void XCAFDoc_GraphNode::UnSetFatherlink(const Handle(XCAFDoc_GraphNode)& F)
void XCAFDoc_GraphNode::UnSetChild(const Handle(XCAFDoc_GraphNode)& Ch)
{
Standard_Integer Chindex = ChildIndex(Ch);
if (Chindex != 0)
Ch->UnSetFatherlink(this);
UnSetChildlink(Ch);
if (Chindex != 0)
{
Ch->UnSetFatherlink (this);
UnSetChildlink (Ch);
}
}
@ -191,8 +201,10 @@ void XCAFDoc_GraphNode::UnSetChild(const Handle(XCAFDoc_GraphNode)& Ch)
void XCAFDoc_GraphNode::UnSetChild(const Standard_Integer Chindex)
{
if (Chindex != 0 )
UnSetChild( GetChild(Chindex) );
if (Chindex != 0)
{
UnSetChild (GetChild (Chindex));
}
}
@ -204,7 +216,11 @@ void XCAFDoc_GraphNode::UnSetChild(const Handle(XCAFDoc_GraphNode)& Ch)
void XCAFDoc_GraphNode::UnSetChildlink(const Handle(XCAFDoc_GraphNode)& Ch)
{
Backup();
myChildren.Remove( ChildIndex(Ch) );
Standard_Integer Chindex = ChildIndex (Ch);
if (Chindex != 0)
{
myChildren.Remove (Chindex);
}
}
//=======================================================================
@ -237,9 +253,14 @@ void XCAFDoc_GraphNode::UnSetChildlink(const Handle(XCAFDoc_GraphNode)& Ch)
Standard_Integer XCAFDoc_GraphNode::FatherIndex(const Handle(XCAFDoc_GraphNode)& F) const
{
Standard_Integer Findex = 0;
if (NbFathers()!=0) {
for (Findex = 1 ; Findex <= NbFathers(); Findex++) {
if ( F == myFathers.Value(Findex)) return Findex;
if (NbFathers() != 0)
{
for (Findex = 1 ; Findex <= NbFathers(); Findex++)
{
if (F == myFathers.Value (Findex))
{
return Findex;
}
}
}
return 0;
@ -253,9 +274,14 @@ Standard_Integer XCAFDoc_GraphNode::FatherIndex(const Handle(XCAFDoc_GraphNode)&
Standard_Integer XCAFDoc_GraphNode::ChildIndex(const Handle(XCAFDoc_GraphNode)& Ch) const
{
Standard_Integer Chindex;
if (NbChildren()!=0) {
for (Chindex = 1; Chindex <= NbChildren(); Chindex++) {
if ( Ch == myChildren.Value(Chindex)) return Chindex;
if (NbChildren() != 0)
{
for (Chindex = 1; Chindex <= NbChildren(); Chindex++)
{
if (Ch == myChildren.Value (Chindex))
{
return Chindex;
}
}
}
return 0;
@ -345,18 +371,27 @@ void XCAFDoc_GraphNode::Paste(const Handle(TDF_Attribute)& into,
Handle(XCAFDoc_GraphNode) func;
Standard_Integer i = 1;
for (; i <= NbFathers(); i++) {
if (!RT->HasRelocation(myFathers(i), func) && RT->AfterRelocate()) {
if (!RT->HasRelocation(myFathers(i), func) && RT->AfterRelocate())
{
func.Nullify();
}
intof->SetFather(func);
if (!func.IsNull())
{
intof->SetFather(func);
}
}
i = 1;
for (; i <= NbChildren(); i++) {
if (!RT->HasRelocation(myChildren(i), func) && RT->AfterRelocate()) {
for (; i <= NbChildren(); i++)
{
if (!RT->HasRelocation(myChildren(i), func) && RT->AfterRelocate())
{
func.Nullify();
}
intof->SetFather(func);
if (!func.IsNull())
{
intof->SetChild(func);
}
}
intof->SetGraphID(myGraphID);
}
@ -436,8 +471,12 @@ Standard_OStream& XCAFDoc_GraphNode::Dump (Standard_OStream& anOS) const
void XCAFDoc_GraphNode::BeforeForget()
{
while ( myFathers.Length() > 0 )
UnSetFather(1);
while ( myChildren.Length() > 0 )
UnSetChild(1);
while (myFathers.Length () > 0)
{
UnSetFather (1);
}
while (myChildren.Length () > 0)
{
UnSetChild (1);
}
}