X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Update.cpp;h=fe86d7a28adceca6f28310204c29155bbf6ce631;hb=853e0eec6016120b641efa6adf427a239cf203cf;hp=561882b7c28d3157111c3cff3df98d6bbb186620;hpb=0c0c2fd5b941ad2e65a0e82251dca2f796750b97;p=modules%2Fshaper.git diff --git a/src/Model/Model_Update.cpp b/src/Model/Model_Update.cpp index 561882b7c..fe86d7a28 100644 --- a/src/Model/Model_Update.cpp +++ b/src/Model/Model_Update.cpp @@ -57,10 +57,11 @@ Model_Update::Model_Update() Config_PropManager::registerProp("Model update", "automatic_rebuild", "Rebuild immediately", Config_Prop::Boolean, "false"); - myIsAutomatic = - Config_PropManager::findProp("Model update", "automatic_rebuild")->value() == "true"; + myIsAutomatic = true; + // Config_PropManager::findProp("Model update", "automatic_rebuild")->value() == "true"; myIsParamUpdated = false; myIsFinish = false; + myModification = 0; } void Model_Update::processEvent(const std::shared_ptr& theMessage) @@ -74,11 +75,14 @@ void Model_Update::processEvent(const std::shared_ptr& 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"); +#ifdef DEB_UPDATE + std::cout<<"****** Event "<eventID().eventText()<eventID() == kChangedEvent) { // automatic and manual rebuild flag is changed bool aPropVal = Config_PropManager::findProp("Model update", "automatic_rebuild")->value() == "true"; if (aPropVal != myIsAutomatic) { // something is changed - myIsAutomatic = aPropVal; + // myIsAutomatic = aPropVal; if (myIsAutomatic) // higher level of automatization => to rebuild processOperation(false); } @@ -98,15 +102,30 @@ void Model_Update::processEvent(const std::shared_ptr& 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); - #ifdef DEB_UPDATE - if ((*anObjIter)->data() && (*anObjIter)->data()->isValid()) { - std::cout<<"Add updated "<<(*anObjIter)->groupName()<<" " - <<(*anObjIter)->data()->name()<(*anObjIter); + if (std::dynamic_pointer_cast((*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(*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()<eventID() == kMovedEvent)) @@ -142,11 +161,59 @@ void Model_Update::processEvent(const std::shared_ptr& 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(); + myModification = 0; myWaitForFinish.clear(); } } +bool Model_Update::iterateUpdate(std::shared_ptr theFeature) +{ + myProcessIterator.push_back(IterationItem(theFeature)); + IterationItem& aCurrent = *myProcessIterator.rbegin(); + // 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 aResult; +} + +void Model_Update::iterateUpdateBreak(std::shared_ptr theFeature) +{ + // checking that this feature is before the current iterated one: otherwise break is not needed + std::list::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::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) { if (theFinish) { @@ -155,7 +222,8 @@ void Model_Update::processOperation(const bool theTotalUpdate, const bool theFin for(aFIter = myWaitForFinish.begin(); aFIter != myWaitForFinish.end(); aFIter++) { FeaturePtr aF = std::dynamic_pointer_cast(*aFIter); - if (aF && aF->data()->isValid() && aF->getKind() == "Extrusion") { + if (aF && aF->data()->isValid() && + (aF->getKind() == "Extrusion" || aF->getKind() == "Revolution")) { AttributeSelectionListPtr aBase = aF->selectionList("base"); if (aBase.get()) { for(int a = aBase->size() - 1; a >= 0; a--) { @@ -181,26 +249,12 @@ void Model_Update::processOperation(const bool theTotalUpdate, const bool theFin isAutomaticChanged = true; myIsAutomatic = true; } - - // iterate all features in the root document to update each - DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument(); - Model_Objects* anObjs = std::dynamic_pointer_cast(aRootDoc)->objects(); - if (!anObjs) return; - // two cycles: parameters are first to process - FeaturePtr aFeatureIter = anObjs->firstFeature(); - std::set 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); - } + // init iteration from the root document + iterateUpdate(CompositeFeaturePtr()); if (isAutomaticChanged) myIsAutomatic = false; myIsExecuted = false; + myModification++; // flush to update display static Events_Loop* aLoop = Events_Loop::loop(); @@ -212,14 +266,11 @@ void Model_Update::processOperation(const bool theTotalUpdate, const bool theFin } } -void Model_Update::updateFeature(FeaturePtr theFeature, std::set& theProcessed) +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 (theProcessed.find(theFeature) != theProcessed.end()) - return; - theProcessed.insert(theFeature); if (theFeature->isDisabled()) return; @@ -229,7 +280,9 @@ void Model_Update::updateFeature(FeaturePtr theFeature, std::set& th CompositeFeaturePtr aCompos = std::dynamic_pointer_cast(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() || myUpdated[theFeature] != myModification) + && !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); @@ -242,18 +295,13 @@ void Model_Update::updateFeature(FeaturePtr theFeature, std::set& th // 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); - } + 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 + + // 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: // composite feature status may depend on it's subelements @@ -263,7 +311,14 @@ void Model_Update::updateFeature(FeaturePtr theFeature, std::set& th 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 = myUpdated[theFeature] == myModification; + } + } if (myIsAutomatic && theFeature->data()->execState() == ModelAPI_StateMustBeUpdated) aJustUpdated = true; @@ -285,6 +340,10 @@ void Model_Update::updateFeature(FeaturePtr theFeature, std::set& th 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; } @@ -299,6 +358,9 @@ void Model_Update::updateFeature(FeaturePtr theFeature, std::set& th #endif executeFeature(theFeature); } else { + #ifdef DEB_UPDATE + std::cout<<"Feature is not valid, erase results "<name()<eraseResults(); redisplayWithResults(theFeature, ModelAPI_StateInvalidArgument); // result also must be updated } @@ -307,7 +369,7 @@ void Model_Update::updateFeature(FeaturePtr theFeature, std::set& th if (theFeature->data()->execState() == ModelAPI_StateMustBeUpdated) { theFeature->data()->execState(ModelAPI_StateDone); if (aJustUpdated) // store that it must be updated on finish - myJustUpdated.insert(theFeature); + myUpdated[theFeature] = myModification; } } } @@ -320,12 +382,32 @@ void Model_Update::redisplayWithResults(FeaturePtr theFeature, const ModelAPI_Ex std::list >::const_iterator aRIter = aResults.begin(); for (; aRIter != aResults.cend(); aRIter++) { std::shared_ptr aRes = *aRIter; - if (!aRes->isDisabled()) // update state only for enabled results (Placement Result Part may make the original Part Result as invalid) + 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 + myUpdated[aRes] = myModification; + } if (theFeature->data()->updateID() > aRes->data()->updateID()) { aRes->data()->setUpdateID(theFeature->data()->updateID()); } ModelAPI_EventCreator::get()->sendUpdated(aRes, EVENT_DISP); + // iterate sub-bodies of compsolid + ResultCompSolidPtr aComp = std::dynamic_pointer_cast(aRes); + if (aComp.get()) { + int aNumSub = aComp->numberOfSubs(); + for(int a = 0; a < aNumSub; a++) { + ResultPtr aSub = aComp->subResult(a); + if (!aSub->isDisabled()) {// update state only for enabled results (Placement Result Part may make the original Part Result as invalid) + aSub->data()->execState(theState); + if (theState == ModelAPI_StateDone) // feature become "done", so execution changed results + myUpdated[aSub] = myModification; + } + if (theFeature->data()->updateID() > aSub->data()->updateID()) { + aSub->data()->setUpdateID(theFeature->data()->updateID()); + } + ModelAPI_EventCreator::get()->sendUpdated(aSub, EVENT_DISP); + } + } } // to redisplay "presentable" feature (for ex. distance constraint) ModelAPI_EventCreator::get()->sendUpdated(theFeature, EVENT_DISP); @@ -347,6 +429,22 @@ ModelAPI_ExecState stateByReference(ObjectPtr theTarget, const ModelAPI_ExecStat return theCurrent; } +bool Model_Update::isOlder(std::shared_ptr theFeature, + std::shared_ptr theArgument) +{ + int aFeatureID = theFeature->data()->updateID(); + int anArgID = theArgument->data()->updateID(); + if (aFeatureID < anArgID) + return true; + std::map, int >::iterator anAIter = myUpdated.find(theArgument); + if (anAIter == myUpdated.end()) + return false; + std::map, 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 @@ -424,17 +522,21 @@ void Model_Update::updateArguments(FeaturePtr theFeature) { std::shared_ptr aSel = std::dynamic_pointer_cast(*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())) { + // update argument only if the referenced object is changed + if (aContext.get() && !aContext->isDisabled()) { + bool isObligatory = !aFactory->isNotObligatory( + theFeature->getKind(), theFeature->data()->id(aSel)) && + aFactory->isCase(theFeature, theFeature->data()->id(aSel)); + 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 - if (!aFactory->isNotObligatory(theFeature->getKind(), theFeature->data()->id(aSel)) && - aFactory->isCase(theFeature, theFeature->data()->id(aSel))) + if (isObligatory) aState = ModelAPI_StateInvalidArgument; } + } else if (aSel->isInvalid()) { // not needed to update, but invalid (stated previously) + aState = ModelAPI_StateInvalidArgument; + } } } aRefs = theFeature->data()->attributes(ModelAPI_AttributeSelectionList::typeId()); @@ -447,17 +549,20 @@ void Model_Update::updateArguments(FeaturePtr theFeature) { 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 (aContext.get() && !aContext->isDisabled()) { + bool isObligatory = !aFactory->isNotObligatory( + theFeature->getKind(), theFeature->data()->id(aSel)) && + aFactory->isCase(theFeature, theFeature->data()->id(aSel)); + if (isOlder(theFeature, aContext)) { if (aState == ModelAPI_StateDone) - aState = ModelAPI_StateMustBeUpdated; + aState = ModelAPI_StateMustBeUpdated; if (!aSelAttr->update()) { - if (!aFactory->isNotObligatory( - theFeature->getKind(), theFeature->data()->id(aSel)) && - aFactory->isCase(theFeature, theFeature->data()->id(aSel))) + if (isObligatory) aState = ModelAPI_StateInvalidArgument; } + } else if (aSelAttr->isInvalid()) { + aState = ModelAPI_StateInvalidArgument; + } } } } @@ -477,10 +582,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); } @@ -490,11 +594,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 @@ -502,12 +606,13 @@ void Model_Update::updateArguments(FeaturePtr theFeature) { std::list >::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(); } } @@ -523,7 +628,6 @@ 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 { @@ -541,3 +645,129 @@ void Model_Update::executeFeature(FeaturePtr theFeature) theFeature->data()->setUpdateID(ModelAPI_Session::get()->transactionID()); redisplayWithResults(theFeature, aState); } + +///////////////// Updated items iterator //////////////////////// +Model_Update::IterationItem::IterationItem(std::shared_ptr 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(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; +}