X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Update.cpp;h=2100f48b902b1210a53f7565de78ca08cac6a770;hb=fc72d43b677baa05ae7fd317346fd8b723b799ed;hp=8356838450635e191e224a07d91c3240c6535660;hpb=55ea7e9df2a91ecad9d843e93ea651dcce4aed43;p=modules%2Fshaper.git diff --git a/src/Model/Model_Update.cpp b/src/Model/Model_Update.cpp old mode 100755 new mode 100644 index 835683845..2100f48b9 --- a/src/Model/Model_Update.cpp +++ b/src/Model/Model_Update.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2023 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -12,17 +12,15 @@ // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include #include #include #include -#include #include #include #include @@ -53,6 +51,10 @@ Model_Update MY_UPDATER_INSTANCE; /// the only one instance initialized on load of the library //#define DEB_UPDATE +#ifdef DEB_UPDATE +#include +#endif + Model_Update::Model_Update() { Events_Loop* aLoop = Events_Loop::loop(); @@ -118,7 +120,7 @@ bool Model_Update::addModified(FeaturePtr theFeature, FeaturePtr theReason) { else if (myProcessOnFinish.find(theFeature) == myProcessOnFinish.end()) myProcessOnFinish[theFeature] = std::set >(); #ifdef DEB_UPDATE - std::cout<<"*** Add process on finish "<name()<name()< aRefSet; const std::set >& aRefs = theFeature->data()->refsToMe(); std::set >::const_iterator aRefIter = aRefs.cbegin(); for(; aRefIter != aRefs.cend(); aRefIter++) { if ((*aRefIter)->isArgument()) { FeaturePtr aReferenced = std::dynamic_pointer_cast((*aRefIter)->owner()); if (aReferenced.get()) { - addModified(aReferenced, theFeature); + aRefSet.insert(aReferenced); } } } @@ -203,32 +206,34 @@ bool Model_Update::addModified(FeaturePtr theFeature, FeaturePtr theReason) { ModelAPI_Tools::allResults(theFeature, allResults); std::list::iterator aRes = allResults.begin(); for(; aRes != allResults.end(); aRes++) { - const std::set >& aRefs = (*aRes)->data()->refsToMe(); - std::set >::const_iterator aRefIter = aRefs.cbegin(); - for(; aRefIter != aRefs.cend(); aRefIter++) { - if ((*aRefIter)->isArgument()) { - FeaturePtr aReferenced = std::dynamic_pointer_cast((*aRefIter)->owner()); + const std::set >& aResRefs = (*aRes)->data()->refsToMe(); + std::set >::const_iterator aRIter = aResRefs.cbegin(); + for(; aRIter != aResRefs.cend(); aRIter++) { + if ((*aRIter)->isArgument()) { + FeaturePtr aReferenced = std::dynamic_pointer_cast((*aRIter)->owner()); if (aReferenced.get()) { - addModified(aReferenced, theFeature); + aRefSet.insert(aReferenced); } } } } - // also add part feature that contains this feature to the modified if (theFeature->document()->kind() != "PartSet") { FeaturePtr aPart = ModelAPI_Tools::findPartFeature( ModelAPI_Session::get()->moduleDocument(), theFeature->document()); if (aPart.get()) - addModified(aPart, theFeature); + aRefSet.insert(aPart); } + for(std::set::iterator aRef = aRefSet.begin(); aRef != aRefSet.end(); aRef++) + addModified(*aRef, theFeature); + return true; } void Model_Update::processEvent(const std::shared_ptr& theMessage) { static Events_Loop* aLoop = Events_Loop::loop(); - static ModelAPI_ValidatorsFactory* aFactory = ModelAPI_Session::get()->validators(); + //static ModelAPI_ValidatorsFactory* aFactory = ModelAPI_Session::get()->validators(); static const Events_ID kCreatedEvent = aLoop->eventByName(EVENT_OBJECT_CREATED); static const Events_ID kUpdatedEvent = aLoop->eventByName(EVENT_OBJECT_UPDATED); static const Events_ID kOpFinishEvent = aLoop->eventByName("FinishOperation"); @@ -266,7 +271,7 @@ void Model_Update::processEvent(const std::shared_ptr& theMessag } } processFeatures(); - myIsPreviewBlocked = myIsPreviewBlocked; + myIsPreviewBlocked = aPreviewBlockedState; } } @@ -301,16 +306,23 @@ void Model_Update::processEvent(const std::shared_ptr& theMessag std::dynamic_pointer_cast(theMessage); const std::set& anObjs = aMsg->objects(); std::set::const_iterator anObjIter = anObjs.cbegin(); + std::list aFeatures, aResults; for(; anObjIter != anObjs.cend(); anObjIter++) { if (std::dynamic_pointer_cast((*anObjIter)->document())->executeFeatures()) { if ((*anObjIter)->groupName() == ModelAPI_Feature::group()) { // results creation means enabling, not update - ModelAPI_EventCreator::get()->sendUpdated(*anObjIter, kUpdatedEvent); + aFeatures.push_back(*anObjIter); } else { - ModelAPI_EventCreator::get()->sendUpdated(*anObjIter, kRedisplayEvent); + aResults.push_back(*anObjIter); + ResultPartPtr aPart = std::dynamic_pointer_cast(*anObjIter); + if (aPart.get() && aPart->data().get() && aPart->data()->isValid()) { + aPart->shape(); // to update the shape on creation of the result + } } } } + ModelAPI_EventCreator::get()->sendUpdated(aFeatures, kUpdatedEvent); + ModelAPI_EventCreator::get()->sendUpdated(aResults, kRedisplayEvent); return; } if (theMessage->eventID() == kUpdatedEvent) { @@ -323,8 +335,8 @@ void Model_Update::processEvent(const std::shared_ptr& theMessag if (!(*anObjIter)->data()->isValid()) continue; #ifdef DEB_UPDATE - std::cout<<">>> in event updated "<<(*anObjIter)->groupName()<< - " "<<(*anObjIter)->data()->name()<>> in event updated "<groupName()) + <data()->name()<groupName() == ModelAPI_ResultParameter::group()) { myIsParamUpdated = true; @@ -334,18 +346,6 @@ void Model_Update::processEvent(const std::shared_ptr& theMessag if (anUpdated.get()) { if (addModified(anUpdated, FeaturePtr())) aSomeModified = true; - if (myUpdateBlocked) { // execute this feature anyway to show the current result - /*if (!anUpdated->isStable() && anUpdated->results().size() && ( - anUpdated->firstResult()->groupName() == ModelAPI_ResultBody::group() || - anUpdated->firstResult()->groupName() == ModelAPI_ResultPart::group())) { - if (aFactory->validate(anUpdated)) { - executeFeature(anUpdated); - redisplayWithResults(anUpdated, ModelAPI_StateNothing, false); - static Events_ID EVENT_DISP = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY); - aLoop->flush(EVENT_DISP); - } - }*/ - } } else { // process the updated result as update of features that refers to this result const std::set >& @@ -358,7 +358,7 @@ void Model_Update::processEvent(const std::shared_ptr& theMessag for(; aRefIter != aRefs.cend(); aRefIter++) { if (!(*aRefIter)->owner()->data()->isValid()) continue; - FeaturePtr anUpdated = std::dynamic_pointer_cast((*aRefIter)->owner()); + anUpdated = std::dynamic_pointer_cast((*aRefIter)->owner()); if (anUpdated.get()) { if (addModified(anUpdated, aReason)) aSomeModified = true; @@ -439,7 +439,7 @@ void Model_Update::processEvent(const std::shared_ptr& theMessag Events_Loop::loop()->flush(kRedisplayEvent); // in the end of transaction everything is updated, so clear the old objects - myIsParamUpdated = false; + //myIsParamUpdated = false; // to avoid problems in sprocket.py parameter update myWaitForFinish.clear(); } else if (theMessage->eventID() == kReorderEvent) { std::shared_ptr aMsg = @@ -533,9 +533,21 @@ bool Model_Update::processFeature(FeaturePtr theFeature) return false; } + // check this feature is not yet checked or processed + bool aIsModified = myModified.find(theFeature) != myModified.end(); + if (!aIsModified && myIsFinish) { // get info about the modification for features without preview + if (theFeature->data()->execState() == ModelAPI_StateMustBeUpdated) { + aIsModified = true; + std::set > aNewSet; + // contains itself, so, we don't know which was the reason and the reason is any + aNewSet.insert(theFeature); + myModified[theFeature] = aNewSet; + } + } + if (myProcessed.find(theFeature) == myProcessed.end()) { myProcessed[theFeature] = 0; - } else { + } else if (aIsModified) { int aCount = myProcessed[theFeature]; if (aCount > 100) { // too many repetition of processing (in VS it may crash on 330 with stack overflow) @@ -548,27 +560,15 @@ bool Model_Update::processFeature(FeaturePtr theFeature) myProcessed[theFeature] = aCount + 1; } - // check this feature is not yet checked or processed - bool aIsModified = myModified.find(theFeature) != myModified.end(); - if (!aIsModified && myIsFinish) { // get info about the modification for features without preview - if (theFeature->data()->execState() == ModelAPI_StateMustBeUpdated) { - aIsModified = true; - std::set > aNewSet; - // contains itself, so, we don't know which was the reason and the reason is any - aNewSet.insert(theFeature); - myModified[theFeature] = aNewSet; - } - } - #ifdef DEB_UPDATE - std::cout<<"* Process feature "<name()<name()<getKind() == "Sketch") { #ifdef DEB_UPDATE - std::cout << "****** Update sketch args " << theFeature->name() << std::endl; + std::wcout << L"****** Update sketch args " << theFeature->name() << std::endl; #endif AttributeSelectionPtr anExtSel = theFeature->selection("External"); if (anExtSel.get()) { @@ -645,7 +645,12 @@ bool Model_Update::processFeature(FeaturePtr theFeature) } // searching for the next not used reason aProcessedReasons.insert(aReason); - aReasons.erase(aReason); + // check theFeature is still in the list of modified, because it may be removed sometimes + // while updating SketchPlugin_Ellipse + if (myModified.find(theFeature) != myModified.end()) + aReasons.erase(aReason); + else + break; } // restore the modified reasons: they will be used in the update of arguments if (allSubsUsed) { // restore theFeature in this set @@ -682,7 +687,7 @@ bool Model_Update::processFeature(FeaturePtr theFeature) } #ifdef DEB_UPDATE - std::cout<<"Update args "<name()<name()<data()->isValid()) @@ -705,7 +710,7 @@ bool Model_Update::processFeature(FeaturePtr theFeature) // don't disable Part because it will make disabled all the features // (performance and problems with the current feature) #ifdef DEB_UPDATE - std::cout<<"Invalid args "<name()<name()<eraseResults(false); redisplayWithResults(theFeature, ModelAPI_StateInvalidArgument); // result also must be updated @@ -718,12 +723,11 @@ bool Model_Update::processFeature(FeaturePtr theFeature) if (!isPostponedMain) { bool aDoExecute = true; if (myUpdateBlocked) { - if (!theFeature->isStable()) { + if (!theFeature->isStable() || (theFeature->getKind().size() > 6 && + theFeature->getKind().substr(0, 6) == "Sketch")) { // automatic update sketch elements aDoExecute = true; - } else if (theFeature->results().size()) { // execute only not-results features - aDoExecute = !(theFeature->firstResult()->groupName() == ModelAPI_ResultBody::group() || - theFeature->firstResult()->groupName() == ModelAPI_ResultPart::group() || - theFeature->getKind() == "Sketch"); + } else if (theFeature->results().size()) { // execute only not persistent results features + aDoExecute = !theFeature->isPersistentResult(); } else { aDoExecute = aState != ModelAPI_StateInvalidArgument; } @@ -737,7 +741,7 @@ bool Model_Update::processFeature(FeaturePtr theFeature) } } else { #ifdef DEB_UPDATE - std::cout<<"Feature is not valid, erase results "<name()<name()<eraseResults(false); redisplayWithResults(theFeature, ModelAPI_StateInvalidArgument); // result also must be updated @@ -890,7 +894,9 @@ void Model_Update::updateArguments(FeaturePtr theFeature) { bool isObligatory = !aFactory->isNotObligatory( theFeature->getKind(), theFeature->data()->id(aSel)) && aFactory->isCase(theFeature, theFeature->data()->id(aSel)); - if (isObligatory) + if (isObligatory || + // #24260 : sketch plane was selected, but selection becomes wrong, make it invalid + (theFeature->getKind() == "Sketch" && aSel->id() == "External")) aState = ModelAPI_StateInvalidArgument; } } @@ -899,6 +905,12 @@ void Model_Update::updateArguments(FeaturePtr theFeature) { bool isObligatory = aFactory->isCase(theFeature, theFeature->data()->id(aSel)); if (isObligatory) aState = ModelAPI_StateInvalidArgument; + } else if (aSel->isInitialized()) { + // #19703 : if sketch plane was selected, but after context disappears, it must become invalid + aSel->update(); + if (aSel->isInvalid()) { + aState = ModelAPI_StateInvalidArgument; + } } } // update the selection list attributes if any @@ -906,14 +918,19 @@ void Model_Update::updateArguments(FeaturePtr theFeature) { for (aRefsIter = aRefs.begin(); aRefsIter != aRefs.end(); aRefsIter++) { std::shared_ptr aSel = std::dynamic_pointer_cast(*aRefsIter); + // #19071 : avoid sending of update event in cycle + bool aWasBlocked = theFeature->data()->blockSendAttributeUpdated(true); + // list to keep the shared pointers while update is blocked (in messages raw poiters are used) + std::list anAttrList; for(int a = aSel->size() - 1; a >= 0; a--) { std::shared_ptr aSelAttr = std::dynamic_pointer_cast(aSel->value(a)); if (aSelAttr) { ObjectPtr aContext = aSelAttr->context(); // update argument only if the referenced object is ready to use - if (aContext.get() && !aContext->isDisabled() && !aSelAttr->isInvalid()) { + if (aContext.get() && !aContext->isDisabled()) { if (isReason(theFeature, aContext)) { + anAttrList.push_back(aSelAttr); if (!aSelAttr->update()) { bool isObligatory = !aFactory->isNotObligatory( theFeature->getKind(), theFeature->data()->id(aSel)) && @@ -922,7 +939,7 @@ void Model_Update::updateArguments(FeaturePtr theFeature) { aState = ModelAPI_StateInvalidArgument; } } - } else if (aContext.get() || aSelAttr->isInvalid()) { + } else if (aContext.get()) { // 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) @@ -930,6 +947,8 @@ void Model_Update::updateArguments(FeaturePtr theFeature) { } } } + if (!aWasBlocked) + theFeature->data()->blockSendAttributeUpdated(false); } if (aState != ModelAPI_StateDone) @@ -974,7 +993,7 @@ bool Model_Update::isReason(std::shared_ptr& theFeature, void Model_Update::executeFeature(FeaturePtr theFeature) { #ifdef DEB_UPDATE - std::cout<<"Execute Feature "<name()<name()<data()->attributes(ModelAPI_AttributeSelection::typeId()); std::list::iterator aRefsIter = aRefs.begin(); for (; aRefsIter != aRefs.end(); aRefsIter++) { - std::shared_ptr aSel = - std::dynamic_pointer_cast(*aRefsIter); + AttributeSelectionPtr aSel = + std::dynamic_pointer_cast(*aRefsIter); bool aRemove = false; aSel->updateInHistory(aRemove); } @@ -1076,12 +1095,12 @@ void Model_Update::updateSelection(const std::set aSel = std::dynamic_pointer_cast(*aRefsIter); for(int a = aSel->size() - 1; a >= 0; a--) { - std::shared_ptr aSelAttr = - std::dynamic_pointer_cast(aSel->value(a)); + AttributeSelectionPtr aSelAttr = + std::dynamic_pointer_cast(aSel->value(a)); if (aSelAttr.get()) { - bool theRemove = false; - aSelAttr->updateInHistory(theRemove); - if (theRemove) { + bool aRemove = false; + aSelAttr->updateInHistory(aRemove); + if (aRemove) { aRemoveSet.insert(a); } }