X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSetPlugin%2FPartSetPlugin_Remove.cpp;h=1c8b921d47d86880703cd566f83c2f4df6e862a4;hb=15fc1914159f4671968f56eb32d878a022edcd8b;hp=d459d9753a76aa8e4bb3176279b186e2c7f3e4ac;hpb=0b06415cbaab3da89567c28ea4a7ae6ecf50511b;p=modules%2Fshaper.git

diff --git a/src/PartSetPlugin/PartSetPlugin_Remove.cpp b/src/PartSetPlugin/PartSetPlugin_Remove.cpp
index d459d9753..1c8b921d4 100644
--- a/src/PartSetPlugin/PartSetPlugin_Remove.cpp
+++ b/src/PartSetPlugin/PartSetPlugin_Remove.cpp
@@ -1,32 +1,56 @@
-// File:        PartSetPlugin_Remove.cxx
-// Created:     20 May 2014
-// Author:      Mikhail PONIKAROV
+// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
 
 #include "PartSetPlugin_Remove.h"
 #include "PartSetPlugin_Part.h"
+
 #include <ModelAPI_Document.h>
 #include <ModelAPI_Data.h>
 #include <ModelAPI_AttributeDocRef.h>
 #include <ModelAPI_ResultPart.h>
 #include <ModelAPI_Session.h>
+#include <ModelAPI_Feature.h>
+#include <ModelAPI_Tools.h>
+#include <ModelAPI_Events.h>
+
+#include <Events_Loop.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, but don't do real close (features are erased without persistence changes
+      // document remove may be undoed)
+      // 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);
+        // the redisplay signal should be flushed in order to erase the feature presentation
+        // in the viewer after removeFeature from the document
+        Events_Loop::loop()->flush(Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY));
       }
     }
   }