Fix for the problem when referenced object is updated by modified-feature result...

[modules/shaper.git] / src / Model / Model_Update.cpp

diff --git a/src/Model/Model_Update.cpp b/src/Model/Model_Update.cpp
index 8e2ac8137228b26224f0245b17bd2d08095d3399..05a9998d837bbb127b30c31ac007a0f779d66395 100755 (executable)
--- a/src/Model/Model_Update.cpp
+++ b/src/Model/Model_Update.cpp
@@ -87,6 +87,7 @@ 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) {
@@ -301,12 +302,16 @@ void Model_Update::processEvent(const std::shared_ptr<Events_Message>& theMessag
         const std::set<std::shared_ptr<ModelAPI_Attribute> >&
           aRefs = (*anObjIter)->data()->refsToMe();
         std::set<std::shared_ptr<ModelAPI_Attribute> >::const_iterator aRefIter = aRefs.cbegin();
+        FeaturePtr aReason;
+        ResultPtr aReasonResult = std::dynamic_pointer_cast<ModelAPI_Result>(*anObjIter);
+        if (aReasonResult.get())
+          aReason = (*anObjIter)->document()->feature(aReasonResult);
         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()))
+            if (addModified(anUpdated, aReason))
               aSomeModified = true;
           }
         }
@@ -573,7 +578,10 @@ bool Model_Update::processFeature(FeaturePtr theFeature)
     if (aReason != theFeature && (aReason)->data()->isValid()) {
       if (processFeature(aReason))
         aIsModified = true;
-      if (aReason->data()->execState() == ModelAPI_StateInvalidArgument)
+      // check validity of aReason once again because it may be removed by dependent feature
+      // (e.g. by SketchPlugin_IntersectionPoint)
+      if (!aReason->data()->isValid() ||
+          aReason->data()->execState() == ModelAPI_StateInvalidArgument)
         isReferencedInvalid = true;
     }
     // searching for the next not used reason
@@ -593,6 +601,25 @@ bool Model_Update::processFeature(FeaturePtr theFeature)
     CompositeFeaturePtr aCurrentOwner =
       ModelAPI_Tools::compositeOwner(theFeature->document()->currentFeature(false));
     isPostponedMain = aCurrentOwner.get() && aCompos->isSub(aCurrentOwner);
+  } else if (theFeature->getKind() == "Sketch" &&
+    std::dynamic_pointer_cast<Model_Document>((theFeature)->document())->executeFeatures()) {
+    // 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* aLoop = Events_Loop::loop();
+    // in case it is finish operation, flush for the sketch other events (#2450)
+    aLoop->flush(aLoop->eventByName(EVENT_OBJECT_UPDATED));
+    aLoop->send(aMsg);
+    // check that sub-elements of sketch are updated => sketch must be re-processed
+    std::set<FeaturePtr> aWholeR;
+    allReasons(theFeature, aWholeR);
+    std::set<FeaturePtr>::iterator aRIter = aWholeR.begin();
+    for(; aRIter != aWholeR.end(); aRIter++) {
+      if (myModified.find(*aRIter) != myModified.end()) {
+        processFeature(theFeature);
+        return true;
+      }
+    }
   }
 
 #ifdef DEB_UPDATE
@@ -809,7 +836,7 @@ void Model_Update::updateArguments(FeaturePtr theFeature) {
       if (aSelAttr) {
         ObjectPtr aContext = aSelAttr->context();
         // update argument only if the referenced object is ready to use
-        if (aContext.get() && !aContext->isDisabled()) {
+        if (aContext.get() && !aContext->isDisabled() && !aSelAttr->isInvalid()) {
           if (isReason(theFeature, aContext)) {
             if (!aSelAttr->update()) {
               bool isObligatory = !aFactory->isNotObligatory(
@@ -819,7 +846,7 @@ void Model_Update::updateArguments(FeaturePtr theFeature) {
                 aState = ModelAPI_StateInvalidArgument;
             }
           }
-        } else if (aContext.get()) {
+        } else if (aContext.get() || aSelAttr->isInvalid()) {
           // 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)