Fix for the issue #593: do not remove naming attribute, but use TNaming_Builder for...

[modules/shaper.git] / src / ModelAPI / ModelAPI_Feature.cpp

diff --git a/src/ModelAPI/ModelAPI_Feature.cpp b/src/ModelAPI/ModelAPI_Feature.cpp
index 1fe0244f0d91aa4a654cf10bdf77d4a00668f4f3..e29fff7d09f69e54a05fef982cc4cd2396f1fbde 100644 (file)
--- a/src/ModelAPI/ModelAPI_Feature.cpp
+++ b/src/ModelAPI/ModelAPI_Feature.cpp
@@ -80,13 +80,36 @@ void ModelAPI_Feature::removeResult(const std::shared_ptr<ModelAPI_Result>& theR
   aLoop->flush(aRedispEvent);
 }
 
+void ModelAPI_Feature::eraseResultFromList(const std::shared_ptr<ModelAPI_Result>& theResult)
+{
+  std::list<std::shared_ptr<ModelAPI_Result> >::iterator aResIter = myResults.begin();
+  for(; aResIter != myResults.end(); aResIter++) {
+    ResultPtr aRes = *aResIter;
+    if (aRes == theResult) {
+      std::string aGroup = aRes->groupName();
+      aRes->data()->erase();
+      myResults.erase(aResIter);
+
+      static Events_Loop* aLoop = Events_Loop::loop();
+      static Events_ID EVENT_DISP = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+      static const ModelAPI_EventCreator* aECreator = ModelAPI_EventCreator::get();
+      ModelAPI_EventCreator::get()->sendDeleted(document(), aGroup);
+      aECreator->sendUpdated(aRes, EVENT_DISP);
+      break;
+    }
+  }
+}
+
 void ModelAPI_Feature::removeResults(const int theSinceIndex, const bool theFlush)
 {
   std::list<std::shared_ptr<ModelAPI_Result> >::iterator aResIter = myResults.begin();
   for(int anIndex = 0; anIndex < theSinceIndex && aResIter != myResults.end(); anIndex++)
     aResIter++;
+
+  std::string aGroup;
   std::list<std::shared_ptr<ModelAPI_Result> >::iterator aNextIter = aResIter;
   while( aNextIter != myResults.end()) {
+    aGroup = (*aNextIter)->groupName();
     // remove previously erased results: to enable later if needed only actual (of history change)
     if (theSinceIndex == 0 && (*aNextIter)->isDisabled()) {
       aNextIter = myResults.erase(aNextIter);
@@ -95,11 +118,13 @@ void ModelAPI_Feature::removeResults(const int theSinceIndex, const bool theFlus
       aNextIter++;
     }
   }
-  if (theFlush) {
+  if (!aGroup.empty() && theFlush) {
     // flush visualisation changes
     static Events_Loop* aLoop = Events_Loop::loop();
     static Events_ID aRedispEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
     aLoop->flush(aRedispEvent);
+    static Events_ID aDelEvent = aLoop->eventByName(EVENT_OBJECT_DELETED);
+    aLoop->flush(aDelEvent);
   }
 }
 
@@ -117,15 +142,19 @@ const std::string& ModelAPI_Feature::documentToAdd()
 
 void ModelAPI_Feature::erase()
 {
+  // if this is the current feature, make the upper feature as current before removing
+  if (document().get() && document()->currentFeature(false).get() == this) {
+    document()->setCurrentFeatureUp();
+  }
+
   static Events_Loop* aLoop = Events_Loop::loop();
   static Events_ID EVENT_DISP = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
   static const ModelAPI_EventCreator* aECreator = ModelAPI_EventCreator::get();
 
   while (!myResults.empty()) {  // remove one by one with messages
     std::shared_ptr<ModelAPI_Result> aRes = *(myResults.begin());
+    aRes->setDisabled(aRes, true); // to avoid activation of the Part result
     myResults.erase(myResults.begin());
-    aECreator->sendDeleted(aRes->document(), aRes->groupName());
-    aECreator->sendUpdated(aRes, EVENT_DISP);
   }
   ModelAPI_Object::erase();
 }