Salome HOME
Debug of movement of part results
[modules/shaper.git] / src / Model / Model_Update.cpp
index 7a8e5277bc898c2da6839497a2dc0d68bba3957f..561882b7c28d3157111c3cff3df98d6bbb186620 100644 (file)
@@ -23,6 +23,8 @@
 #include <ModelAPI_CompositeFeature.h>
 #include <ModelAPI_Session.h>
 #include <ModelAPI_Tools.h>
+#include <GeomDataAPI_Point.h>
+#include <GeomDataAPI_Point2D.h>
 #include <Events_Loop.h>
 #include <Events_LongOp.h>
 #include <Events_Error.h>
@@ -31,6 +33,7 @@
 using namespace std;
 
 Model_Update MY_UPDATER_INSTANCE;  /// the only one instance initialized on load of the library
+//#define DEB_UPDATE
 
 Model_Update::Model_Update()
 {
@@ -56,6 +59,8 @@ Model_Update::Model_Update()
                                    Config_Prop::Boolean, "false");
   myIsAutomatic =
     Config_PropManager::findProp("Model update", "automatic_rebuild")->value() == "true";
+  myIsParamUpdated = false;
+  myIsFinish = false;
 }
 
 void Model_Update::processEvent(const std::shared_ptr<Events_Message>& theMessage)
@@ -69,7 +74,6 @@ 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");
-  bool isOperationChanged = false;
   if (theMessage->eventID() == kChangedEvent) { // automatic and manual rebuild flag is changed
     bool aPropVal =
       Config_PropManager::findProp("Model update", "automatic_rebuild")->value() == "true";
@@ -86,65 +90,79 @@ void Model_Update::processEvent(const std::shared_ptr<Events_Message>& theMessag
         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 ((*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
-      if (theMessage->eventID() == kCreatedEvent) {
-        myJustCreated.insert(*anObjIter);
-      } else if (myJustCreated.find(*anObjIter) == myJustCreated.end()) { // moved and updated
-        myJustUpdated.insert(*anObjIter);
+      myJustUpdated.insert(*anObjIter);
+      #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 immideately
-    if (!(theMessage->eventID() == kMovedEvent))
+    // this event is for solver update, not here, do not react immediately
+    if (!isOnlyResults && !(theMessage->eventID() == kMovedEvent))
       processOperation(false);
-  } else if (theMessage->eventID() == kOpStartEvent) {
-    // we don't need the update only on operation start (caused problems in PartSet_Listener::processEvent)
-    isOperationChanged = true;
-  } else if (theMessage->eventID() == kOpFinishEvent || theMessage->eventID() == kOpAbortEvent) {
-    processOperation(true);
-    isOperationChanged = true;
-  }
-  if (isOperationChanged) {
+  } else if (theMessage->eventID() == kOpFinishEvent || theMessage->eventID() == kOpAbortEvent ||
+      theMessage->eventID() == kOpStartEvent) {
+
+    if (!(theMessage->eventID() == kOpStartEvent)) {
+      myIsFinish = true;
+      processOperation(true, theMessage->eventID() == kOpFinishEvent);
+      myIsFinish = false;
+    }
     // remove all macros before clearing all created
-    std::set<ObjectPtr>::iterator aCreatedIter = myJustCreated.begin();
-    for(; aCreatedIter != myJustCreated.end(); aCreatedIter++) {
-      FeaturePtr aFeature = 
-        std::dynamic_pointer_cast<ModelAPI_Feature>(*aCreatedIter);
+    std::set<ObjectPtr>::iterator anUpdatedIter = myWaitForFinish.begin();
+    while(anUpdatedIter != myWaitForFinish.end()) {
+      FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(*anUpdatedIter);
       if (aFeature.get()) {
-        // execute not-previewed feature on "apply"
-        if (!aFeature->isPreviewNeeded() && (myJustCreated.find(aFeature) != myJustCreated.end() ||
-          myJustUpdated.find(aFeature) != myJustUpdated.end())) {
-          static ModelAPI_ValidatorsFactory* aFactory = ModelAPI_Session::get()->validators();
-          if (aFactory->validate(aFeature)) {
-            executeFeature(aFeature);
-          }
-        }
-        // remove macro on apply
+        // remove macro on finish
         if (aFeature->isMacro()) {
           aFeature->document()->removeFeature(aFeature);
+          myWaitForFinish.erase(aFeature);
+        }
+        // to avoid the map update problems on "remove"
+        if (myWaitForFinish.find(aFeature) == myWaitForFinish.end()) {
+          anUpdatedIter = myWaitForFinish.begin();
+        } else {
+          anUpdatedIter++;
         }
+      } else {
+        anUpdatedIter++;
       }
     }
-    myJustCreated.clear();
+    // 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();
+    myWaitForFinish.clear();
   }
 }
 
-void Model_Update::processOperation(const bool theTotalUpdate)
+void Model_Update::processOperation(const bool theTotalUpdate, const bool theFinish)
 {
-  // the hardcode (DBC asked): hide the sketch referenced by extrusion on apply
-  std::set<std::shared_ptr<ModelAPI_Object> >::iterator aFIter;
-  for(aFIter = myJustCreated.begin(); aFIter != myJustCreated.end(); aFIter++)
-  {
-    FeaturePtr aF = std::dynamic_pointer_cast<ModelAPI_Feature>(*aFIter);
-    if (aF && aF->data().get() && 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);
+  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);
+            }
           }
         }
       }
@@ -152,6 +170,9 @@ void Model_Update::processOperation(const bool theTotalUpdate)
   }
   // perform update of everything if needed
   if (!myIsExecuted) {
+    #ifdef DEB_UPDATE
+      std::cout<<"****** Start processing"<<std::endl;
+    #endif
     myIsExecuted = true;
 
     bool isAutomaticChanged = false;
@@ -161,7 +182,22 @@ void Model_Update::processOperation(const bool theTotalUpdate)
       myIsAutomatic = true;
     }
 
-    updateInDoc(ModelAPI_Session::get()->moduleDocument());
+    // 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();
+    std::set<FeaturePtr> aProcessedFeatures; // to avoid processing twice
+    for (; aFeatureIter.get(); aFeatureIter = anObjs->nextFeature(aFeatureIter)) {
+      if (aFeatureIter->getKind() == "Parameter")
+        updateFeature(aFeatureIter, aProcessedFeatures);
+    }
+    aFeatureIter = anObjs->firstFeature();
+    for (; aFeatureIter.get(); aFeatureIter = anObjs->nextFeature(aFeatureIter)) {
+      if (aFeatureIter->getKind() != "Parameter")
+        updateFeature(aFeatureIter, aProcessedFeatures);
+    }
 
     if (isAutomaticChanged) myIsAutomatic = false;
     myIsExecuted = false;
@@ -170,45 +206,109 @@ void Model_Update::processOperation(const bool theTotalUpdate)
     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
+      std::cout<<"****** End processing"<<std::endl;
+    #endif
   }
 }
 
-void Model_Update::updateInDoc(std::shared_ptr<ModelAPI_Document> theDoc)
+void Model_Update::updateFeature(FeaturePtr theFeature, std::set<FeaturePtr>& theProcessed)
 {
-  std::set<FeaturePtr> alreadyProcessed; // features that are processed before others
-  // all features one by one
-  Model_Objects* anObjs = std::dynamic_pointer_cast<Model_Document>(theDoc)->objects();
-  if (!anObjs) return;
-  FeaturePtr aFeatureIter = anObjs->firstFeature();
-  for (; aFeatureIter.get(); aFeatureIter = anObjs->nextFeature(aFeatureIter)) {
-    if (aFeatureIter && alreadyProcessed.find(aFeatureIter) == alreadyProcessed.end()) {
-      // update selection and parameters attributes first, before sub-features analysis (sketch plane)
-      updateArguments(aFeatureIter);
-      // composite feature must be executed after sub-features execution
-      CompositeFeaturePtr aComposite = 
-        std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(aFeatureIter);
-      if (aComposite) {
-        // number of subs can be changed in execution: like fillet
-        for(int a = 0; a < aComposite->numberOfSubs(); a++) {
-          FeaturePtr aSub = aComposite->subFeature(a);
-          updateFeature(aSub);
-          alreadyProcessed.insert(aSub);
-        }
+  // check all features this feature depended on (recursive call of updateFeature)
+  static ModelAPI_ValidatorsFactory* aFactory = ModelAPI_Session::get()->validators();
+
+  if (theProcessed.find(theFeature) != theProcessed.end())
+    return;
+  theProcessed.insert(theFeature);
+  if (theFeature->isDisabled())
+    return;
+
+  #ifdef DEB_UPDATE
+    std::cout<<"Update Feature "<<theFeature->name()<<std::endl;
+  #endif
+  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;
+  }
+
+  // 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, theProcessed);
+    }
+    // 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, theProcessed);
+    }
+  }
+  // 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) {
+    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;
+  }
 
-      updateFeature(aFeatureIter);
-      // update the document results recursively
-      const std::list<std::shared_ptr<ModelAPI_Result> >& aResults = aFeatureIter->results();
-      std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aRIter = aResults.begin();
-      for (; aRIter != aResults.cend(); aRIter++) {
-        ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(*aRIter);
-        if (aPart.get()) {
-          if (!aPart->isDisabled() && aPart->isActivated()) {
-            updateInDoc(aPart->partDoc());
-          }
-        }
+  // 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);
+    }
   }
 }
 
@@ -220,8 +320,11 @@ void Model_Update::redisplayWithResults(FeaturePtr theFeature, const ModelAPI_Ex
   std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aRIter = aResults.begin();
   for (; aRIter != aResults.cend(); aRIter++) {
     std::shared_ptr<ModelAPI_Result> aRes = *aRIter;
-    aRes->data()->execState(theState);
-    myJustUpdated.insert(aRes);
+    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 (theFeature->data()->updateID() > aRes->data()->updateID()) {
+      aRes->data()->setUpdateID(theFeature->data()->updateID());
+    }
     ModelAPI_EventCreator::get()->sendUpdated(aRes, EVENT_DISP);
   }
   // to redisplay "presentable" feature (for ex. distance constraint)
@@ -235,7 +338,8 @@ ModelAPI_ExecState stateByReference(ObjectPtr theTarget, const ModelAPI_ExecStat
   if (theTarget) {
     ModelAPI_ExecState aRefState = theTarget->data()->execState();
     if (aRefState == ModelAPI_StateMustBeUpdated) {
-      return ModelAPI_StateMustBeUpdated;
+      if (theCurrent == ModelAPI_StateDone)
+        return ModelAPI_StateMustBeUpdated;
     } else if (aRefState != ModelAPI_StateDone) {
       return ModelAPI_StateInvalidArgument;
     }
@@ -244,148 +348,172 @@ ModelAPI_ExecState stateByReference(ObjectPtr theTarget, const ModelAPI_ExecStat
 }
 
 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
+
   static ModelAPI_ValidatorsFactory* aFactory = ModelAPI_Session::get()->validators();
 
-  if (theFeature->isDisabled()) // nothing to do with disabled feature
-    return;
-  bool aJustUpdated = false;
-  ModelAPI_ExecState aState = ModelAPI_StateDone;
-  // check the parameters: values can be changed
-  std::list<AttributePtr> aDoubles = 
-    theFeature->data()->attributes(ModelAPI_AttributeDouble::typeId()); 
+  ModelAPI_ExecState aState = theFeature->data()->execState();
+  if (aState == ModelAPI_StateExecFailed) { // try again failed feature: issue 577
+    aState = ModelAPI_StateMustBeUpdated;
+  }
+  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 = 
+    AttributeDoublePtr aDouble =
       std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(*aDoubleIter);
     if (aDouble.get() && !aDouble->text().empty()) {
-      double aNewVal;
-      if (ModelAPI_Tools::findVariable(aDouble->text(), aNewVal)) {
-        if (aNewVal != aDouble->value()) {
-          aDouble->setValue(aNewVal);
-          aJustUpdated = true;
-        }
-      } else {
+      if (myIsParamUpdated) {
+        ModelAPI_AttributeEvalMessage::send(aDouble, this);
+      }
+      if (aDouble->expressionInvalid()) {
         aState = ModelAPI_StateInvalidArgument;
       }
     }
   }
-
-  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
-    list<AttributePtr> aRefs = 
-      theFeature->data()->attributes(ModelAPI_AttributeSelection::typeId());
-    list<AttributePtr>::iterator aRefsIter = aRefs.begin();
-    for (; aRefsIter != aRefs.end(); aRefsIter++) {
-      std::shared_ptr<ModelAPI_AttributeSelection> aSel =
-        std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(*aRefsIter);
-      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)))
+  // Point
+  {
+    std::list<AttributePtr> anAttributes =
+      theFeature->data()->attributes(GeomDataAPI_Point::typeId());
+    std::list<AttributePtr>::iterator anIter = anAttributes.begin();
+    for(; anIter != anAttributes.end(); anIter++) {
+      AttributePointPtr aPointAttribute =
+        std::dynamic_pointer_cast<GeomDataAPI_Point>(*anIter);
+      if (aPointAttribute.get()) {
+        if (myIsParamUpdated) {
+          ModelAPI_AttributeEvalMessage::send(aPointAttribute, this);
+        }
+        if ((!aPointAttribute->textX().empty() && aPointAttribute->expressionInvalid(0)) ||
+          (!aPointAttribute->textY().empty() && aPointAttribute->expressionInvalid(1)) ||
+          (!aPointAttribute->textZ().empty() && aPointAttribute->expressionInvalid(2)))
           aState = ModelAPI_StateInvalidArgument;
       }
     }
-    aRefs = theFeature->data()->attributes(ModelAPI_AttributeSelectionList::typeId());
-    for (aRefsIter = aRefs.begin(); aRefsIter != aRefs.end(); aRefsIter++) {
-      std::shared_ptr<ModelAPI_AttributeSelectionList> aSel =
-        std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(*aRefsIter);
-      for(int a = aSel->size() - 1; a >= 0; a--) {
-        std::shared_ptr<ModelAPI_AttributeSelection> aSelAttr =
-          std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(aSel->value(a));
-        if (aSelAttr) {
-          if (!aSelAttr->update()) {
-            if (!aFactory->isNotObligatory(
-                  theFeature->getKind(), theFeature->data()->id(aSel)) &&
-                aFactory->isCase(theFeature, theFeature->data()->id(aSel)))
-              aState = ModelAPI_StateInvalidArgument;
-          }
+  }
+  // Point2D
+  {
+    std::list<AttributePtr> anAttributes =
+      theFeature->data()->attributes(GeomDataAPI_Point2D::typeId());
+    std::list<AttributePtr>::iterator anIter = anAttributes.begin();
+    for(; anIter != anAttributes.end(); anIter++) {
+      AttributePoint2DPtr aPoint2DAttribute =
+        std::dynamic_pointer_cast<GeomDataAPI_Point2D>(*anIter);
+      if (aPoint2DAttribute.get()) {
+        if (myIsParamUpdated) {
+          ModelAPI_AttributeEvalMessage::send(aPoint2DAttribute, this);
         }
+        if ((!aPoint2DAttribute->textX().empty() && aPoint2DAttribute->expressionInvalid(0)) ||
+          (!aPoint2DAttribute->textY().empty() && aPoint2DAttribute->expressionInvalid(1)))
+          aState = ModelAPI_StateInvalidArgument;
       }
     }
   }
-  if (aJustUpdated && myJustCreated.find(theFeature) == myJustCreated.end())
-  myJustUpdated.insert(theFeature);
-  if (aState != ModelAPI_StateDone)
-    theFeature->data()->execState(aState);
-}
-
-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 (theFeature->isDisabled()) // nothing to do with disabled feature
-    return;
-  bool aJustUpdated = false;
-
-  if (theFeature) {
-    if (theFeature->data()->execState() != ModelAPI_StateDone)
-      aJustUpdated = true;
-
-    ModelAPI_ExecState aState = ModelAPI_StateDone;
-
-    // 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> > > aRefs;
-    std::shared_ptr<Model_Data> aData = 
-      std::dynamic_pointer_cast<Model_Data>(theFeature->data());
-    aData->referencesToObjects(aRefs);
-    std::list<std::pair<std::string, std::list<ObjectPtr> > >::iterator aRef = aRefs.begin();
-    for(; aRef != aRefs.end(); aRef++) {
-      std::list<ObjectPtr>::iterator aRefObj = aRef->second.begin();
-      for(; aRefObj != aRef->second.end(); aRefObj++) {
-        if (myJustCreated.find(*aRefObj) != myJustCreated.end() ||
-            myJustUpdated.find(*aRefObj) != myJustUpdated.end()) {
-          aJustUpdated = true;
+  //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
+  list<AttributePtr> aRefs = 
+    theFeature->data()->attributes(ModelAPI_AttributeSelection::typeId());
+  list<AttributePtr>::iterator aRefsIter = aRefs.begin();
+  for (; aRefsIter != aRefs.end(); aRefsIter++) {
+    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;
+        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)))
+            aState = ModelAPI_StateInvalidArgument;
+        }
+    }
+  }
+  aRefs = theFeature->data()->attributes(ModelAPI_AttributeSelectionList::typeId());
+  for (aRefsIter = aRefs.begin(); aRefsIter != aRefs.end(); aRefsIter++) {
+    std::shared_ptr<ModelAPI_AttributeSelectionList> aSel =
+      std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(*aRefsIter);
+    for(int a = aSel->size() - 1; a >= 0; a--) {
+      std::shared_ptr<ModelAPI_AttributeSelection> aSelAttr =
+        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;
+            if (!aSelAttr->update()) {
+              if (!aFactory->isNotObligatory(
+                theFeature->getKind(), theFeature->data()->id(aSel)) &&
+                aFactory->isCase(theFeature, theFeature->data()->id(aSel)))
+                aState = ModelAPI_StateInvalidArgument;
+            }
         }
-        aState = stateByReference(*aRefObj, aState);
       }
     }
-
-    // some arguments were changed, so, this feature must be updated
-    if (myJustCreated.find(theFeature) != myJustCreated.end()) {
-      aJustUpdated = true;
-    } else {
-      if (aJustUpdated) {
-        if (myJustUpdated.find(theFeature) == myJustUpdated.end())
-          myJustUpdated.insert(theFeature);
-      } else {
-        aJustUpdated = myJustUpdated.find(theFeature) != myJustUpdated.end();
+  }
+  // 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);
     }
-    //std::cout<<"Update feature "<<theFeature->getKind()<<" must be updated = "<<aMustbeUpdated<<std::endl;
-    // execute feature if it must be updated
-    if (aJustUpdated) {
-      if ((std::dynamic_pointer_cast<Model_Document>(theFeature->document())->executeFeatures() ||
-          !theFeature->isPersistentResult()) && theFeature->isPreviewNeeded()) {
-        if (aFactory->validate(theFeature)) {
-          if (myIsAutomatic || 
-              (myJustCreated.find(theFeature) != myJustCreated.end() ||
-              (myJustUpdated.find(theFeature) != myJustUpdated.end() && 
-               theFeature == theFeature->document()->currentFeature(false)) || // currently edited
-              !theFeature->isPersistentResult() /* execute quick, not persistent results */))
-          {
-            if (aState == ModelAPI_StateDone || aState == ModelAPI_StateMustBeUpdated) {
-              executeFeature(theFeature);
-            }
-          } else { // must be updatet, but not updated yet
-            theFeature->data()->execState(ModelAPI_StateMustBeUpdated);
-            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::shared_ptr<ModelAPI_Result> aRes = *aRIter;
-              aRes->data()->execState(ModelAPI_StateMustBeUpdated);
-            }
+  }
+  // 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;
           }
-        } else {
-          theFeature->eraseResults();
-          redisplayWithResults(theFeature, ModelAPI_StateInvalidArgument); // result also must be updated
         }
-      } else { // for automatically updated features (on abort, etc) it is necessary to redisplay anyway
-        redisplayWithResults(theFeature, ModelAPI_StateNothing);
       }
     }
   }
+
+
+  if (aState != ModelAPI_StateDone)
+    theFeature->data()->execState(aState);
 }
 
 void Model_Update::executeFeature(FeaturePtr theFeature)
@@ -395,10 +523,12 @@ 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;
@@ -408,6 +538,6 @@ void Model_Update::executeFeature(FeaturePtr theFeature)
   if (aState != ModelAPI_StateDone) {
     theFeature->eraseResults();
   }
+  theFeature->data()->setUpdateID(ModelAPI_Session::get()->transactionID());
   redisplayWithResults(theFeature, aState);
 }
-