X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Update.cpp;h=bb00695b2f8fe2b726a2ab875535d059871d1e20;hb=b12bbd2a734142a2596a91c729b6670060b6b7e9;hp=8d97e97401be95d01673a496c3d055d80e6797f2;hpb=8c6f32d357c19e8b85d0dcdcca18e8b5550d295a;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Update.cpp b/src/Model/Model_Update.cpp
old mode 100644
new mode 100755
index 8d97e9740..bb00695b2
--- a/src/Model/Model_Update.cpp
+++ b/src/Model/Model_Update.cpp
@@ -27,121 +27,279 @@
 #include <GeomDataAPI_Point2D.h>
 #include <Events_Loop.h>
 #include <Events_LongOp.h>
-#include <Events_Error.h>
+#include <Events_InfoMessage.h>
 #include <Config_PropManager.h>
 
 using namespace std;
 
 Model_Update MY_UPDATER_INSTANCE;  /// the only one instance initialized on load of the library
-#define DEB_UPDATE
+//#define DEB_UPDATE
 
 Model_Update::Model_Update()
 {
   Events_Loop* aLoop = Events_Loop::loop();
   static const Events_ID kChangedEvent = aLoop->eventByName("PreferenceChanged");
   aLoop->registerListener(this, kChangedEvent);
-  static const Events_ID kRebuildEvent = aLoop->eventByName("Rebuild");
-  aLoop->registerListener(this, kRebuildEvent);
   static const Events_ID kCreatedEvent = Events_Loop::loop()->eventByName(EVENT_OBJECT_CREATED);
   aLoop->registerListener(this, kCreatedEvent);
   static const Events_ID kUpdatedEvent = Events_Loop::loop()->eventByName(EVENT_OBJECT_UPDATED);
   aLoop->registerListener(this, kUpdatedEvent);
-  static const Events_ID kMovedEvent = Events_Loop::loop()->eventByName(EVENT_OBJECT_MOVED);
-  aLoop->registerListener(this, kMovedEvent);
   static const Events_ID kOpFinishEvent = aLoop->eventByName("FinishOperation");
   aLoop->registerListener(this, kOpFinishEvent);
   static const Events_ID kOpAbortEvent = aLoop->eventByName("AbortOperation");
   aLoop->registerListener(this, kOpAbortEvent);
   static const Events_ID kOpStartEvent = aLoop->eventByName("StartOperation");
   aLoop->registerListener(this, kOpStartEvent);
-
-  Config_PropManager::registerProp("Model update", "automatic_rebuild", "Rebuild immediately",
-                                   Config_Prop::Boolean, "false");
-  myIsAutomatic =
-    Config_PropManager::findProp("Model update", "automatic_rebuild")->value() == "true";
+  static const Events_ID kStabilityEvent = aLoop->eventByName(EVENT_STABILITY_CHANGED);
+  aLoop->registerListener(this, kStabilityEvent);
+  static const Events_ID kPreviewBlockedEvent = aLoop->eventByName(EVENT_PREVIEW_BLOCKED);
+  aLoop->registerListener(this, kPreviewBlockedEvent);
+  static const Events_ID kPreviewRequestedEvent = aLoop->eventByName(EVENT_PREVIEW_REQUESTED);
+  aLoop->registerListener(this, kPreviewRequestedEvent);
+  static const Events_ID kReorderEvent = aLoop->eventByName(EVENT_ORDER_UPDATED);
+  aLoop->registerListener(this, kReorderEvent);
+
+  //  Config_PropManager::findProp("Model update", "automatic_rebuild")->value() == "true";
   myIsParamUpdated = false;
   myIsFinish = false;
+  myIsProcessed = false;
+  myIsPreviewBlocked = false;
+}
+
+bool Model_Update::addModified(FeaturePtr theFeature, FeaturePtr theReason) {
+
+  if (!theFeature->data()->isValid())
+    return false; // delete an extrusion created on the sketch
+
+  bool isNotExecuted = theFeature->isPersistentResult() &&
+    !std::dynamic_pointer_cast<Model_Document>((theFeature)->document())->executeFeatures();
+  if (isNotExecuted) {
+    if (!theReason.get()) // no reason => no construction reason
+      return false;
+    if (myNotPersistentRefs.find(theFeature) == myNotPersistentRefs.end()) {
+      myNotPersistentRefs[theFeature].insert(theReason);
+    } else {
+      std::set<std::shared_ptr<ModelAPI_Feature> > aNewSet;
+      aNewSet.insert(theReason);
+      myNotPersistentRefs[theFeature] = aNewSet;
+    }
+    return false;
+  }
+
+  // update arguments for "apply button" state change
+  if ((!theFeature->isPreviewNeeded() && !myIsFinish) || myIsPreviewBlocked) {
+    myProcessOnFinish.insert(theFeature);
+#ifdef DEB_UPDATE
+      std::cout<<"*** Add process on finish "<<theFeature->name()<<std::endl;
+#endif
+    // keeps the currently updated features to avoid infinitive cycling here: where feature on
+    // "updateArguments" sends "updated" (in selection attribute) and goes here again
+    static std::set<FeaturePtr> aCurrentlyUpdated;
+    if (aCurrentlyUpdated.find(theFeature) == aCurrentlyUpdated.end()) {
+      aCurrentlyUpdated.insert(theFeature);
+      updateArguments(theFeature);
+      aCurrentlyUpdated.erase(theFeature);
+    }
+    // make it without conditions otherwise the apply button may have a bad state
+    theFeature->data()->execState(ModelAPI_StateDone);
+    static ModelAPI_ValidatorsFactory* aFactory = ModelAPI_Session::get()->validators();
+    aFactory->validate(theFeature); // need to be validated to update the "Apply" state if not previewed
+
+    // to redisplay split's arguments presentation, even result is not computed
+    if (!theFeature->isPreviewNeeded()) {
+      static Events_Loop* aLoop = Events_Loop::loop();
+      static const Events_ID kRedisplayEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+      ModelAPI_EventCreator::get()->sendUpdated(theFeature, kRedisplayEvent);
+      aLoop->flush(kRedisplayEvent);
+    }
+
+    if (!myIsPreviewBlocked)
+      return true;
+  }
+  if (myModified.find(theFeature) != myModified.end()) {
+    if (theReason.get()) {
+#ifdef DEB_UPDATE
+      //std::cout<<"*** Add already modified "<<theFeature->name()<<" reason "<<theReason->name()<<std::endl;
+#endif
+      myModified[theFeature].insert(theReason);
+    }
+    return true;
+  }
+  // do not add the disabled, but possibly the sub-elements are not disabled
+  bool aIsDisabled = theFeature->isDisabled();
+  if (!aIsDisabled) {
+    std::set<std::shared_ptr<ModelAPI_Feature> > aNewSet;
+    if (theFeature->data()->execState() == ModelAPI_StateMustBeUpdated ||
+        theFeature->data()->execState() == ModelAPI_StateInvalidArgument) { // issue 1519
+      // do not forget that in this case all were the reasons
+      aNewSet.insert(theFeature);
+    } else {
+      if (theReason.get())
+        aNewSet.insert(theReason);
+    }
+      myModified[theFeature] = aNewSet;
+#ifdef DEB_UPDATE
+    if (theReason.get()) {
+      //std::cout<<"*** Add modified "<<theFeature->name()<<" reason "<<theReason->name()<<std::endl;
+    } else {
+      //std::cout<<"*** Add modified "<<theFeature->name()<<std::endl;
+    }
+#endif
+  } else { // will be updated during the finish of the operation, or when it becomes enabled
+    if (theFeature->data()->execState() == ModelAPI_StateDone)
+      theFeature->data()->execState(ModelAPI_StateMustBeUpdated);
+    else 
+      return true; // do not need iteration deeply if it is already marked as modified or so
+#ifdef DEB_UPDATE
+    //std::cout<<"*** Set modified state "<<theFeature->name()<<std::endl;
+#endif
+  }
+  // clear processed and fill modified recursively
+  const std::set<std::shared_ptr<ModelAPI_Attribute> >& aRefs = theFeature->data()->refsToMe();
+  std::set<std::shared_ptr<ModelAPI_Attribute> >::const_iterator aRefIter = aRefs.cbegin();
+  for(; aRefIter != aRefs.cend(); aRefIter++) {
+    if ((*aRefIter)->isArgument()) {
+      FeaturePtr aReferenced = std::dynamic_pointer_cast<ModelAPI_Feature>((*aRefIter)->owner());
+      if (aReferenced.get()) {
+        addModified(aReferenced, theFeature);
+      }
+    }
+  }
+  // proccess also results
+  std::list<ResultPtr> allResults; // list of this feature and results
+  ModelAPI_Tools::allResults(theFeature, allResults);
+  std::list<ResultPtr>::iterator aRes = allResults.begin();
+  for(; aRes != allResults.end(); aRes++) {
+    const std::set<std::shared_ptr<ModelAPI_Attribute> >& aRefs = (*aRes)->data()->refsToMe();
+    std::set<std::shared_ptr<ModelAPI_Attribute> >::const_iterator aRefIter = aRefs.cbegin();
+    for(; aRefIter != aRefs.cend(); aRefIter++) {
+      if ((*aRefIter)->isArgument()) {
+        FeaturePtr aReferenced = std::dynamic_pointer_cast<ModelAPI_Feature>((*aRefIter)->owner());
+        if (aReferenced.get()) {
+          addModified(aReferenced, theFeature);
+        }
+      }
+    }
+  }
+
+  // also add part feature that contains this feature to the modified
+  if (theFeature->document()->kind() != "PartSet") {
+    FeaturePtr aPart = ModelAPI_Tools::findPartFeature(
+      ModelAPI_Session::get()->moduleDocument(), theFeature->document());
+    if (aPart.get())
+      addModified(aPart, theFeature);
+  }
+  return true;
 }
 
 void Model_Update::processEvent(const std::shared_ptr<Events_Message>& theMessage)
 {
   static Events_Loop* aLoop = Events_Loop::loop();
-  static const Events_ID kChangedEvent = aLoop->eventByName("PreferenceChanged");
-  static const Events_ID kRebuildEvent = aLoop->eventByName("Rebuild");
   static const Events_ID kCreatedEvent = aLoop->eventByName(EVENT_OBJECT_CREATED);
   static const Events_ID kUpdatedEvent = aLoop->eventByName(EVENT_OBJECT_UPDATED);
-  static const Events_ID kMovedEvent = Events_Loop::loop()->eventByName(EVENT_OBJECT_MOVED);
   static const Events_ID kOpFinishEvent = aLoop->eventByName("FinishOperation");
   static const Events_ID kOpAbortEvent = aLoop->eventByName("AbortOperation");
   static const Events_ID kOpStartEvent = aLoop->eventByName("StartOperation");
-  if (theMessage->eventID() == kChangedEvent) { // automatic and manual rebuild flag is changed
-    bool aPropVal =
-      Config_PropManager::findProp("Model update", "automatic_rebuild")->value() == "true";
-    if (aPropVal != myIsAutomatic) { // something is changed
-      myIsAutomatic = aPropVal;
-      if (myIsAutomatic) // higher level of automatization => to rebuild
-        processOperation(false);
-    }
-  } else if (theMessage->eventID() == kRebuildEvent) { // the rebuild command
-    processOperation(true);
-  } else if (theMessage->eventID() == kCreatedEvent || theMessage->eventID() == kUpdatedEvent ||
-             theMessage->eventID() == kMovedEvent) {
+  static const Events_ID kStabilityEvent = aLoop->eventByName(EVENT_STABILITY_CHANGED);
+  static const Events_ID kPreviewBlockedEvent = aLoop->eventByName(EVENT_PREVIEW_BLOCKED);
+  static const Events_ID kPreviewRequestedEvent = aLoop->eventByName(EVENT_PREVIEW_REQUESTED);
+  static const Events_ID kReorderEvent = aLoop->eventByName(EVENT_ORDER_UPDATED);
+  static const Events_ID kRedisplayEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+
+#ifdef DEB_UPDATE
+  std::cout<<"****** Event "<<theMessage->eventID().eventText()<<std::endl;
+#endif
+  if (theMessage->eventID() == kStabilityEvent) {
+    updateStability(theMessage->sender());
+    return;
+  }
+  if (theMessage->eventID() == kPreviewBlockedEvent) {
+    myIsPreviewBlocked = true;
+    return;
+  }
+  if (theMessage->eventID() == kPreviewRequestedEvent) {
+    if (myIsPreviewBlocked) {
+      myIsPreviewBlocked = false;
+      processFeatures();
+      myIsPreviewBlocked = true;
+    }
+    return;
+  }
+  // creation is added to "update" to avoid recomputation twice: on create and immediately after on update
+  if (theMessage->eventID() == kCreatedEvent) {
     std::shared_ptr<ModelAPI_ObjectUpdatedMessage> aMsg =
         std::dynamic_pointer_cast<ModelAPI_ObjectUpdatedMessage>(theMessage);
     const std::set<ObjectPtr>& anObjs = aMsg->objects();
     std::set<ObjectPtr>::const_iterator anObjIter = anObjs.cbegin();
-    bool isOnlyResults = true; // check that only results were changed: only redisplay is needed
     for(; anObjIter != anObjs.cend(); anObjIter++) {
-      if (!std::dynamic_pointer_cast<ModelAPI_Result>(*anObjIter).get()) {
-        isOnlyResults = false;
+      if (std::dynamic_pointer_cast<Model_Document>((*anObjIter)->document())->executeFeatures()) {
+        if ((*anObjIter)->groupName() == ModelAPI_Feature::group()) { // results creation means enabling, not update
+          ModelAPI_EventCreator::get()->sendUpdated(*anObjIter, kUpdatedEvent);
+        } else {
+          ModelAPI_EventCreator::get()->sendUpdated(*anObjIter, kRedisplayEvent);
+        }
       }
+    }
+    return;
+  }
+  if (theMessage->eventID() == kUpdatedEvent) {
+    std::shared_ptr<ModelAPI_ObjectUpdatedMessage> aMsg =
+        std::dynamic_pointer_cast<ModelAPI_ObjectUpdatedMessage>(theMessage);
+    const std::set<ObjectPtr>& anObjs = aMsg->objects();
+    std::set<ObjectPtr>::const_iterator anObjIter = anObjs.cbegin();
+    bool aSomeModified = false; // check that features not changed: only redisplay is needed
+    for(; anObjIter != anObjs.cend(); anObjIter++) {
+      if (!(*anObjIter)->data()->isValid())
+        continue;
+#ifdef DEB_UPDATE
+      std::cout<<">>> in event updated "<<(*anObjIter)->groupName()<<" "<<(*anObjIter)->data()->name()<<std::endl;
+#endif
       if ((*anObjIter)->groupName() == ModelAPI_ResultParameter::group()) {
         myIsParamUpdated = true;
       }
-      // created objects are always must be up to date (python box feature)
-      // and updated not in internal uptation chain
-      myJustUpdated.insert(*anObjIter);
-
-      // something is updated during the execution: re-execute it (sketch update by parameters)
-      if (myIsExecuted) { 
-        FeaturePtr anUpdated = std::dynamic_pointer_cast<ModelAPI_Feature>(*anObjIter);
-        if (anUpdated.get() &&  anUpdated->data()->isValid() &&
-            myProcessed.find(anUpdated) != myProcessed.end()) {
-            if (anUpdated->isPreviewNeeded() || myIsFinish) {
-              ModelAPI_ExecState aState = anUpdated->data()->execState();
-              static ModelAPI_ValidatorsFactory* aFactory = ModelAPI_Session::get()->validators();
-              if (aFactory->validate(anUpdated)) {
-                #ifdef DEB_UPDATE
-                  std::cout<<"Execute immideately "<<anUpdated->name()<<std::endl;
-                #endif
-                executeFeature(anUpdated);
-              } else {
-                anUpdated->eraseResults();
-                redisplayWithResults(anUpdated, ModelAPI_StateInvalidArgument); // result also must be updated
-              }
-            }
+      // on undo/redo, abort do not update persisten features
+      FeaturePtr anUpdated = std::dynamic_pointer_cast<ModelAPI_Feature>(*anObjIter);
+      if (anUpdated.get()) {
+        if (addModified(anUpdated, FeaturePtr()))
+          aSomeModified = true;
+      } else { // process the updated result as update of features that refers to this result
+        const std::set<std::shared_ptr<ModelAPI_Attribute> >& aRefs = (*anObjIter)->data()->refsToMe();
+        std::set<std::shared_ptr<ModelAPI_Attribute> >::const_iterator aRefIter = aRefs.cbegin();
+        for(; aRefIter != aRefs.cend(); aRefIter++) {
+          if (!(*aRefIter)->owner()->data()->isValid())
+            continue;
+          FeaturePtr anUpdated = std::dynamic_pointer_cast<ModelAPI_Feature>((*aRefIter)->owner());
+          if (anUpdated.get()) {
+            if (addModified(anUpdated, FeaturePtr()))
+              aSomeModified = true;
+          }
         }
       }
-      #ifdef DEB_UPDATE
-      if ((*anObjIter)->data() && (*anObjIter)->data()->isValid()) {
-        std::cout<<"Add updated "<<(*anObjIter)->groupName()<<" "
-          <<(*anObjIter)->data()->name()<<std::endl;
-      }
-      #endif
     }
     // this event is for solver update, not here, do not react immediately
-    if (!isOnlyResults && !(theMessage->eventID() == kMovedEvent))
-      processOperation(false);
+    if (aSomeModified) {
+        processFeatures();
+    }
   } else if (theMessage->eventID() == kOpFinishEvent || theMessage->eventID() == kOpAbortEvent ||
       theMessage->eventID() == kOpStartEvent) {
+    myIsPreviewBlocked = false;
 
-    if (!(theMessage->eventID() == kOpStartEvent)) {
+    if (theMessage->eventID() == kOpFinishEvent) {
       myIsFinish = true;
-      processOperation(true, theMessage->eventID() == kOpFinishEvent);
+      // add features that wait for finish as modified
+      std::set<std::shared_ptr<ModelAPI_Feature> >::iterator aFeature = myProcessOnFinish.begin();
+      for(; aFeature != myProcessOnFinish.end(); aFeature++)
+        if ((*aFeature)->data()->isValid()) // there may be already removed wait for features
+          addModified(*aFeature, FeaturePtr());
       myIsFinish = false;
     }
+    myProcessOnFinish.clear(); // processed features must be only on finish, so clear anyway (to avoid reimport on load)
+
+    if (!(theMessage->eventID() == kOpStartEvent)) {
+      processFeatures(false);
+    }
     // remove all macros before clearing all created
-    std::set<ObjectPtr>::iterator anUpdatedIter = myWaitForFinish.begin();
+    std::set<FeaturePtr>::iterator anUpdatedIter = myWaitForFinish.begin();
     while(anUpdatedIter != myWaitForFinish.end()) {
       FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(*anUpdatedIter);
       if (aFeature.get()) {
@@ -160,195 +318,261 @@ void Model_Update::processEvent(const std::shared_ptr<Events_Message>& theMessag
         anUpdatedIter++;
       }
     }
-    // in the end of transaction everything is updated, so clear the old objects (the only one
-    // place where results are cleared)
+    // the redisplay signal should be flushed in order to erase the feature presentation in the viewer
+    // if should be done after removeFeature() of document,
+    // by this reason, upper processFeatures() do not perform this flush
+    Events_Loop::loop()->flush(kRedisplayEvent);
+
+    // in the end of transaction everything is updated, so clear the old objects
     myIsParamUpdated = false;
-    myJustUpdated.clear();
     myWaitForFinish.clear();
+  } else if (theMessage->eventID() == kReorderEvent) {
+    std::shared_ptr<ModelAPI_OrderUpdatedMessage> aMsg = 
+      std::dynamic_pointer_cast<ModelAPI_OrderUpdatedMessage>(theMessage);
+    if (aMsg->reordered().get())
+      addModified(aMsg->reordered(), aMsg->reordered()); // to update all attributes
   }
 }
 
-void Model_Update::processOperation(const bool theTotalUpdate, const bool theFinish)
+void Model_Update::processFeatures(const bool theFlushRedisplay)
 {
-  if (theFinish) {
-    // the hardcode (DBC asked): hide the sketch referenced by extrusion on apply
-    std::set<std::shared_ptr<ModelAPI_Object> >::iterator aFIter;
-    for(aFIter = myWaitForFinish.begin(); aFIter != myWaitForFinish.end(); aFIter++)
-    {
-      FeaturePtr aF = std::dynamic_pointer_cast<ModelAPI_Feature>(*aFIter);
-      if (aF && aF->data()->isValid() && aF->getKind() == "Extrusion") {
-        AttributeSelectionListPtr aBase = aF->selectionList("base");
-        if (aBase.get()) {
-          for(int a = aBase->size() - 1; a >= 0; a--) {
-            ResultPtr aSketchRes = aBase->value(a)->context();
-            if (aSketchRes) {
-              aSketchRes->setDisplayed(false);
-            }
-          }
-        }
-      }
-    }
-  }
-  // perform update of everything if needed
-  if (!myIsExecuted) {
+   // perform update of everything if it is not performed right now or any preview is blocked
+  if (!myIsProcessed && !myIsPreviewBlocked) {
+    myIsProcessed = true;
     #ifdef DEB_UPDATE
       std::cout<<"****** Start processing"<<std::endl;
     #endif
-    myIsExecuted = true;
-
-    bool isAutomaticChanged = false;
 
-    if (theTotalUpdate && !myIsAutomatic) { // Apply button now works as "Rebuild"
-      isAutomaticChanged = true;
-      myIsAutomatic = true;
+    while(!myModified.empty()) {
+      processFeature(myModified.begin()->first);
     }
+    myIsProcessed = false;
 
-    // iterate all features in the root document to update each
-    DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument();
-    Model_Objects* anObjs = std::dynamic_pointer_cast<Model_Document>(aRootDoc)->objects();
-    if (!anObjs) return;
-    // two cycles: parameters are first to process
-    FeaturePtr aFeatureIter = anObjs->firstFeature();
-    myProcessed.clear(); // to avoid processing twice
-    for (; aFeatureIter.get(); aFeatureIter = anObjs->nextFeature(aFeatureIter)) {
-      if (aFeatureIter->getKind() == "Parameter")
-        updateFeature(aFeatureIter);
-    }
-    aFeatureIter = anObjs->firstFeature();
-    for (; aFeatureIter.get(); aFeatureIter = anObjs->nextFeature(aFeatureIter)) {
-      if (aFeatureIter->getKind() != "Parameter")
-        updateFeature(aFeatureIter);
-    }
-
-    if (isAutomaticChanged) myIsAutomatic = false;
-    myProcessed.clear(); // to avoid keeping features in memory
-    myIsExecuted = false;
+    // to update the object browser if something is updated/created during executions
+    static Events_Loop* aLoop = Events_Loop::loop();
+    static const Events_ID kCreatedEvent= aLoop->eventByName(EVENT_OBJECT_CREATED);
+    aLoop->flush(kCreatedEvent);
+    static const Events_ID kUpdatedEvent = aLoop->eventByName(EVENT_OBJECT_UPDATED);
+    aLoop->flush(kUpdatedEvent);
 
     // flush to update display
-    static Events_Loop* aLoop = Events_Loop::loop();
-    static Events_ID EVENT_DISP = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
-    aLoop->flush(EVENT_DISP);
+    if (theFlushRedisplay) {
+      static Events_ID EVENT_DISP = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+      aLoop->flush(EVENT_DISP);
+    }
     #ifdef DEB_UPDATE
       std::cout<<"****** End processing"<<std::endl;
     #endif
+    myProcessed.clear();
   }
 }
 
-void Model_Update::updateFeature(FeaturePtr theFeature)
+// collects all the feautres this feature depends on: reasons
+static void allReasons(FeaturePtr theFeature, std::set<FeaturePtr>& theReasons) {
+  std::list<std::pair<std::string, std::list<std::shared_ptr<ModelAPI_Object> > > > aDeps;
+  theFeature->data()->referencesToObjects(aDeps);
+  std::list<std::pair<std::string, std::list<std::shared_ptr<ModelAPI_Object> > > >::iterator
+    anAttrsIter = aDeps.begin();
+  for(; anAttrsIter != aDeps.end(); anAttrsIter++) {
+    if (theFeature->attribute(anAttrsIter->first)->isArgument()) {
+      std::list<std::shared_ptr<ModelAPI_Object> >::iterator aDepIter = anAttrsIter->second.begin();
+      for(; aDepIter != anAttrsIter->second.end(); aDepIter++) {
+        FeaturePtr aDepFeat = std::dynamic_pointer_cast<ModelAPI_Feature>(*aDepIter);
+        if (!aDepFeat.get()) { // so, it depends on the result and process the feature owner of it
+          ResultPtr aDepRes = std::dynamic_pointer_cast<ModelAPI_Result>(*aDepIter);
+          if (aDepRes.get()) {
+            aDepFeat = (*aDepIter)->document()->feature(aDepRes);
+          }
+        }
+        if (aDepFeat.get() && aDepFeat->data()->isValid()) {
+          theReasons.insert(aDepFeat);
+        }
+      }
+    }
+  }
+  if (theFeature->getKind() == "Part") { // part is not depended on its subs directly, but subs must be iterated anyway
+    CompositeFeaturePtr aPart = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(theFeature);
+    int aNum = aPart->numberOfSubs();
+    for(int a = 0; a < aNum; a++) {
+      FeaturePtr aSub = aPart->subFeature(a);
+      if (aSub.get() && aSub->data()->isValid()) {
+        theReasons.insert(aSub);
+      }
+    }
+  }
+}
+
+bool Model_Update::processFeature(FeaturePtr theFeature)
 {
-  // check all features this feature depended on (recursive call of updateFeature)
   static ModelAPI_ValidatorsFactory* aFactory = ModelAPI_Session::get()->validators();
 
-  if (myProcessed.find(theFeature) != myProcessed.end())
-    return;
-  myProcessed.insert(theFeature);
-  if (theFeature->isDisabled())
-    return;
+  if (!theFeature->data()->isValid()) { // deleted feature, just remove from all containers
+    if (myModified.find(theFeature) != myModified.end())
+      myModified.erase(theFeature);
+    return false;
+  }
 
-  #ifdef DEB_UPDATE
-    std::cout<<"Update Feature "<<theFeature->name()<<std::endl;
-  #endif
+  if (theFeature->isPersistentResult()) {
+    if (!std::dynamic_pointer_cast<Model_Document>((theFeature)->document())->executeFeatures())
+      return false;
+  }
+
+  if (myProcessed.find(theFeature) == myProcessed.end()) {
+    myProcessed[theFeature] = 0;
+  } else {
+    int aCount = myProcessed[theFeature];
+    if (aCount > 100) { // too many repetition of processing (in VS it may crash on 330 with stack overflow)
+      Events_InfoMessage("Model_Update",
+        "Feature '%1' is updated in infinitive loop").arg(theFeature->data()->name()).send();
+      return false;
+    }
+    myProcessed[theFeature] = aCount + 1;
+  }
+
+  // check this feature is not yet checked or processed
+  bool aIsModified = myModified.find(theFeature) != myModified.end();
+  if (!aIsModified && myIsFinish) { // get info about the modification for features without preview
+    if (theFeature->data()->execState() == ModelAPI_StateMustBeUpdated) {
+      aIsModified = true;
+      std::set<std::shared_ptr<ModelAPI_Feature> > aNewSet;
+      aNewSet.insert(theFeature); // contains itself, so, we don't know which was the reason and the reason is any
+      myModified[theFeature] = aNewSet;
+    }
+  }
+
+#ifdef DEB_UPDATE
+    std::cout<<"* Process feature "<<theFeature->name()<<std::endl;
+#endif
+
+  // update the sketch plane before the sketch sub-elements are recomputed
+  // (otherwise sketch will update plane, modify subs, after executed, but with old subs edges)
+  if (aIsModified && theFeature->getKind() == "Sketch") {
+#ifdef DEB_UPDATE
+    std::cout<<"****** Update sketch args "<<theFeature->name()<<std::endl;
+#endif
+    AttributeSelectionPtr anExtSel = theFeature->selection("External");
+    if (anExtSel.get()) {
+      ResultPtr aContext = anExtSel->context();
+      if (aContext.get() && aContext->document().get()) {
+        FeaturePtr anExtBase = aContext->document()->feature(aContext);
+        if (anExtBase.get()) {
+          processFeature(anExtBase);
+        }
+      }
+    }
+    updateArguments(theFeature);
+    // send event that sketch is prepared to be recomputed
+    static Events_ID& anID = Events_Loop::eventByName("SketchPrepared");
+    std::shared_ptr<Events_Message> aMsg(new Events_Message(anID, this));
+    Events_Loop::loop()->send(aMsg);
+  }
+
+  if (!aIsModified) { // no modification is needed
+    return false;
+  }
+
+  // evaluate parameter before the sub-elements update: it updates dependencies on evaluation (#1085)
+  if (theFeature->getKind() == "Parameter") {
+    theFeature->execute();
+  }
+
+  bool isReferencedInvalid = false;
+  // check all features this feature depended on (recursive call of updateFeature)
+  std::set<FeaturePtr>& aReasons = myModified[theFeature];
+  bool allSubsUsed = aReasons.find(theFeature) != aReasons.end();
+  if (allSubsUsed) { // add all subs in aReasons and temporary remove "theFeature" to avoid processing itself
+    allReasons(theFeature, aReasons);
+    aReasons.erase(theFeature);
+  }
+  // take reasons one by one (they may be added during the feature process (circle by the radius of sketch)
+  std::set<FeaturePtr> aProcessedReasons;
+  while(!aReasons.empty()) {
+    FeaturePtr aReason = *(aReasons.begin());
+#ifdef DEB_UPDATE
+    //cout<<theFeature->name()<<" process next reason "<<aReason->name()<<endl;
+#endif
+    if (aReason != theFeature && (aReason)->data()->isValid()) {
+      if (processFeature(aReason))
+        aIsModified = true;
+      if (aReason->data()->execState() == ModelAPI_StateInvalidArgument)
+        isReferencedInvalid = true;
+    }
+    // searching for the next not used reason
+    aProcessedReasons.insert(aReason);
+    aReasons.erase(aReason);
+  }
+  // restore the modified reasons: they will be used in the update of arguments
+  if (allSubsUsed) { // restore theFeature in this set
+    aProcessedReasons.insert(theFeature);
+  }
+  myModified[theFeature] = aProcessedReasons;
+
+  // do not execute the composite that contains the current
+  bool isPostponedMain = false;
   CompositeFeaturePtr aCompos = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(theFeature);
-  // If automatice update is not needed and feature attributes were not updated right now,
-  // do not execute it and do not update arguments.
-  if (!myIsAutomatic && myJustUpdated.find(theFeature) == myJustUpdated.end() && !aCompos.get()) {
-    // execute will be performed later, but some features may have not-result 
-    // presentations, so call update for them (like coincidence in the sketcher)
-    static Events_ID EVENT_DISP = Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY);
-    ModelAPI_EventCreator::get()->sendUpdated(theFeature, EVENT_DISP);
-    return;
+  if (theFeature->getKind() == "ExtrusionSketch" && aCompos.get()) {
+    CompositeFeaturePtr aCurrentOwner = 
+      ModelAPI_Tools::compositeOwner(theFeature->document()->currentFeature(false));
+    isPostponedMain = aCurrentOwner.get() && aCompos->isSub(aCurrentOwner);
   }
 
+#ifdef DEB_UPDATE
+  std::cout<<"Update args "<<theFeature->name()<<std::endl;
+#endif
+  // TestImport.py : after arguments are updated, theFeature may be removed
+  if (!theFeature->data()->isValid())
+    return false;
   // Update selection and parameters attributes first, before sub-features analysis (sketch plane).
   updateArguments(theFeature);
 
-  // composite feature must be executed after sub-features execution
-  if (aCompos) {
-    // two cycles: parameters must be processed first
-    for(int a = 0; a < aCompos->numberOfSubs(); a++) {
-      FeaturePtr aSub = aCompos->subFeature(a);
-      if (aSub->getKind() == "Parameter")
-        updateFeature(aSub);
-    }
-    // number of subs can be changed in execution: like fillet
-    for(int a = 0; a < aCompos->numberOfSubs(); a++) {
-      FeaturePtr aSub = aCompos->subFeature(a);
-      if (aSub->getKind() != "Parameter")
-       updateFeature(aSub);
-    }
-    // reupdate arguments of composite feature: it may be changed during subs execution
-    if (theFeature->data()->execState() != ModelAPI_StateMustBeUpdated)
-      updateArguments(theFeature);
-  }
+  // add this feature to the processed right now to be able remove it from this list on
+  // update signal during this feature execution
+  myModified.erase(theFeature);
+  if (myNotPersistentRefs.find(theFeature) != myNotPersistentRefs.end())
+    myNotPersistentRefs.erase(theFeature);
+  if (theFeature->data()->execState() == ModelAPI_StateMustBeUpdated)
+    theFeature->data()->execState(ModelAPI_StateDone);
+
   // this checking must be after the composite feature sub-elements processing:
   // composite feature status may depend on it's subelements
-  if (theFeature->data()->execState() == ModelAPI_StateInvalidArgument) {
+  if ((theFeature->data()->execState() == ModelAPI_StateInvalidArgument || isReferencedInvalid) && 
+    theFeature->getKind() != "Part") { // don't disable Part because it will make disabled all the features (performance and problems with the current feature)
+  #ifdef DEB_UPDATE
+    std::cout<<"Invalid args "<<theFeature->name()<<std::endl;
+  #endif
     theFeature->eraseResults();
     redisplayWithResults(theFeature, ModelAPI_StateInvalidArgument); // result also must be updated
-    return;
-  }
-
-  bool aJustUpdated = myJustUpdated.find(theFeature) != myJustUpdated.end();
-
-  if (myIsAutomatic && theFeature->data()->execState() == ModelAPI_StateMustBeUpdated)
-    aJustUpdated = true;
-
-  // On abort, undo or redo execute is not needed: results in document are updated automatically
-  // But redisplay is needed: results are updated, must be also updated in the viewer.
-  if (aJustUpdated && 
-      !std::dynamic_pointer_cast<Model_Document>(theFeature->document())->executeFeatures()) {
-    if (!theFeature->isPersistentResult()) { // not persistent must be re-executed on abort, etc.
-      ModelAPI_ExecState aState = theFeature->data()->execState();
-      if (aFactory->validate(theFeature)) {
-        executeFeature(theFeature);
-      } else {
-        theFeature->eraseResults();
-        redisplayWithResults(theFeature, ModelAPI_StateInvalidArgument); // result also must be updated
-      }
-    } else {
-      redisplayWithResults(theFeature, ModelAPI_StateNothing);
-      if (theFeature->data()->execState() == ModelAPI_StateMustBeUpdated) { // it is done (in the tree)
-        theFeature->data()->execState(ModelAPI_StateDone);
-      }
-    }
-    return;
+    return true; // so, feature is modified (results are erased)
   }
 
   // execute feature if it must be updated
-  if (theFeature->isPreviewNeeded() || myIsFinish) {
-    if (aJustUpdated) {
-      ModelAPI_ExecState aState = theFeature->data()->execState();
-      if (aFactory->validate(theFeature)) {
-        #ifdef DEB_UPDATE
-          std::cout<<"Execute Feature "<<theFeature->name()<<std::endl;
-        #endif
-        executeFeature(theFeature);
-      } else {
-        theFeature->eraseResults();
-        redisplayWithResults(theFeature, ModelAPI_StateInvalidArgument); // result also must be updated
-      }
-    }
-  } else { // preview is not needed => make state Done
-    if (theFeature->data()->execState() == ModelAPI_StateMustBeUpdated) {
-      theFeature->data()->execState(ModelAPI_StateDone);
-      if (aJustUpdated) // store that it must be updated on finish
-        myJustUpdated.insert(theFeature);
+  ModelAPI_ExecState aState = theFeature->data()->execState();
+  if (aFactory->validate(theFeature)) {
+    if (!isPostponedMain) {
+      executeFeature(theFeature);
     }
+  } else {
+    #ifdef DEB_UPDATE
+      std::cout<<"Feature is not valid, erase results "<<theFeature->name()<<std::endl;
+    #endif
+    theFeature->eraseResults();
+    redisplayWithResults(theFeature, ModelAPI_StateInvalidArgument); // result also must be updated
   }
+  return true;
 }
 
 void Model_Update::redisplayWithResults(FeaturePtr theFeature, const ModelAPI_ExecState theState) 
 {
   // make updated and redisplay all results
   static Events_ID EVENT_DISP = Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY);
-  const std::list<std::shared_ptr<ModelAPI_Result> >& aResults = theFeature->results();
-  std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aRIter = aResults.begin();
-  for (; aRIter != aResults.cend(); aRIter++) {
+
+  std::list<ResultPtr> allResults;
+  ModelAPI_Tools::allResults(theFeature, allResults);
+  std::list<ResultPtr>::iterator aRIter = allResults.begin();
+  for (; aRIter != allResults.cend(); aRIter++) {
     std::shared_ptr<ModelAPI_Result> aRes = *aRIter;
     if (!aRes->isDisabled()) {// update state only for enabled results (Placement Result Part may make the original Part Result as invalid)
       aRes->data()->execState(theState);
-      if (theState == ModelAPI_StateDone) // feature become "done", so execution changed results
-        myJustUpdated.insert(aRes);
     }
     if (theFeature->data()->updateID() > aRes->data()->updateID()) {
       aRes->data()->setUpdateID(theFeature->data()->updateID());
@@ -388,19 +612,39 @@ void Model_Update::updateArguments(FeaturePtr theFeature) {
   if (aState == ModelAPI_StateInvalidArgument) // a chance to be corrected
     aState = ModelAPI_StateMustBeUpdated;
   // check the parameters state
-  // Double
-  std::list<AttributePtr> aDoubles =
-    theFeature->data()->attributes(ModelAPI_AttributeDouble::typeId());
-  std::list<AttributePtr>::iterator aDoubleIter = aDoubles.begin();
-  for(; aDoubleIter != aDoubles.end(); aDoubleIter++) {
-    AttributeDoublePtr aDouble =
-      std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(*aDoubleIter);
-    if (aDouble.get() && !aDouble->text().empty()) {
-      if (myIsParamUpdated) {
-        ModelAPI_AttributeEvalMessage::send(aDouble, this);
+  // Integer
+  {
+    std::list<AttributePtr> anAttrinbutes =
+      theFeature->data()->attributes(ModelAPI_AttributeInteger::typeId());
+    std::list<AttributePtr>::iterator anIter = anAttrinbutes.begin();
+    for(; anIter != anAttrinbutes.end(); anIter++) {
+      AttributeIntegerPtr anAttribute =
+        std::dynamic_pointer_cast<ModelAPI_AttributeInteger>(*anIter);
+      if (anAttribute.get() && !anAttribute->text().empty()) {
+        if (myIsParamUpdated) {
+          ModelAPI_AttributeEvalMessage::send(anAttribute, this);
+        }
+        if (anAttribute->expressionInvalid()) {
+          aState = ModelAPI_StateInvalidArgument;
+        }
       }
-      if (aDouble->expressionInvalid()) {
-        aState = ModelAPI_StateInvalidArgument;
+    }
+  }
+  // Double
+  {
+    std::list<AttributePtr> aDoubles =
+      theFeature->data()->attributes(ModelAPI_AttributeDouble::typeId());
+    std::list<AttributePtr>::iterator aDoubleIter = aDoubles.begin();
+    for(; aDoubleIter != aDoubles.end(); aDoubleIter++) {
+      AttributeDoublePtr aDouble =
+        std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(*aDoubleIter);
+      if (aDouble.get() && !aDouble->text().empty()) {
+        if (myIsParamUpdated) {
+          ModelAPI_AttributeEvalMessage::send(aDouble, this);
+        }
+        if (aDouble->expressionInvalid()) {
+          aState = ModelAPI_StateInvalidArgument;
+        }
       }
     }
   }
@@ -412,7 +656,8 @@ void Model_Update::updateArguments(FeaturePtr theFeature) {
     for(; anIter != anAttributes.end(); anIter++) {
       AttributePointPtr aPointAttribute =
         std::dynamic_pointer_cast<GeomDataAPI_Point>(*anIter);
-      if (aPointAttribute.get()) {
+      if (aPointAttribute.get() && (!aPointAttribute->textX().empty() || 
+          !aPointAttribute->textY().empty() || !aPointAttribute->textZ().empty())) {
         if (myIsParamUpdated) {
           ModelAPI_AttributeEvalMessage::send(aPointAttribute, this);
         }
@@ -432,7 +677,8 @@ void Model_Update::updateArguments(FeaturePtr theFeature) {
       AttributePoint2DPtr aPoint2DAttribute =
         std::dynamic_pointer_cast<GeomDataAPI_Point2D>(*anIter);
       if (aPoint2DAttribute.get()) {
-        if (myIsParamUpdated) {
+        if (myIsParamUpdated && (!aPoint2DAttribute->textX().empty() || 
+            !aPoint2DAttribute->textY().empty())) {
           ModelAPI_AttributeEvalMessage::send(aPoint2DAttribute, this);
         }
         if ((!aPoint2DAttribute->textX().empty() && aPoint2DAttribute->expressionInvalid(0)) ||
@@ -441,10 +687,7 @@ void Model_Update::updateArguments(FeaturePtr theFeature) {
       }
     }
   }
-
-  //if (aState == ModelAPI_StateDone) {// all referenced objects are ready to be used
-  //std::cout<<"Execute feature "<<theFeature->getKind()<<std::endl;
-  // before execution update the selection attributes if any
+  // update the selection attributes if any
   list<AttributePtr> aRefs = 
     theFeature->data()->attributes(ModelAPI_AttributeSelection::typeId());
   list<AttributePtr>::iterator aRefsIter = aRefs.begin();
@@ -452,19 +695,25 @@ void Model_Update::updateArguments(FeaturePtr theFeature) {
     std::shared_ptr<ModelAPI_AttributeSelection> aSel =
       std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(*aRefsIter);
     ObjectPtr aContext = aSel->context();
-    // update argument onlt if the referenced object is changed
-    if (aContext.get() && !aContext->isDisabled() && 
-      (myJustUpdated.find(aContext) != myJustUpdated.end() ||
-      aContext->data()->updateID() > theFeature->data()->updateID())) {
-        if (aState == ModelAPI_StateDone)
-          aState = ModelAPI_StateMustBeUpdated;
+    // update argument only if the referenced object is ready to use
+    if (aContext.get() && !aContext->isDisabled()) {
+      if (isReason(theFeature, aContext)) {
         if (!aSel->update()) { // this must be done on execution since it may be long operation
-          if (!aFactory->isNotObligatory(theFeature->getKind(), theFeature->data()->id(aSel)) &&
-            aFactory->isCase(theFeature, theFeature->data()->id(aSel)))
+          bool isObligatory = !aFactory->isNotObligatory(
+            theFeature->getKind(), theFeature->data()->id(aSel)) &&
+            aFactory->isCase(theFeature, theFeature->data()->id(aSel));
+          if (isObligatory)
             aState = ModelAPI_StateInvalidArgument;
         }
+      }
+    } else if (aContext.get()) {
+      // here it may be not obligatory, but if the reference is wrong, it should not be correct
+      bool isObligatory = aFactory->isCase(theFeature, theFeature->data()->id(aSel));
+      if (isObligatory)
+        aState = ModelAPI_StateInvalidArgument;
     }
   }
+  // update the selection list attributes if any
   aRefs = theFeature->data()->attributes(ModelAPI_AttributeSelectionList::typeId());
   for (aRefsIter = aRefs.begin(); aRefsIter != aRefs.end(); aRefsIter++) {
     std::shared_ptr<ModelAPI_AttributeSelectionList> aSel =
@@ -474,98 +723,140 @@ void Model_Update::updateArguments(FeaturePtr theFeature) {
         std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(aSel->value(a));
       if (aSelAttr) {
         ObjectPtr aContext = aSelAttr->context();
-        // update argument onlt if the referenced object is changed
-        if (aContext.get() && !aContext->isDisabled() &&
-            (myJustUpdated.find(aContext) != myJustUpdated.end() ||
-             aContext->data()->updateID() > theFeature->data()->updateID())) {
-            if (aState == ModelAPI_StateDone)
-              aState = ModelAPI_StateMustBeUpdated;
+        // update argument only if the referenced object is ready to use
+        if (aContext.get() && !aContext->isDisabled()) {
+          if (isReason(theFeature, aContext)) {
             if (!aSelAttr->update()) {
-              if (!aFactory->isNotObligatory(
+              bool isObligatory = !aFactory->isNotObligatory(
                 theFeature->getKind(), theFeature->data()->id(aSel)) &&
-                aFactory->isCase(theFeature, theFeature->data()->id(aSel)))
+                aFactory->isCase(theFeature, theFeature->data()->id(aSel));
+              if (isObligatory)
                 aState = ModelAPI_StateInvalidArgument;
             }
+          }
+        } else if (aContext.get()) {
+          // here it may be not obligatory, but if the reference is wrong, it should not be correct
+          bool isObligatory = aFactory->isCase(theFeature, theFeature->data()->id(aSel));
+          if (isObligatory)
+            aState = ModelAPI_StateInvalidArgument;
         }
       }
     }
   }
-  // check all references: if referenced objects are updated, this object also must be updated
-  // also check state of referenced objects: if they are not ready, inherit corresponding state
-  std::list<std::pair<std::string, std::list<ObjectPtr> > > aRefsObj;
-  std::shared_ptr<Model_Data> aData = std::dynamic_pointer_cast<Model_Data>(theFeature->data());
-  aData->referencesToObjects(aRefsObj);
-  std::list<std::pair<std::string, std::list<ObjectPtr> > >::iterator aRef = aRefsObj.begin();
-  for(; aRef != aRefsObj.end(); aRef++) {
-    std::list<ObjectPtr>::iterator aRefObj = aRef->second.begin();
-    for(; aRefObj != aRef->second.end(); aRefObj++) {
-      // if reference is null, it may mean that this reference is to other document
-      // the does not supported by RefList: parameters may be recomputed
-      if (!aRefObj->get() && theFeature->firstResult().get() && 
-               theFeature->firstResult()->groupName() == ModelAPI_ResultParameter::group()) {
-          if (aState == ModelAPI_StateDone)
-            aState = ModelAPI_StateMustBeUpdated;
-      } else if (myJustUpdated.find(*aRefObj) != myJustUpdated.end() || 
-             (aRefObj->get() && (*aRefObj)->data()->updateID() > theFeature->data()->updateID())) {
-          if (aState == ModelAPI_StateDone)
-            aState = ModelAPI_StateMustBeUpdated;
-      }
-      aState = stateByReference(*aRefObj, aState);
+
+  if (aState != ModelAPI_StateDone)
+    theFeature->data()->execState(aState);
+}
+
+bool Model_Update::isReason(std::shared_ptr<ModelAPI_Feature>& theFeature, 
+     std::shared_ptr<ModelAPI_Object> theReason) 
+{
+  std::map<std::shared_ptr<ModelAPI_Feature>, std::set<std::shared_ptr<ModelAPI_Feature> > >
+    ::iterator aReasonsIt = myModified.find(theFeature);
+  if (aReasonsIt != myModified.end()) {
+    if (aReasonsIt->second.find(theFeature) != aReasonsIt->second.end())
+      return true; // any is reason if it contains itself
+    FeaturePtr aReasFeat = std::dynamic_pointer_cast<ModelAPI_Feature>(theReason);
+    if (!aReasFeat.get()) { // try to get feature of this result
+      ResultPtr aReasRes = std::dynamic_pointer_cast<ModelAPI_Result>(theReason);
+      if (aReasRes.get())
+        aReasFeat = theReason->document()->feature(aReasRes);
     }
+    if (aReasonsIt->second.find(aReasFeat) != aReasonsIt->second.end())
+      return true;
   }
-  // composites sub-elements
-  CompositeFeaturePtr aCompos = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(theFeature);
-  // composite feature must be executed after sub-features execution
-  if (aCompos) {
-    // number of subs can be changed in execution: like fillet
-    for(int a = 0; a < aCompos->numberOfSubs(); a++) {
-      FeaturePtr aSub = aCompos->subFeature(a);
-      if (aSub.get() && aState == ModelAPI_StateDone) {
-        if (myJustUpdated.find(aSub) != myJustUpdated.end() || 
-              (aSub->data()->updateID() > theFeature->data()->updateID())) {
-          aState = ModelAPI_StateMustBeUpdated;
-        }
-        // also check that all results of subs were updated: composite also depends on the results
-        const std::list<std::shared_ptr<ModelAPI_Result> >& aResults = aSub->results();
-        std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aResIter = aResults.begin();
-        for(; aResIter != aResults.end(); aResIter++) {
-          if (aResIter->get() && (*aResIter)->data()->isValid() && !(*aResIter)->isDisabled() &&
-                (myJustUpdated.find(*aResIter) != myJustUpdated.end() || 
-                  ((*aResIter)->data()->updateID() > theFeature->data()->updateID()))) {
-            aState = ModelAPI_StateMustBeUpdated;
-          }
-        }
-      }
+  // another try: postponed modification by not-persistences
+  std::map<std::shared_ptr<ModelAPI_Feature>, std::set<std::shared_ptr<ModelAPI_Feature> > >
+    ::iterator aNotPersist = myNotPersistentRefs.find(theFeature);
+  if (aNotPersist != myNotPersistentRefs.end()) {
+    FeaturePtr aReasFeat = std::dynamic_pointer_cast<ModelAPI_Feature>(theReason);
+    if (!aReasFeat.get()) { // try to get feature of this result
+      ResultPtr aReasRes = std::dynamic_pointer_cast<ModelAPI_Result>(theReason);
+      if (aReasRes.get())
+        aReasFeat = theReason->document()->feature(aReasRes);
     }
+    if (aNotPersist->second.find(aReasFeat) != aNotPersist->second.end())
+      return true;
   }
 
-
-  if (aState != ModelAPI_StateDone)
-    theFeature->data()->execState(aState);
+  return false; // this case only for not-previewed items update state, nothing is changed in args for it
 }
 
 void Model_Update::executeFeature(FeaturePtr theFeature)
 {
+#ifdef DEB_UPDATE
+  std::cout<<"Execute Feature "<<theFeature->name()<<std::endl;
+#endif
   // execute in try-catch to avoid internal problems of the feature
   ModelAPI_ExecState aState = ModelAPI_StateDone;
   theFeature->data()->execState(ModelAPI_StateDone);
   try {
     theFeature->execute();
-    myJustUpdated.erase(theFeature);
     if (theFeature->data()->execState() != ModelAPI_StateDone) {
       aState = ModelAPI_StateExecFailed;
     } else {
       aState = ModelAPI_StateDone;
-      myWaitForFinish.insert(theFeature);
     }
   } catch(...) {
     aState = ModelAPI_StateExecFailed;
-    Events_Error::send(
-      "Feature " + theFeature->getKind() + " has failed during the execution");
+    Events_InfoMessage("Model_Update",
+      "Feature %1 has failed during the execution").arg(theFeature->getKind()).send();
   }
+  // The macro feature has to be deleted in any case even its execution is failed 
+  myWaitForFinish.insert(theFeature);
   if (aState != ModelAPI_StateDone) {
     theFeature->eraseResults();
   }
   theFeature->data()->setUpdateID(ModelAPI_Session::get()->transactionID());
   redisplayWithResults(theFeature, aState);
 }
+
+void Model_Update::updateStability(void* theSender)
+{
+  static ModelAPI_ValidatorsFactory* aFactory = ModelAPI_Session::get()->validators();
+  if (theSender) {
+    bool added = false; // object may be was crated
+    ModelAPI_Object* aSender = static_cast<ModelAPI_Object*>(theSender);
+    if (aSender && aSender->document()) {
+      FeaturePtr aFeatureSender = 
+        std::dynamic_pointer_cast<ModelAPI_Feature>(aSender->data()->owner());
+      if (aFeatureSender.get()) {
+        Model_Objects* aDocObjects = 
+          std::dynamic_pointer_cast<Model_Document>(aSender->document())->objects();
+        if (aDocObjects) {
+          //aDocObjects->synchronizeBackRefs();
+          // remove or add all concealment refs from this feature
+          std::list<std::pair<std::string, std::list<ObjectPtr> > > aRefs;
+          aSender->data()->referencesToObjects(aRefs);
+          std::list<std::pair<std::string, std::list<ObjectPtr> > >::iterator aRefIt = aRefs.begin();
+          for(; aRefIt != aRefs.end(); aRefIt++) {
+            if (!aFactory->isConcealed(aFeatureSender->getKind(), aRefIt->first))
+              continue; // take into account only concealed references (do not remove the sketch constraint and the edge on constraint edit)
+            std::list<ObjectPtr>& aRefFeaturesList = aRefIt->second;
+            std::list<ObjectPtr>::iterator aReferenced = aRefFeaturesList.begin();
+            for(; aReferenced != aRefFeaturesList.end(); aReferenced++) {
+               // stability is only on results: feature to feature reference mean nested 
+              // features, that will remove nesting references
+              if (aReferenced->get() && (*aReferenced)->data()->isValid() && 
+                (*aReferenced)->groupName() != ModelAPI_Feature::group()) {
+                std::shared_ptr<Model_Data> aData = 
+                  std::dynamic_pointer_cast<Model_Data>((*aReferenced)->data());
+                if (aFeatureSender->isStable()) {
+                  aData->addBackReference(aFeatureSender, aRefIt->first);
+                } else {
+                  aData->removeBackReference(aFeatureSender, aRefIt->first);
+                  added = true; // remove of concealment may be caused creation of some result
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    if (added) {
+      static Events_Loop* aLoop = Events_Loop::loop();
+      static Events_ID kEventCreated = aLoop->eventByName(EVENT_OBJECT_CREATED);
+      aLoop->flush(kEventCreated);
+    }
+  }
+}