OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0023047: Behaviour of XDE sample is non-stable

Browse Source 
Changed behavior of XCAFDoc_ShapeTool::RemoveShape(const TDF_Label& L) function. Now if L is a location for a shape then function will also removes the label with a shape.
Added Boolean argument to the XCAFDoc_ShapeTool::RemoveShape function which allow to choose either to delete an instance or a complete shape. (Standard_True by default, removes complete shape).
This commit is contained in:
dbv 2012-05-25 15:00:08 +04:00
parent 1bfe997514
commit a7aa146538
3 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/XCAFDoc/XCAFDoc_ShapeTool.cdl
View File

@ -239,8 +239,12 @@ is
---Purpose: Adds a new top-level (creates and returns a new label) ---Purpose: Adds a new top-level (creates and returns a new label)
-- For internal use. Used by public method AddShape. -- For internal use. Used by public method AddShape.
RemoveShape (me; L: Label from TDF) returns Boolean; RemoveShape (me; L: Label from TDF;
removeCompletely: Boolean = Standard_True)
returns Boolean;
---Purpose: Removes shape (whole label and all its sublabels) ---Purpose: Removes shape (whole label and all its sublabels)
-- If removeCompletely is true, removes complete shape
-- If removeCompletely is false, removes instance(location) only
-- Returns False (and does nothing) if shape is not free -- Returns False (and does nothing) if shape is not free
-- or is not top-level shape -- or is not top-level shape

19
src/XCAFDoc/XCAFDoc_ShapeTool.cxx
View File

@ -607,10 +607,27 @@ TDF_Label XCAFDoc_ShapeTool::AddShape (const TopoDS_Shape& theShape,
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Boolean XCAFDoc_ShapeTool::RemoveShape (const TDF_Label& L) const Standard_Boolean XCAFDoc_ShapeTool::RemoveShape (const TDF_Label& L,
const Standard_Boolean removeCompletely) const
{ {
if ( ! IsTopLevel ( L ) || ! IsFree ( L ) ) return Standard_False; if ( ! IsTopLevel ( L ) || ! IsFree ( L ) ) return Standard_False;
Handle(TDataStd_TreeNode) aNode;
TDF_Label aLabel;
if (removeCompletely &&
L.FindAttribute (XCAFDoc::ShapeRefGUID(), aNode) &&
aNode->HasFather() &&
L.IsAttribute (XCAFDoc_Location::GetID()))
{
aLabel = aNode->Father()->Label();
}
L.ForgetAllAttributes (Standard_True); L.ForgetAllAttributes (Standard_True);
if (removeCompletely && !aLabel.IsNull())
{
return RemoveShape(aLabel);
}
return Standard_True; return Standard_True;
} }

10
src/XDEDRAW/XDEDRAW_Shapes.cxx
View File

@ -143,8 +143,9 @@ static Standard_Integer getShape (Draw_Interpretor& di, Standard_Integer argc, c
static Standard_Integer removeShape (Draw_Interpretor& di, Standard_Integer argc, const char** argv) static Standard_Integer removeShape (Draw_Interpretor& di, Standard_Integer argc, const char** argv)
{ {
if (argc!=3) { if (argc != 3 && argc != 4)
di<<"Use: "<<argv[0]<<" DocName Label"<<"\n"; {
di<<"Use: "<<argv[0]<<" DocName Label [int removeCompletely (1/0)]"<<"\n";
return 1; return 1;
} }
Handle(TDocStd_Document) Doc; Handle(TDocStd_Document) Doc;
@ -158,7 +159,10 @@ static Standard_Integer removeShape (Draw_Interpretor& di, Standard_Integer argc
// XCAFDoc_ShapeTool myAssembly; // XCAFDoc_ShapeTool myAssembly;
// myAssembly.Init(Doc); // myAssembly.Init(Doc);
Handle(XCAFDoc_ShapeTool) myAssembly = XCAFDoc_DocumentTool::ShapeTool(Doc->Main()); Handle(XCAFDoc_ShapeTool) myAssembly = XCAFDoc_DocumentTool::ShapeTool(Doc->Main());
myAssembly->RemoveShape(aLabel); Standard_Boolean removeCompletely = Standard_True;
if ( argc == 4 && atoi(argv[3]) == 0 )
removeCompletely = Standard_False;
myAssembly->RemoveShape(aLabel, removeCompletely);
return 0; return 0;
} }