0023047: Behaviour of XDE sample is non-stable

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).

diff --git a/src/XCAFDoc/XCAFDoc_ShapeTool.cdl b/src/XCAFDoc/XCAFDoc_ShapeTool.cdl
index 286ae52f5344c84d5bd8c5aa9fb3bf0a872bf904..11b6094bd9a5d28e72744ce436da760c553bae54 100755 (executable)
--- a/src/XCAFDoc/XCAFDoc_ShapeTool.cdl
+++ b/src/XCAFDoc/XCAFDoc_ShapeTool.cdl
@@ -239,8 +239,12 @@ is
        ---Purpose: Adds a new top-level (creates and returns a new label)
        --          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)
+    --          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
        --          or is not top-level shape
     

diff --git a/src/XCAFDoc/XCAFDoc_ShapeTool.cxx b/src/XCAFDoc/XCAFDoc_ShapeTool.cxx
index 014926ac27529747a8afe69fa1c26dc48fe223ce..7f85299ba9a1cb4e47da595ed6dd884dded346c5 100755 (executable)
--- a/src/XCAFDoc/XCAFDoc_ShapeTool.cxx
+++ b/src/XCAFDoc/XCAFDoc_ShapeTool.cxx
@@ -607,10 +607,27 @@ TDF_Label XCAFDoc_ShapeTool::AddShape (const TopoDS_Shape& theShape,
 //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;
+
+  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);
+
+  if (removeCompletely && !aLabel.IsNull())
+  {
+    return RemoveShape(aLabel);
+  }
   return Standard_True;
 }
 

diff --git a/src/XDEDRAW/XDEDRAW_Shapes.cxx b/src/XDEDRAW/XDEDRAW_Shapes.cxx
index 06c24273d8c2d7e6558b82572397eca508c65a66..9a547f7ccd25547689f234108be236daf6b4c6b8 100755 (executable)
--- a/src/XDEDRAW/XDEDRAW_Shapes.cxx
+++ b/src/XDEDRAW/XDEDRAW_Shapes.cxx
@@ -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)
 {
-  if (argc!=3) {
-    di<<"Use: "<<argv[0]<<" DocName Label"<<"\n";
+  if (argc != 3 && argc != 4)
+  {
+    di<<"Use: "<<argv[0]<<" DocName Label [int removeCompletely (1/0)]"<<"\n";
     return 1;
   }
   Handle(TDocStd_Document) Doc;   
@@ -158,7 +159,10 @@ static Standard_Integer removeShape (Draw_Interpretor& di, Standard_Integer argc
 //  XCAFDoc_ShapeTool myAssembly;
 //  myAssembly.Init(Doc);
   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;
 }