]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Simplification of "Update" algorithm and "Macro" flag implementation for the box...
authormpv <mpv@opencascade.com>
Thu, 7 May 2015 17:26:15 +0000 (20:26 +0300)
committermpv <mpv@opencascade.com>
Thu, 7 May 2015 17:26:15 +0000 (20:26 +0300)
src/Model/Model_AttributeSelection.cpp
src/Model/Model_Update.cpp
src/Model/Model_Update.h
src/ModelAPI/ModelAPI_CompositeFeature.cpp
src/ModelAPI/ModelAPI_Feature.cpp
src/ModelAPI/ModelAPI_Feature.h
src/PythonAPI/modeler/extrusion.py
src/PythonAddons/macros/box/feature.py
src/SketchPlugin/SketchPlugin_Sketch.cpp

index 3b82ea108368786a4972bb1198d89670e01101be..d6f9f869eb5fdf184b293bcd64e754a05bf03006 100644 (file)
@@ -98,7 +98,7 @@ void Model_AttributeSelection::setValue(const ResultPtr& theContext,
     // to keep the reference attribute label
     TDF_Label aRefLab = myRef.myRef->Label();
     aSelLab.ForgetAllAttributes(true);
-    myRef.myRef = TDF_Reference::Set(aSelLab, aSelLab);
+    myRef.myRef = TDF_Reference::Set(aSelLab.Father(), aSelLab.Father());
     return;
   }
   if (theContext->groupName() == ModelAPI_ResultBody::group()) {
index 403b3dffc759e217a86476a58ac5d94eeb84a630..93f321bec46428277ae56547ec06bec8f0450686 100644 (file)
@@ -17,6 +17,7 @@
 #include <ModelAPI_AttributeSelection.h>
 #include <ModelAPI_AttributeSelectionList.h>
 #include <ModelAPI_Result.h>
+#include <ModelAPI_ResultPart.h>
 #include <ModelAPI_Validator.h>
 #include <ModelAPI_CompositeFeature.h>
 #include <ModelAPI_Session.h>
@@ -67,20 +68,17 @@ 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 isAutomaticChanged = false;
+  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";
-    if (aPropVal == myIsAutomatic)
-      return; // nothing is changed, so nithing to do
-    myIsAutomatic = aPropVal;
-    if (!myIsAutomatic)
-      return; // less automatization => nothing to do
-  } else if (theMessage->eventID() == kRebuildEvent) { // the rebuild command
-    if (myIsAutomatic == false) {
-      isAutomaticChanged = true;
-      myIsAutomatic = 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) {
     std::shared_ptr<ModelAPI_ObjectUpdatedMessage> aMsg =
@@ -88,88 +86,113 @@ void Model_Update::processEvent(const std::shared_ptr<Events_Message>& theMessag
     const std::set<ObjectPtr>& anObjs = aMsg->objects();
     std::set<ObjectPtr>::const_iterator anObjIter = anObjs.cbegin();
     for(; anObjIter != anObjs.cend(); anObjIter++) {
-      myJustCreatedOrUpdated.insert(*anObjIter);
       // created objects are always must be up to date (python box feature)
       // and updated not in internal uptation chain
-      if (!myIsExecuted || theMessage->eventID() == kCreatedEvent)
-        myInitial.insert(*anObjIter);
-      // TODO(mpv): check the next line. Came into dev 0.6.1 from BR_PYTHON_PLUGIN
-      // (*anObjIter)->data()->mustBeUpdated(true); // object must be updated because it was changed
+      if (theMessage->eventID() == kCreatedEvent) {
+        myJustCreated.insert(*anObjIter);
+      } else if (myJustCreated.find(*anObjIter) == myJustCreated.end()) { // moved and updated
+        myJustUpdated.insert(*anObjIter);
+      }
     }
-    if (theMessage->eventID() == kMovedEvent)
-      return; // this event is for solver update, not here
+     // this event is for solver update, not here, do not react immideately
+    if (!(theMessage->eventID() == kMovedEvent))
+      processOperation(false);
   } else if (theMessage->eventID() == kOpStartEvent) {
-    myJustCreatedOrUpdated.clear();
-    myInitial.clear();
-    return; // we don't need the update only on operation start (caused problems in PartSet_Listener::processEvent)
+    // 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) {
-    if (myIsAutomatic == false) { // Apply button now works as "Rebuild"
-      isAutomaticChanged = true;
-      myIsAutomatic = true;
+    processOperation(true);
+    isOperationChanged = true;
+  }
+  if (isOperationChanged) {
+    // 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);
+      if (aFeature.get() && aFeature->isMacro()) {
+        aFeature->document()->removeFeature(aFeature);
+      }
     }
-    // the hardcode (DBC asked): hide the sketch referenced by extrusion on apply
-    if (theMessage->eventID() == kOpFinishEvent) {
-      std::set<std::shared_ptr<ModelAPI_Object> >::iterator aFIter;
-      for(aFIter = myJustCreatedOrUpdated.begin(); aFIter != myJustCreatedOrUpdated.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) {
-                static Events_ID HIDE_DISP = Events_Loop::loop()->eventByName(EVENT_OBJECT_TOHIDE);
-                ModelAPI_EventCreator::get()->sendUpdated(aSketchRes, HIDE_DISP);
-              }
-            }
+    myJustCreated.clear();
+    myJustUpdated.clear();
+  }
+}
+
+void Model_Update::processOperation(const bool theTotalUpdate)
+{
+  // 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) {
+            static Events_ID HIDE_DISP = Events_Loop::loop()->eventByName(EVENT_OBJECT_TOHIDE);
+            ModelAPI_EventCreator::get()->sendUpdated(aSketchRes, HIDE_DISP);
           }
         }
       }
     }
   }
+  // perform update of everything if needed
+  if (!myIsExecuted) {
+    myIsExecuted = true;
 
-  if (myIsExecuted)
-    return;  // nothing to do: it is executed now
+    bool isAutomaticChanged = false;
 
-  //Events_LongOp::start(this);
-  myIsExecuted = true;
-  // iterate all documents: features in Root first, then - subs
-  updateInDoc(ModelAPI_Session::get()->moduleDocument());
+    if (theTotalUpdate && !myIsAutomatic) { // Apply button now works as "Rebuild"
+      isAutomaticChanged = true;
+      myIsAutomatic = true;
+    }
 
-  myUpdated.clear();
-  // flush to update display
-  static Events_ID EVENT_DISP = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
-  aLoop->flush(EVENT_DISP);
-  //Events_LongOp::end(this);
-  if (isAutomaticChanged) myIsAutomatic = false;
+    updateInDoc(ModelAPI_Session::get()->moduleDocument());
 
-  if (theMessage->eventID() == kOpFinishEvent || theMessage->eventID() == kOpAbortEvent) {
-    myJustCreatedOrUpdated.clear();
-    myInitial.clear();
-  }
+    if (isAutomaticChanged) myIsAutomatic = false;
+    myIsExecuted = false;
 
-  myIsExecuted = false;
+    // 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);
+  }
 }
 
 void Model_Update::updateInDoc(std::shared_ptr<ModelAPI_Document> theDoc)
 {
+  std::set<FeaturePtr> alreadyProcessed; // features that are processed before others
   // all features one by one
-  int aNbFeatures = theDoc->size(ModelAPI_Feature::group(), true);
-  for (int aFIndex = 0; aFIndex < aNbFeatures; aFIndex++) {
+  for (int aFIndex = 0; aFIndex < theDoc->size(ModelAPI_Feature::group(), true); aFIndex++) {
     FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(
-        theDoc->object(ModelAPI_Feature::group(), aFIndex, true));
-    if (aFeature)
+      theDoc->object(ModelAPI_Feature::group(), aFIndex, true));
+    if (aFeature && alreadyProcessed.find(aFeature) == alreadyProcessed.end()) {
+      // update selection and parameters attributes first, before sub-features analysis (sketch plane)
+      updateArguments(aFeature);
+      // composite feature must be executed after sub-features execution
+      CompositeFeaturePtr aComposite = 
+        std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(aFeature);
+      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);
+        }
+      }
+
       updateFeature(aFeature);
-  }
-  // all sub-documents one by one
-  std::shared_ptr<Model_Document> aDoc = std::dynamic_pointer_cast<Model_Document>(theDoc);
-  if (aDoc) {
-    const std::set<std::string> aSubs = aDoc->subDocuments(true);
-    for(std::set<std::string>::iterator aSub = aSubs.begin(); aSub != aSubs.end(); aSub++) {
-      DocumentPtr aSubDoc = theDoc->subDocument(*aSub);
-      if (aSubDoc) {
-        updateInDoc(aSubDoc);
+      // update the document results recursively
+      const std::list<std::shared_ptr<ModelAPI_Result> >& aResults = aFeature->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()) {
+          updateInDoc(aPart->partDoc());
+        }
       }
     }
   }
@@ -184,7 +207,7 @@ void Model_Update::redisplayWithResults(FeaturePtr theFeature, const ModelAPI_Ex
   for (; aRIter != aResults.cend(); aRIter++) {
     std::shared_ptr<ModelAPI_Result> aRes = *aRIter;
     aRes->data()->execState(theState);
-    myUpdated[aRes] = true;
+    myJustUpdated.insert(aRes);
     ModelAPI_EventCreator::get()->sendUpdated(aRes, EVENT_DISP);
   }
   // to redisplay "presentable" feature (for ex. distance constraint)
@@ -206,50 +229,82 @@ ModelAPI_ExecState stateByReference(ObjectPtr theTarget, const ModelAPI_ExecStat
   return theCurrent;
 }
 
-bool Model_Update::updateFeature(FeaturePtr theFeature)
-{
-  // check it is already processed
-  if (myUpdated.find(theFeature) != myUpdated.end())
-    return myUpdated[theFeature];
-  // check all features this feature depended on (recursive call of updateFeature)
-  ModelAPI_ValidatorsFactory* aFactory = ModelAPI_Session::get()->validators();
-  bool aMustbeUpdated = myInitial.find(theFeature) != myInitial.end();
-  if (theFeature) {  // only real feature contains references to other objects
-    if (theFeature->data()->execState() != ModelAPI_StateDone)
-      aMustbeUpdated = true;
-
-    ModelAPI_ExecState aState = ModelAPI_StateDone;
+void Model_Update::updateArguments(FeaturePtr theFeature) {
+  static ModelAPI_ValidatorsFactory* aFactory = ModelAPI_Session::get()->validators();
 
-    // check the parameters: values can be changed
-    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()) {
-        double aNewVal;
-        if (ModelAPI_Tools::findVariable(aDouble->text(), aNewVal)) {
-          if (aNewVal != aDouble->value()) {
-            aDouble->setValue(aNewVal);
-            aMustbeUpdated = true;
-          }
-        } else {
-          aState = ModelAPI_StateInvalidArgument;
+  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()); 
+  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()) {
+      double aNewVal;
+      if (ModelAPI_Tools::findVariable(aDouble->text(), aNewVal)) {
+        if (aNewVal != aDouble->value()) {
+          aDouble->setValue(aNewVal);
+          aJustUpdated = true;
         }
+      } else {
+        aState = ModelAPI_StateInvalidArgument;
       }
     }
+  }
 
-    // composite feature must be executed after sub-features execution
-    CompositeFeaturePtr aComposite = 
-      std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(theFeature);
-    if (aComposite) {
-      // number of subs can be changed in execution: like fillet
-      for(int a = 0; a < aComposite->numberOfSubs(); a++) {
-        if (updateFeature(aComposite->subFeature(a)))
-          aMustbeUpdated = 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);
+      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) {
+          if (!aSelAttr->update()) {
+            if (!aFactory->isNotObligatory(
+                  theFeature->getKind(), theFeature->data()->id(aSel)) &&
+                aFactory->isCase(theFeature, theFeature->data()->id(aSel)))
+              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();
+  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;
@@ -260,83 +315,44 @@ bool Model_Update::updateFeature(FeaturePtr theFeature)
     for(; aRef != aRefs.end(); aRef++) {
       std::list<ObjectPtr>::iterator aRefObj = aRef->second.begin();
       for(; aRefObj != aRef->second.end(); aRefObj++) {
-        if (updateObject(*aRefObj)) {
-          aMustbeUpdated = true;
+        if (myJustCreated.find(*aRefObj) != myJustCreated.end() ||
+            myJustUpdated.find(*aRefObj) != myJustUpdated.end()) {
+          aJustUpdated = true;
         }
         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();
+      }
+    }
     //std::cout<<"Update feature "<<theFeature->getKind()<<" must be updated = "<<aMustbeUpdated<<std::endl;
     // execute feature if it must be updated
-    if (aMustbeUpdated) {
+    if (aJustUpdated) {
       if (std::dynamic_pointer_cast<Model_Document>(theFeature->document())->executeFeatures() ||
           !theFeature->isPersistentResult()) {
         if (aFactory->validate(theFeature)) {
           if (myIsAutomatic || 
-              (myJustCreatedOrUpdated.find(theFeature) != myJustCreatedOrUpdated.end()) ||
-              !theFeature->isPersistentResult() /* execute quick, not persistent results */) 
+              (myJustCreated.find(theFeature) != myJustCreated.end() ||
+              !theFeature->isPersistentResult() /* execute quick, not persistent results */))
           {
-            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)))
-                    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;
-                    }
-                  }
-                }
-              }
-              // for sketch after update of plane (by update of selection attribute)
-              // but before execute, all sub-elements also must be updated (due to the plane changes)
-              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);
-                  bool aWasModified = myUpdated[aSub];
-                  myUpdated.erase(myUpdated.find(aSub)); // erase to update for sure (plane may be changed)
-                  myInitial.insert(aSub);
-                  updateFeature(aSub);
-                  myUpdated[aSub] = aWasModified; // restore value
-                }
-                // re-execute after update: solver may update the previous values, so, shapes must be
-                // updated
-                for(int a = 0; a < aComposite->numberOfSubs(); a++) {
-                  if (aComposite->subFeature(a) && aFactory->validate(aComposite->subFeature(a)))
-                    aComposite->subFeature(a)->execute();
-                }
-              }
-            }
-
             // execute in try-catch to avoid internal problems of the feature
-            if (aState == ModelAPI_StateDone) {
+            if (aState == ModelAPI_StateDone || aState == ModelAPI_StateMustBeUpdated) {
               theFeature->data()->execState(ModelAPI_StateDone);
               try {
                 theFeature->execute();
                 if (theFeature->data()->execState() != ModelAPI_StateDone) {
                   aState = ModelAPI_StateExecFailed;
+                } else {
+                  aState = ModelAPI_StateDone;
                 }
               } catch(...) {
                 aState = ModelAPI_StateExecFailed;
@@ -364,48 +380,6 @@ bool Model_Update::updateFeature(FeaturePtr theFeature)
       } else { // for automatically updated features (on abort, etc) it is necessary to redisplay anyway
         redisplayWithResults(theFeature, ModelAPI_StateNothing);
       }
-    } else {
-      // returns also true is results were updated: for sketch that 
-      // refers to sub-features but results of sub-features were changed
-      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++) {
-        if (myInitial.find(*aRIter) != myInitial.end()) {
-          aMustbeUpdated = true;
-          break;
-        }
-      }
-    }
-  }
-  myUpdated[theFeature] = aMustbeUpdated;
-  return aMustbeUpdated;
-}
-
-bool Model_Update::updateObject(std::shared_ptr<ModelAPI_Object> theObject, const bool theCyclic)
-{
-  if (myUpdated.find(theObject) != myUpdated.end())
-    return myUpdated[theObject];  // already processed
-
-  /*
-  if (theCyclic) { // algorithm for update of all features by dependencies tree
-    if (!theObject)
-      return false;
-    FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(theObject);
-    if (aFeature) {  // for feature just call update Feature
-      return updateFeature(aFeature);
-    }
-    // check general object, possible just a result
-    if (myUpdated.find(theObject) != myUpdated.end())
-      return myUpdated[theObject];  // already processed
-    // check the feature of this object must be executed
-    ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theObject);
-    if (aResult) {
-      FeaturePtr aResFeature = aResult->document()->feature(aResult);
-      if (aResFeature) {
-        return updateFeature(aResFeature);
-      }
     }
   }
-  */
-  return myInitial.find(theObject) != myInitial.end();
 }
index 6e09dc7ad324f83d670c4315d0e6e55a036a65bb..89141313b1f36437c982cddac479bb4648d15fce 100644 (file)
@@ -23,18 +23,14 @@ class ModelAPI_Feature;
  */
 class Model_Update : public Events_Listener
 {
-  /// initial set of updated features that must be processed: caused by external changes, not
-  /// by sequence of update of this class
-  std::set<std::shared_ptr<ModelAPI_Object> > myInitial;
-  /// already updated and processed features and modificated feature flag
-  std::map<std::shared_ptr<ModelAPI_Object>, bool> myUpdated;
+  /// created features during this transaction: must be updated all the time
+  std::set<std::shared_ptr<ModelAPI_Object> > myJustCreated;
+  /// updated features during this transaction: must be updated in the end of transaction
+  std::set<std::shared_ptr<ModelAPI_Object> > myJustUpdated;
   /// to know that all next updates are caused by this execution
   bool myIsExecuted;
   /// to know execute or not automatically all update
   bool myIsAutomatic;
-  /// just created features: they must be updated immideately even in not-automatic mode for 
-  /// preview; cleared on commit operations
-  std::set<std::shared_ptr<ModelAPI_Object> > myJustCreatedOrUpdated;
 
  public:
   /// Is called only once, on startup of the application
@@ -48,14 +44,18 @@ protected:
   void updateInDoc(std::shared_ptr<ModelAPI_Document> theDoc);
   /// Recoursively checks and updates the feature if needed (calls the execute method)
   /// Returns true if feature was updated.
-  bool updateFeature(std::shared_ptr<ModelAPI_Feature> theFeature);
+  void updateFeature(std::shared_ptr<ModelAPI_Feature> theFeature);
+
+  /// Updates the selection and parametrical arguments before the later feature analysis
+  void updateArguments(std::shared_ptr<ModelAPI_Feature> theFeature);
 
-  /// Recoursively checks and updates the object (result or feature) if needed (calls updateFeature)
-  /// Returns true if object was updated.
-  bool updateObject(std::shared_ptr<ModelAPI_Object> theObject, const bool theCyclic = true);
   /// Sends the redisplay events for feature and results, updates the updated status
   void redisplayWithResults(std::shared_ptr<ModelAPI_Feature> theFeature, 
     const ModelAPI_ExecState theState);
+
+  /// On operation start/end/abort the "Just" fileds must be cleared and processed in the right way
+  /// \param theTotalUpdate force to updates everything that has been changed in this operation
+  void processOperation(const bool theTotalUpdate);
 };
 
 #endif
index ba5d1cd5ccd1d7ab26eb7c3e128aadea7e9bd7c3..5cad229fab9d0ca6f8603f9a1bb6aac653917185 100644 (file)
@@ -10,4 +10,3 @@ ModelAPI_CompositeFeature::~ModelAPI_CompositeFeature()
 {
 
 }
-
index d9533e83e33d17c570bcc013ab65332f3be084dd..8a5d93cbdc04eee1933bc77bb1c1be2ba9dfc6f6 100644 (file)
@@ -171,3 +171,9 @@ FeaturePtr ModelAPI_Feature::feature(ObjectPtr theObject)
   }
   return aFeature;
 }
+
+
+bool ModelAPI_Feature::isMacro() const
+{
+  return false;
+}
index 85ebe38b533d0c7ce3093fb575c3ebd67aa07b0b..88f8d72215deae1260ed188492e11af8adc745a9 100644 (file)
@@ -98,6 +98,10 @@ class ModelAPI_Feature : public ModelAPI_Object
     return false;
   }
 
+  /// Returns true if this feature is used as macro: creates other features and then removed.
+  /// \returns false by default
+  MODELAPI_EXPORT virtual bool isMacro() const;
+
   /// Must return document where the new feature must be added to
   /// By default it is empty: it is added to the document this method is called to
   MODELAPI_EXPORT virtual const std::string& documentToAdd();
index ecb7fbe79f5561f1bbd547a8367af46fbf44ac98..785fba6ab1848bc96a2d9fbec64a2aa4492345ba 100644 (file)
@@ -18,7 +18,7 @@ class Extrusion():
     else:
          self.my.data().boolean("reverse").setValue(False)
 
-    self.my.data().real("size").setValue(size)
+    self.my.data().real("to_size").setValue(size)
 
     if ModelAPI_Session.get().validators().validate(self.my):
       self.my.execute()
@@ -34,7 +34,7 @@ class Extrusion():
     else:
       self.my.data().boolean("reverse").setValue(False)
 
-    self.my.data().real("size").setValue(size)
+    self.my.data().real("to_size").setValue(size)
     self.my.execute()
 
   def result (self):
index 675b84c42087649765af1ead4b6a36b0fb32d2a6..d5d5e8e07c6efaa2bf603bb04e3a5cbf8e8b6adb 100644 (file)
@@ -82,8 +82,9 @@ class BoxFeature(modeler.Feature):
     self.base.setValue( self.length, length )
     self.box.setSize( height )
 
-    # Publishing the result
-    self.addResult( self.box.result() )
-
-       
-
+    # Publishing the result: not needed for Macro feature
+    #self.addResult( self.box.result() )
+  
+  def isMacro(self):
+    # Box feature is macro: removes itself on the creation transaction finish
+    return True
index 049d0e8c50abcf5da599fb5f91d7387cc9b07af7..2190a6e4b550bcda625e40fdcf071cd3251024cf 100644 (file)
 #include <ModelAPI_ResultConstruction.h>
 #include <ModelAPI_Validator.h>
 #include <ModelAPI_Session.h>
+#include <ModelAPI_Events.h>
 
 #include <SketchPlugin_Sketch.h>
 #include <SketchPlugin_Feature.h>
 #include <SketchPlugin_SketchEntity.h>
 
+#include <Events_Loop.h>
+
 #include <memory>
 
 #include <math.h>
@@ -243,6 +246,14 @@ void SketchPlugin_Sketch::attributeChanged(const std::string& theID) {
         std::shared_ptr<GeomAPI_Dir> aDir = aPlane->direction();
       }
     }
+  } else if (theID == SketchPlugin_Sketch::NORM_ID() || theID == SketchPlugin_Sketch::DIRX_ID()) {
+    // send all sub-elements are also updated: all entities become created on different plane
+    static Events_ID anUpdateEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
+    std::list<ObjectPtr> aSubs = data()->reflist(SketchPlugin_Sketch::FEATURES_ID())->list();
+    std::list<ObjectPtr>::iterator aSub = aSubs.begin();
+    for(; aSub != aSubs.end(); aSub++) {
+      ModelAPI_EventCreator::get()->sendUpdated(*aSub, anUpdateEvent);
+    }
   }
 }