Erroneous cases in SALOME mode: Sketch, start sub-feature operation[some control...

[modules/shaper.git] / src / PartSetPlugin / PartSetPlugin_Remove.cpp

diff --git a/src/PartSetPlugin/PartSetPlugin_Remove.cpp b/src/PartSetPlugin/PartSetPlugin_Remove.cpp
index d459d9753a76aa8e4bb3176279b186e2c7f3e4ac..d74666a65b208b0ee6bee701ff630f5e2942fd6d 100644 (file)
--- a/src/PartSetPlugin/PartSetPlugin_Remove.cpp
+++ b/src/PartSetPlugin/PartSetPlugin_Remove.cpp
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        PartSetPlugin_Remove.cxx
 // Created:     20 May 2014
 // Author:      Mikhail PONIKAROV
@@ -9,25 +11,24 @@
 #include <ModelAPI_AttributeDocRef.h>
 #include <ModelAPI_ResultPart.h>
 #include <ModelAPI_Session.h>
+#include <ModelAPI_Feature.h>
+#include <ModelAPI_Tools.h>
 
 void PartSetPlugin_Remove::execute()
 {
-  boost::shared_ptr<ModelAPI_Session> aPManager = ModelAPI_Session::get();
-  boost::shared_ptr<ModelAPI_Document> aRoot = aPManager->moduleDocument();
-  boost::shared_ptr<ModelAPI_Document> aCurrent;
-  boost::shared_ptr<PartSetPlugin_Part> a;
-  for (int a = aRoot->size(ModelAPI_ResultPart::group()) - 1; a >= 0; a--) {
-    ResultPartPtr aPart = boost::dynamic_pointer_cast<ModelAPI_ResultPart>(
-        aRoot->object(ModelAPI_ResultPart::group(), a));
-    if (aPart
-        && aPart->data()->document(ModelAPI_ResultPart::DOC_REF())->value()
-            == aPManager->activeDocument()) {
-      FeaturePtr aFeature = aRoot->feature(aPart);
-      if (aFeature) {
-        // do remove
-        aPart->data()->document(ModelAPI_ResultPart::DOC_REF())->value()->close();
+  std::shared_ptr<ModelAPI_Session> aPManager = ModelAPI_Session::get();
+  std::shared_ptr<ModelAPI_Document> aRoot = aPManager->moduleDocument();
+  DocumentPtr aThisDoc = document();
+  ResultPtr aPart = ModelAPI_Tools::findPartResult(aRoot, aThisDoc);
+  if (aPart.get()) {
+    FeaturePtr aFeature = aRoot->feature(aPart);
+    if (aFeature) {
+      // do remove
+      aPart->data()->document(ModelAPI_ResultPart::DOC_REF())->value()->close();
+      std::set<std::shared_ptr<ModelAPI_Feature> > aRefFeatures;
+      aRoot->refsToFeature(aFeature, aRefFeatures);
+      if (aRefFeatures.empty())
         aRoot->removeFeature(aFeature);
-      }
     }
   }
 }