X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FModelAPI_Feature.cpp;h=5b9d7e3d4e0f3da971bd37d24dd6347179928f9f;hb=1cef78af4c4328ecf99a3ced86bda38e6e82e15c;hp=e7f96587c2be002f7acea66a403d83f1bb18efc9;hpb=298e667eb49d3d1441664d76c1ab4f5fdc80645e;p=modules%2Fshaper.git

diff --git a/src/ModelAPI/ModelAPI_Feature.cpp b/src/ModelAPI/ModelAPI_Feature.cpp
index e7f96587c..5b9d7e3d4 100644
--- a/src/ModelAPI/ModelAPI_Feature.cpp
+++ b/src/ModelAPI/ModelAPI_Feature.cpp
@@ -79,13 +79,14 @@ void ModelAPI_Feature::eraseResultFromList(const std::shared_ptr<ModelAPI_Result
     ResultPtr aRes = *aResIter;
     if (aRes == theResult) {
       std::string aGroup = aRes->groupName();
+      aRes->setDisabled(aRes, true); // for complex results to disable all subs
       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->sendDeleted(document(), aGroup);
       aECreator->sendUpdated(aRes, EVENT_DISP);
       break;
     }
@@ -103,12 +104,12 @@ void ModelAPI_Feature::removeResults(const int theSinceIndex, const bool theFlus
   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);
-    } else {
+    //if (theSinceIndex == 0 && (*aNextIter)->isDisabled()) {
+    //  aNextIter = myResults.erase(aNextIter);
+    //} else {
       (*aNextIter)->setDisabled(*aNextIter, true); // just disable results
       aNextIter++;
-    }
+    //}
   }
   if (!aGroup.empty() && theFlush) {
     // flush visualisation changes
@@ -193,12 +194,37 @@ bool ModelAPI_Feature::setDisabled(const bool theFlag)
   return false;
 }
 
-bool ModelAPI_Feature::isDisabled() const
+bool ModelAPI_Feature::isDisabled()
 {
   return myIsDisabled;
 }
 
+bool ModelAPI_Feature::setStable(const bool theFlag)
+{
+  if (myIsStable != theFlag) {
+    myIsStable = theFlag;
+    // send an event about the stability change (editing is started/finished)
+    static Events_Loop* aLoop = Events_Loop::loop();
+    static Events_ID EVENT_STAB = aLoop->eventByName(EVENT_STABILITY_CHANGED);
+    std::shared_ptr<Events_Message> aMessage(new Events_Message(EVENT_STAB, this));
+    aLoop->send(aMessage, false);
+    return true;
+  }
+  return false;
+}
+
+bool ModelAPI_Feature::isStable()
+{
+  return myIsStable;
+}
+
 bool ModelAPI_Feature::isPreviewNeeded() const
 {
   return true;
 }
+
+void ModelAPI_Feature::init()
+{
+  myIsDisabled = false;
+  myIsStable = true;
+}