Salome HOME
[PythonAPI] Fix error in parameter wrapper
[modules/shaper.git] / src / Model / Model_Update.cpp
index 6c0dfc950520f7ca2d7bc0531f196e27a75ddb84..9d655c03c64a57db054c18350b13bd99554b50fc 100644 (file)
@@ -54,13 +54,18 @@ Model_Update::Model_Update()
   aLoop->registerListener(this, kOpAbortEvent);
   static const Events_ID kOpStartEvent = aLoop->eventByName("StartOperation");
   aLoop->registerListener(this, kOpStartEvent);
+  static const Events_ID kStabilityEvent = aLoop->eventByName(EVENT_STABILITY_CHANGED);
+  aLoop->registerListener(this, kStabilityEvent);
 
+  /* not needed now with history line
   Config_PropManager::registerProp("Model update", "automatic_rebuild", "Rebuild immediately",
-                                   Config_Prop::Boolean, "false");
-  myIsAutomatic =
-    Config_PropManager::findProp("Model update", "automatic_rebuild")->value() == "true";
+                                   Config_Prop::Boolean, "false");*/
+  myIsAutomatic = true;
+  //  Config_PropManager::findProp("Model update", "automatic_rebuild")->value() == "true";
   myIsParamUpdated = false;
   myIsFinish = false;
+  myModification = 0;
+  myModificationInStartProcessing = 0;
 }
 
 void Model_Update::processEvent(const std::shared_ptr<Events_Message>& theMessage)
@@ -74,14 +79,21 @@ void Model_Update::processEvent(const std::shared_ptr<Events_Message>& theMessag
   static const Events_ID kOpFinishEvent = aLoop->eventByName("FinishOperation");
   static const Events_ID kOpAbortEvent = aLoop->eventByName("AbortOperation");
   static const Events_ID kOpStartEvent = aLoop->eventByName("StartOperation");
+  static const Events_ID kStabilityEvent = aLoop->eventByName(EVENT_STABILITY_CHANGED);
+#ifdef DEB_UPDATE
+  std::cout<<"****** Event "<<theMessage->eventID().eventText()<<std::endl;
+#endif
+  if (theMessage->eventID() == kStabilityEvent)
+    updateStability(theMessage->sender());
   if (theMessage->eventID() == kChangedEvent) { // automatic and manual rebuild flag is changed
-    bool aPropVal =
+    /*bool aPropVal =
       Config_PropManager::findProp("Model update", "automatic_rebuild")->value() == "true";
     if (aPropVal != myIsAutomatic) { // something is changed
-      myIsAutomatic = aPropVal;
+      // myIsAutomatic = aPropVal;
       if (myIsAutomatic) // higher level of automatization => to rebuild
         processOperation(false);
-    }
+    }*/
+    return;
   } else if (theMessage->eventID() == kRebuildEvent) { // the rebuild command
     processOperation(true);
   } else if (theMessage->eventID() == kCreatedEvent || theMessage->eventID() == kUpdatedEvent ||
@@ -98,36 +110,32 @@ void Model_Update::processEvent(const std::shared_ptr<Events_Message>& theMessag
       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) && aState != ModelAPI_StateInvalidArgument) {
-                #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
-              }
-            }
+      if (myIsExecuted) // modifications from outside are with never IDs to take them into account in the current updates
+        myModification++;
+      // on undo/redo, abort do not update persisten features
+      FeaturePtr anUpdated = std::dynamic_pointer_cast<ModelAPI_Feature>(*anObjIter);
+      if (std::dynamic_pointer_cast<Model_Document>((*anObjIter)->document())->executeFeatures() ||
+          (anUpdated.get() && !anUpdated->isPersistentResult())) {
+        // created objects are always must be up to date (python box feature)
+        // and updated not in internal uptation chain
+        myUpdated[*anObjIter] = myModification;
+
+        // something is updated during the execution: re-execute it (sketch update by parameters or
+        // Box macro that updates the upper features during the execution)
+        if (myIsExecuted) { 
+          FeaturePtr anUpdated = std::dynamic_pointer_cast<ModelAPI_Feature>(*anObjIter);
+          if (anUpdated.get() &&  anUpdated->data()->isValid())
+            iterateUpdateBreak(anUpdated);
         }
+#ifdef DEB_UPDATE
+        if (myIsExecuted) std::cout<<"During execution ";
+        if ((*anObjIter)->data() && (*anObjIter)->data()->isValid()) {
+          std::cout<<"add updated "<<(*anObjIter)->groupName()<<" "
+            <<(*anObjIter)->data()->name()<<std::endl;
+        }
+#endif
       }
-      #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))
@@ -163,79 +171,69 @@ void Model_Update::processEvent(const std::shared_ptr<Events_Message>& theMessag
     // in the end of transaction everything is updated, so clear the old objects (the only one
     // place where results are cleared)
     myIsParamUpdated = false;
-    myJustUpdated.clear();
+    myUpdated.clear();
+    // do not erase it since there may be modification increment on start of operation
+    //myModification = 0;
     myWaitForFinish.clear();
   }
 }
 
 bool Model_Update::iterateUpdate(std::shared_ptr<ModelAPI_CompositeFeature> theFeature)
 {
-  myProcessIterator.push_back(IterationItem());
+  myProcessIterator.push_back(IterationItem(theFeature));
   IterationItem& aCurrent = *myProcessIterator.rbegin();
-  if (theFeature.get()) {
-    aCurrent.myMain = theFeature;
-    // two cycles: parameters must be processed first
-    for(int a = 0; a < theFeature->numberOfSubs(); a++) {
-      FeaturePtr aSub = theFeature->subFeature(a);
-      aCurrent.mySub = aSub;
-      if (aSub->getKind() == "Parameter")
-        updateFeature(aSub);
-    }
-    // number of subs can be changed in execution: like fillet
-    for(int a = 0; a < theFeature->numberOfSubs(); a++) {
-      FeaturePtr aSub = theFeature->subFeature(a);
-      aCurrent.mySub = aSub;
-      if (aSub->getKind() != "Parameter")
-       updateFeature(aSub);
-    }
-  } else {
-    DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument();
-    Model_Objects* anObjs = std::dynamic_pointer_cast<Model_Document>(aRootDoc)->objects();
-    if (!anObjs)
-      return false;
-    aCurrent.mySub = anObjs->firstFeature();
-    for (; aCurrent.mySub.get(); aCurrent.mySub = anObjs->nextFeature(aCurrent.mySub)) {
-      if (aCurrent.mySub->getKind() == "Parameter")
-        updateFeature(aCurrent.mySub);
-    }
-    aCurrent.mySub = anObjs->firstFeature();
-    for (; aCurrent.mySub.get(); aCurrent.mySub = anObjs->nextFeature(aCurrent.mySub)) {
-      if (aCurrent.mySub->getKind() != "Parameter")
-        updateFeature(aCurrent.mySub);
-    }
+  // two cycles: parameters must be processed first
+  for(aCurrent.startIteration(true); aCurrent.more(); aCurrent.next()) {
+    if (aCurrent.current()->getKind() == "Parameter")
+      updateFeature(aCurrent.current());
+  }
+  // number of subs can be changed in execution: like fillet
+  for(aCurrent.startIteration(false); aCurrent.more(); aCurrent.next()) {
+    FeaturePtr aSub = aCurrent.current();
+    if (aSub->getKind() != "Parameter")
+      updateFeature(aSub);
   }
   // processing is finished, so, remove the iterated
+  bool aResult = !aCurrent.isBreaked(); // iteration is finished correctly, not breaked
   myProcessIterator.pop_back();
-  return true; // iteration is finished correctly
+  return aResult;
 }
 
-void Model_Update::processOperation(const bool theTotalUpdate, const bool theFinish)
+void Model_Update::iterateUpdateBreak(std::shared_ptr<ModelAPI_Feature> theFeature)
 {
-  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);
-            }
-          }
+  // checking that this feature is before the current iterated one: otherwise break is not needed
+  std::list<IterationItem>::reverse_iterator aProcessed = myProcessIterator.rbegin();
+  for(; aProcessed != myProcessIterator.rend(); aProcessed++) {
+    if (aProcessed->isIterated(theFeature)) {
+      if (aProcessed->isEarlierThanCurrent(theFeature)) {
+        // break all lower level iterators
+        std::list<IterationItem>::reverse_iterator aBreaked = myProcessIterator.rbegin();
+        for(; aBreaked != aProcessed; aBreaked++) {
+          aBreaked->setBreaked();
         }
+        // for the current breaked, set iteration to this feature precisely
+        aBreaked->setCurrentBefore(theFeature);
+        //myModification++;
       }
+      // the iterator that contains breaked is found, so, nothing else is needed
+      return;
     }
   }
+  // if this feature is not found in the list of the currently iterated, try to break the parent
+  FeaturePtr aParent = ModelAPI_Tools::compositeOwner(theFeature);
+  if (aParent.get())
+    iterateUpdateBreak(aParent);
+}
+
+void Model_Update::processOperation(const bool theTotalUpdate, const bool theFinish)
+{
   // perform update of everything if needed
   if (!myIsExecuted) {
     #ifdef DEB_UPDATE
       std::cout<<"****** Start processing"<<std::endl;
     #endif
     myIsExecuted = true;
+    myModificationInStartProcessing = myModification;
 
     bool isAutomaticChanged = false;
 
@@ -243,16 +241,22 @@ void Model_Update::processOperation(const bool theTotalUpdate, const bool theFin
       isAutomaticChanged = true;
       myIsAutomatic = true;
     }
+    // modifications inside of the iteration will be different from modification that comes outside
+    myModification++;
     // init iteration from the root document
-    myProcessed.clear(); // to avoid processing twice
     iterateUpdate(CompositeFeaturePtr());
 
     if (isAutomaticChanged) myIsAutomatic = false;
-    myProcessed.clear(); // to avoid keeping features in memory
     myIsExecuted = false;
+    // flush updates just before "myModification" increment: to distinguish
+    // updates by "execute" produced by this updater and other updates, coming outside,
+    // which are really important for "processEvent" of this updater
+    static Events_Loop* aLoop = Events_Loop::loop();
+    static const Events_ID kUpdatedEvent = aLoop->eventByName(EVENT_OBJECT_UPDATED);
+    aLoop->flush(kUpdatedEvent);
+    myModification++;
 
     // 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);
     #ifdef DEB_UPDATE
@@ -261,16 +265,33 @@ void Model_Update::processOperation(const bool theTotalUpdate, const bool theFin
   }
 }
 
+bool Model_Update::isProcessed(const int theModificationID)
+{
+  return theModificationID >= myModificationInStartProcessing && 
+         theModificationID <= myModification;
+}
+
 void Model_Update::updateFeature(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())
+  if (theFeature->isDisabled()) {
+    // possibly sub-elements are not disabled?
+    CompositeFeaturePtr aCompos = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(theFeature);
+    if (aCompos)
+      iterateUpdate(aCompos);
     return;
+  }
+
+  // do not execute the composite that contains the current
+  bool isPostponedMain = false;
+  CompositeFeaturePtr aMain = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(theFeature);
+  if (theFeature->getKind() == "ExtrusionSketch" && aMain.get()) {
+    CompositeFeaturePtr aCurrentOwner = 
+      ModelAPI_Tools::compositeOwner(theFeature->document()->currentFeature(false));
+    isPostponedMain = aCurrentOwner.get() && aMain->isSub(aCurrentOwner);
+  }
 
   #ifdef DEB_UPDATE
     std::cout<<"Update Feature "<<theFeature->name()<<std::endl;
@@ -278,7 +299,9 @@ void Model_Update::updateFeature(FeaturePtr theFeature)
   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()) {
+  if (!myIsAutomatic && 
+       (myUpdated.find(theFeature) == myUpdated.end() || !isProcessed(myUpdated[theFeature]))
+       && !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);
@@ -294,7 +317,9 @@ void Model_Update::updateFeature(FeaturePtr theFeature)
     if (!iterateUpdate(aCompos))
       return; // iteration was interrupted, so, interrupt the update of this feature (it will be done later)
     // reupdate arguments of composite feature: it may be changed during subs execution
-    if (theFeature->data()->execState() != ModelAPI_StateMustBeUpdated)
+
+    // issue 955: extrusion fuse sketch naming must be updated after the sketch update 
+    // so, comment this: if (theFeature->data()->execState() != ModelAPI_StateMustBeUpdated)
       updateArguments(theFeature);
   }
   // this checking must be after the composite feature sub-elements processing:
@@ -305,7 +330,14 @@ void Model_Update::updateFeature(FeaturePtr theFeature)
     return;
   }
 
-  bool aJustUpdated = myJustUpdated.find(theFeature) != myJustUpdated.end();
+  // only the currently updated features are executed
+  bool aJustUpdated = myUpdated.find(theFeature) != myUpdated.end();
+  if (aJustUpdated) {
+    // if preview is not needed, the created feature was not updated before, so, myModification is not actual for this
+    if (theFeature->isPreviewNeeded()) {
+      aJustUpdated = isProcessed(myUpdated[theFeature]);
+    }
+  }
 
   if (myIsAutomatic && theFeature->data()->execState() == ModelAPI_StateMustBeUpdated)
     aJustUpdated = true;
@@ -327,6 +359,10 @@ void Model_Update::updateFeature(FeaturePtr theFeature)
       if (theFeature->data()->execState() == ModelAPI_StateMustBeUpdated) { // it is done (in the tree)
         theFeature->data()->execState(ModelAPI_StateDone);
       }
+      // it will be not updated with new modifications: only the currently updated features are updated
+      //if (myUpdated.find(theFeature) != myUpdated.end()) {
+      //  myUpdated.erase(theFeature); // do not update this persistent feature even in the future
+      //}
     }
     return;
   }
@@ -336,11 +372,16 @@ void Model_Update::updateFeature(FeaturePtr theFeature)
     if (aJustUpdated) {
       ModelAPI_ExecState aState = theFeature->data()->execState();
       if (aFactory->validate(theFeature)) {
+        if (!isPostponedMain) {
+          #ifdef DEB_UPDATE
+            std::cout<<"Execute Feature "<<theFeature->name()<<std::endl;
+          #endif
+          executeFeature(theFeature);
+        }
+      } else {
         #ifdef DEB_UPDATE
-          std::cout<<"Execute Feature "<<theFeature->name()<<std::endl;
+          std::cout<<"Feature is not valid, erase results "<<theFeature->name()<<std::endl;
         #endif
-        executeFeature(theFeature);
-      } else {
         theFeature->eraseResults();
         redisplayWithResults(theFeature, ModelAPI_StateInvalidArgument); // result also must be updated
       }
@@ -348,8 +389,10 @@ void Model_Update::updateFeature(FeaturePtr theFeature)
   } 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);
+      if (aJustUpdated) {// store that it must be updated on finish
+        myUpdated[theFeature] = myModification;
+        aFactory->validate(theFeature); // need to be validated to update the "Apply" state if not previewed
+      }
     }
   }
 }
@@ -358,14 +401,16 @@ void Model_Update::redisplayWithResults(FeaturePtr theFeature, const ModelAPI_Ex
 {
   // 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);
+        myUpdated[aRes] = myModification;
     }
     if (theFeature->data()->updateID() > aRes->data()->updateID()) {
       aRes->data()->setUpdateID(theFeature->data()->updateID());
@@ -375,6 +420,7 @@ void Model_Update::redisplayWithResults(FeaturePtr theFeature, const ModelAPI_Ex
   // to redisplay "presentable" feature (for ex. distance constraint)
   ModelAPI_EventCreator::get()->sendUpdated(theFeature, EVENT_DISP);
   theFeature->data()->execState(theState);
+  myUpdated[theFeature] = myModification; // feature is also updated to avoid re-updation of it
 }
 
 /// Updates the state by the referenced object: if something bad with it, set state for this one
@@ -392,6 +438,43 @@ ModelAPI_ExecState stateByReference(ObjectPtr theTarget, const ModelAPI_ExecStat
   return theCurrent;
 }
 
+bool Model_Update::isOlder(std::shared_ptr<ModelAPI_Feature> theFeature, 
+                           std::shared_ptr<ModelAPI_Object> theArgument)
+{
+  int aFeatureID = theFeature->data()->updateID();
+  int anArgID = theArgument->data()->updateID();
+  if (aFeatureID < anArgID)
+    return true;
+  std::map<std::shared_ptr<ModelAPI_Object>, int >::iterator anAIter = myUpdated.find(theArgument);
+  if (anAIter == myUpdated.end())
+    return false;
+  // for the modification IDs compare results: modification ID of feature means only that attributes
+  // of this feature were updated, but if results are obsolete relatively to the referenced results,
+  // the feature must be updated
+  std::list<ResultPtr> aResults;
+  ModelAPI_Tools::allResults(theFeature, aResults);
+  std::list<ResultPtr>::iterator aRIter = aResults.begin();
+  for (; aRIter != aResults.cend(); aRIter++) {
+    std::shared_ptr<ModelAPI_Result> aRes = *aRIter;
+    if (!aRes->isDisabled()) {
+      std::map<std::shared_ptr<ModelAPI_Object>, int >::iterator anRIter = myUpdated.find(aRes);
+      int aResultID = aRes->data()->updateID();
+      if (aResultID < anArgID)
+        return true;
+      if (anRIter == myUpdated.end()) // not updated at all
+        return true;
+      if (anRIter->second < anAIter->second)
+        return true;
+    }
+  }
+  // also check a feature: some have no parameters,
+  // but must be updated anyway (like Coincidence of sketch) to be redisplayed
+  std::map<std::shared_ptr<ModelAPI_Object>, int >::iterator aFIter = myUpdated.find(theFeature);
+  if (aFIter == myUpdated.end())
+    return true; // argument is updated, but feature is not updated at all
+  return aFIter->second < anAIter->second;
+}
+
 void Model_Update::updateArguments(FeaturePtr theFeature) {
   // perform this method also for disabled features: to make "not done" state for
   // features referenced to the active and modified features
@@ -474,8 +557,7 @@ void Model_Update::updateArguments(FeaturePtr theFeature) {
       bool isObligatory = !aFactory->isNotObligatory(
         theFeature->getKind(), theFeature->data()->id(aSel)) &&
         aFactory->isCase(theFeature, theFeature->data()->id(aSel));
-      if (myJustUpdated.find(aContext) != myJustUpdated.end() ||
-          aContext->data()->updateID() > theFeature->data()->updateID()) {
+      if (isOlder(theFeature, aContext)) {
         if (aState == ModelAPI_StateDone)
           aState = ModelAPI_StateMustBeUpdated;
         if (!aSel->update()) { // this must be done on execution since it may be long operation
@@ -483,7 +565,8 @@ void Model_Update::updateArguments(FeaturePtr theFeature) {
             aState = ModelAPI_StateInvalidArgument;
         }
       } else if (aSel->isInvalid()) { // not needed to update, but invalid (stated previously)
-        aState = ModelAPI_StateInvalidArgument;
+        if (isObligatory)
+          aState = ModelAPI_StateInvalidArgument;
       }
     }
   }
@@ -501,8 +584,7 @@ void Model_Update::updateArguments(FeaturePtr theFeature) {
           bool isObligatory = !aFactory->isNotObligatory(
             theFeature->getKind(), theFeature->data()->id(aSel)) &&
             aFactory->isCase(theFeature, theFeature->data()->id(aSel));
-          if ((myJustUpdated.find(aContext) != myJustUpdated.end() ||
-               aContext->data()->updateID() > theFeature->data()->updateID())) {
+          if (isOlder(theFeature, aContext)) {
             if (aState == ModelAPI_StateDone)
                 aState = ModelAPI_StateMustBeUpdated;
             if (!aSelAttr->update()) {
@@ -510,7 +592,8 @@ void Model_Update::updateArguments(FeaturePtr theFeature) {
                 aState = ModelAPI_StateInvalidArgument;
             }
           } else if (aSelAttr->isInvalid()) {
-            aState = ModelAPI_StateInvalidArgument;
+            if (isObligatory)
+              aState = ModelAPI_StateInvalidArgument;
           }
         }
       }
@@ -531,10 +614,9 @@ void Model_Update::updateArguments(FeaturePtr theFeature) {
                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;
+      } else if (aRefObj->get() && isOlder(theFeature, *aRefObj)) {
+        if (aState == ModelAPI_StateDone)
+          aState = ModelAPI_StateMustBeUpdated;
       }
       aState = stateByReference(*aRefObj, aState);
     }
@@ -544,11 +626,11 @@ void Model_Update::updateArguments(FeaturePtr 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++) {
+    int aNumSubs = aCompos->numberOfSubs();
+    for(int a = 0; a < aNumSubs; a++) {
       FeaturePtr aSub = aCompos->subFeature(a);
       if (aSub.get() && aState == ModelAPI_StateDone) {
-        if (myJustUpdated.find(aSub) != myJustUpdated.end() || 
-              (aSub->data()->updateID() > theFeature->data()->updateID())) {
+        if (isOlder(theFeature, aSub)) {
           aState = ModelAPI_StateMustBeUpdated;
         }
         // also check that all results of subs were updated: composite also depends on the results
@@ -556,12 +638,13 @@ void Model_Update::updateArguments(FeaturePtr theFeature) {
         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()))) {
+              isOlder(theFeature, *aResIter)) {
             aState = ModelAPI_StateMustBeUpdated;
           }
         }
       }
+      if (a == aNumSubs - 1) // in case number of subs is changed, just recheck before end
+        aNumSubs = aCompos->numberOfSubs();
     }
   }
 
@@ -577,21 +660,194 @@ void Model_Update::executeFeature(FeaturePtr theFeature)
   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");
   }
+  // 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)
+{
+  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++) {
+            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);
+    }
+  }
+}
+
+///////////////// Updated items iterator ////////////////////////
+Model_Update::IterationItem::IterationItem(std::shared_ptr<ModelAPI_CompositeFeature> theFeature)
+{
+  myBreaked = false;
+  myIsVirtual = false;
+  myMain = theFeature;
+  myObjects = NULL;
+  if (!myMain.get() && ModelAPI_Session::get()->hasModuleDocument()) { // no document => nothing to do
+    DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument();
+    myObjects = std::dynamic_pointer_cast<Model_Document>(aRootDoc)->objects();
+  }
+  mySkipNext = false;
+}
+
+void Model_Update::IterationItem::next()
+{
+  if (mySkipNext) { // ignore one next
+    mySkipNext = false;
+    return;
+  }
+  if (!myBreaked) {
+    if (myMain.get()) {
+      myIndex++;
+      int aNumSubs = myMain->numberOfSubs();
+      if (myIndex == aNumSubs)
+        return;
+      // skip sub-objects, that are subs not only for this: sketch elements relatively to Part
+      for(FeaturePtr aSub = myMain->subFeature(myIndex); aSub.get();
+          aSub = myMain->subFeature(myIndex)) {
+        aSub = myMain->subFeature(myIndex);
+        CompositeFeaturePtr anOwner = ModelAPI_Tools::compositeOwner(aSub);
+        if (!anOwner.get() || anOwner == myMain) {
+          break;
+        }
+        myIndex++;
+        if (myIndex == aNumSubs)
+          break;
+      }
+    } else if (mySub.get()) {
+      while(mySub.get()) {
+        mySub = myObjects->nextFeature(mySub);
+        CompositeFeaturePtr anOwner = ModelAPI_Tools::compositeOwner(mySub);
+        // skip sub-objects, that are subs not only for this: sketch elements relatively to PartSet
+        if (!anOwner.get()) {
+          break;
+        }
+      }
+    }
+  }
+}
+
+bool Model_Update::IterationItem::more()
+{
+  if (myBreaked)
+    return false;
+  if (myMain.get())
+    return myIndex < myMain->numberOfSubs();
+  return mySub.get() != NULL;
+}
+
+FeaturePtr Model_Update::IterationItem::current()
+{
+  if (myMain.get())
+    return myMain->subFeature(myIndex);
+  return mySub;
+}
+
+void Model_Update::IterationItem::setBreaked()
+{
+  if (!myIsVirtual)
+    myBreaked = true;
+}
+
+void Model_Update::IterationItem::startIteration(const bool theVirtual)
+{
+  myIsVirtual = theVirtual;
+  if (myMain.get()) {
+    myIndex = 0;
+  } else if (myObjects) {
+    mySub = myObjects->firstFeature();
+  }
+}
+
+bool Model_Update::IterationItem::isIterated(FeaturePtr theFeature)
+{
+  if (myMain.get()) {
+    if (myMain->isSub(theFeature)) {
+      CompositeFeaturePtr anOwner = ModelAPI_Tools::compositeOwner(theFeature);
+      if (!anOwner.get() || anOwner == myMain)
+        return true;
+    }
+    return false;
+  }
+  // for the root document just check that this feature in this document and it is not sub
+  return myObjects->owner() == theFeature->document() && 
+         !ModelAPI_Tools::compositeOwner(theFeature).get();
+}
+
+bool Model_Update::IterationItem::isEarlierThanCurrent(FeaturePtr theFeature)
+{
+  if (myMain.get()) {
+    for(int a = 0; a < myIndex; a++) {
+      if (myMain->subFeature(a) == theFeature)
+        return true;
+    }
+  } else {
+    return !mySub.get() && !myObjects->isLater(theFeature, mySub);
+  }
+  return false;
+}
+
+void Model_Update::IterationItem::setCurrentBefore(FeaturePtr theFeature)
+{
+  if (myMain.get()) {
+    for(int a = 0; a < myIndex; a++) {
+      if (myMain->subFeature(a) == theFeature) {
+        myIndex = a;
+        break;
+      }
+    }
+  } else {
+    mySub = theFeature;
+  }
+  mySkipNext = true;
+}