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

0024645: Pointer to the last is wrong for a tree node

Browse Source 
Information on last child is added to the Dump() method + fixed a problem of lost last child tree node on removal (detach) operation.
Test case for issue CR24645
This commit is contained in:
vro 2014-02-27 18:43:38 +04:00 committed by apn
parent 49663e13f0
commit bf5b529346
2 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/TDataStd/TDataStd_TreeNode.cxx
View File

@ -235,12 +235,7 @@ Standard_Boolean TDataStd_TreeNode::Remove ()
} }
if(Father()->HasLast()) { if(Father()->HasLast()) {
if (Handle(TDataStd_TreeNode)::DownCast(this) == Father()->Last()) { Father()->SetLast(bid);
if(HasPrevious()) {
Father()->SetLast(Previous());
}
else Father()->SetLast(bid);
}
} }
SetFather(bid); SetFather(bid);
@ -698,6 +693,10 @@ Standard_OStream& TDataStd_TreeNode::Dump (Standard_OStream& anOS) const
anOS<<" First="; anOS<<" First=";
if (!myFirst->Label().IsNull()) myFirst->Label().EntryDump(anOS); if (!myFirst->Label().IsNull()) myFirst->Label().EntryDump(anOS);
} }
if (myLast) {
anOS<<" Last=";
if (!myLast->Label().IsNull()) myLast->Label().EntryDump(anOS);
}
anOS<<endl; anOS<<endl;
return anOS; return anOS;
} }

45
tests/bugs/caf/bug24645 Normal file
View File

@ -0,0 +1,45 @@
puts "=========="
puts "OCC24645"
puts "=========="
puts ""
###################################################
# Pointer to the last is wrong for a tree node
###################################################
NewDocument D
UndoLimit D 1000
NewCommand D
SetNode D 0:1
NewCommand D
AppendNode D 0:1 0:1:1
NewCommand D
AppendNode D 0:1 0:1:2
NewCommand D
AppendNode D 0:1 0:1:3
NewCommand D
AppendNode D 0:1 0:1:4
NewCommand D
AppendNode D 0:1 0:1:5
if { [regexp "Last=0:1:5" [XDumpDF D] ] == 1 } {
puts "OK : Last node is good"
} else {
puts "Error : Last node is bad"
}
puts ""
DetachNode D 0:1:3
DetachNode D 0:1:4
NewCommand D
Undo D
if { [regexp "Last" [XDumpDF D] ] != 1 } {
puts "OK : Last node is not defined"
} else {
puts "Error : Last node is bad"
}
puts ""