-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File: Model_Update.cxx
-// Created: 25 Jun 2014
-// Author: Mikhail PONIKAROV
+// Copyright (C) 2014-2017 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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// 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
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
#include <Model_Update.h>
#include <Model_Document.h>
#include <Model_Data.h>
#include <Model_Objects.h>
+#include <Model_AttributeSelection.h>
#include <ModelAPI_Feature.h>
#include <ModelAPI_Data.h>
#include <ModelAPI_Document.h>
#include <ModelAPI_CompositeFeature.h>
#include <ModelAPI_Session.h>
#include <ModelAPI_Tools.h>
+#include <GeomAPI_Shape.h>
#include <GeomDataAPI_Point.h>
#include <GeomDataAPI_Point2D.h>
#include <Events_Loop.h>
#include <Events_LongOp.h>
-#include <Events_Error.h>
+#include <Events_InfoMessage.h>
#include <Config_PropManager.h>
-using namespace std;
-
Model_Update MY_UPDATER_INSTANCE; /// the only one instance initialized on load of the library
//#define DEB_UPDATE
aLoop->registerListener(this, kOpStartEvent);
static const Events_ID kStabilityEvent = aLoop->eventByName(EVENT_STABILITY_CHANGED);
aLoop->registerListener(this, kStabilityEvent);
+ static const Events_ID kPreviewBlockedEvent = aLoop->eventByName(EVENT_PREVIEW_BLOCKED);
+ aLoop->registerListener(this, kPreviewBlockedEvent);
+ static const Events_ID kPreviewRequestedEvent = aLoop->eventByName(EVENT_PREVIEW_REQUESTED);
+ aLoop->registerListener(this, kPreviewRequestedEvent);
+ static const Events_ID kReorderEvent = aLoop->eventByName(EVENT_ORDER_UPDATED);
+ aLoop->registerListener(this, kReorderEvent);
+ static const Events_ID kUpdatedSel = aLoop->eventByName(EVENT_UPDATE_SELECTION);
+ aLoop->registerListener(this, kUpdatedSel);
// Config_PropManager::findProp("Model update", "automatic_rebuild")->value() == "true";
myIsParamUpdated = false;
myIsFinish = false;
myIsProcessed = false;
+ myIsPreviewBlocked = false;
}
bool Model_Update::addModified(FeaturePtr theFeature, FeaturePtr theReason) {
if (!theFeature->data()->isValid())
return false; // delete an extrusion created on the sketch
- if (theFeature->isPersistentResult()) {
- if (!std::dynamic_pointer_cast<Model_Document>((theFeature)->document())->executeFeatures())
+ bool isNotExecuted = theFeature->isPersistentResult() &&
+ !std::dynamic_pointer_cast<Model_Document>((theFeature)->document())->executeFeatures();
+ if (isNotExecuted) {
+ if (!theReason.get()) // no reason => no construction reason
return false;
+ if (myNotPersistentRefs.find(theFeature) == myNotPersistentRefs.end()) {
+ myNotPersistentRefs[theFeature].insert(theReason);
+ } else {
+ std::set<std::shared_ptr<ModelAPI_Feature> > aNewSet;
+ aNewSet.insert(theReason);
+ myNotPersistentRefs[theFeature] = aNewSet;
+ }
+ return false;
}
- if (!theFeature->isPreviewNeeded() && !myIsFinish) {
+ // update arguments for "apply button" state change
+ if ((!theFeature->isPreviewNeeded() && !myIsFinish) || myIsPreviewBlocked) {
myProcessOnFinish.insert(theFeature);
#ifdef DEB_UPDATE
std::cout<<"*** Add process on finish "<<theFeature->name()<<std::endl;
#endif
- updateArguments(theFeature);
- if (theFeature->data()->execState() == ModelAPI_StateMustBeUpdated) {
- theFeature->data()->execState(ModelAPI_StateDone);
- static ModelAPI_ValidatorsFactory* aFactory = ModelAPI_Session::get()->validators();
- aFactory->validate(theFeature); // need to be validated to update the "Apply" state if not previewed
+ // keeps the currently updated features to avoid infinitive cycling here: where feature on
+ // "updateArguments" sends "updated" (in selection attribute) and goes here again
+ static std::set<FeaturePtr> aCurrentlyUpdated;
+ if (aCurrentlyUpdated.find(theFeature) == aCurrentlyUpdated.end()) {
+ aCurrentlyUpdated.insert(theFeature);
+ updateArguments(theFeature);
+ aCurrentlyUpdated.erase(theFeature);
}
- return true;
+ // make it without conditions otherwise the apply button may have a bad state
+ theFeature->data()->execState(ModelAPI_StateDone);
+ static ModelAPI_ValidatorsFactory* aFactory = ModelAPI_Session::get()->validators();
+ // need to be validated to update the "Apply" state if not previewed
+ aFactory->validate(theFeature);
+
+ // to redisplay split's arguments presentation, even result is not computed
+ if (!theFeature->isPreviewNeeded()) {
+ static Events_Loop* aLoop = Events_Loop::loop();
+ static const Events_ID kRedisplayEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+ ModelAPI_EventCreator::get()->sendUpdated(theFeature, kRedisplayEvent);
+ aLoop->flush(kRedisplayEvent);
+ }
+
+ if (!myIsPreviewBlocked)
+ return true;
}
if (myModified.find(theFeature) != myModified.end()) {
if (theReason.get()) {
#ifdef DEB_UPDATE
- std::cout<<"*** Add already modified "<<theFeature->name()<<std::endl;
+ //std::cout<<"*** Add already modified "
+ // <<theFeature->name()<<" reason "<<theReason->name()<<std::endl;
#endif
myModified[theFeature].insert(theReason);
}
bool aIsDisabled = theFeature->isDisabled();
if (!aIsDisabled) {
std::set<std::shared_ptr<ModelAPI_Feature> > aNewSet;
- if (theFeature->data()->execState() == ModelAPI_StateMustBeUpdated) {
+ if (theFeature->data()->execState() == ModelAPI_StateMustBeUpdated ||
+ theFeature->data()->execState() == ModelAPI_StateInvalidArgument || // issue 1519
+ theFeature->data()->execState() == ModelAPI_StateExecFailed) {
// do not forget that in this case all were the reasons
aNewSet.insert(theFeature);
} else {
if (theReason.get())
aNewSet.insert(theReason);
}
- myModified[theFeature] = aNewSet;
+ myModified[theFeature] = aNewSet;
#ifdef DEB_UPDATE
- std::cout<<"*** Add modified "<<theFeature->name()<<std::endl;
+ if (theReason.get()) {
+ //std::cout<<"*** Add modified "<<theFeature->name()
+ // <<" reason "<<theReason->name()<<std::endl;
+ } else {
+ //std::cout<<"*** Add modified "<<theFeature->name()<<std::endl;
+ }
#endif
} else { // will be updated during the finish of the operation, or when it becomes enabled
- if (theFeature->data()->execState() == ModelAPI_StateDone)
+ if (theFeature->data()->execState() == ModelAPI_StateDone ||
+ theFeature->data()->execState() == ModelAPI_StateExecFailed) // fix issue 1819
theFeature->data()->execState(ModelAPI_StateMustBeUpdated);
- else
+ else
return true; // do not need iteration deeply if it is already marked as modified or so
#ifdef DEB_UPDATE
- std::cout<<"*** Set modified state "<<theFeature->name()<<std::endl;
+ //std::cout<<"*** Set modified state "<<theFeature->name()<<std::endl;
#endif
}
// clear processed and fill modified recursively
const std::set<std::shared_ptr<ModelAPI_Attribute> >& aRefs = theFeature->data()->refsToMe();
std::set<std::shared_ptr<ModelAPI_Attribute> >::const_iterator aRefIter = aRefs.cbegin();
for(; aRefIter != aRefs.cend(); aRefIter++) {
- FeaturePtr aReferenced = std::dynamic_pointer_cast<ModelAPI_Feature>((*aRefIter)->owner());
- if (aReferenced.get()) {
- addModified(aReferenced, theFeature);
+ if ((*aRefIter)->isArgument()) {
+ FeaturePtr aReferenced = std::dynamic_pointer_cast<ModelAPI_Feature>((*aRefIter)->owner());
+ if (aReferenced.get()) {
+ addModified(aReferenced, theFeature);
+ }
}
}
// proccess also results
const std::set<std::shared_ptr<ModelAPI_Attribute> >& aRefs = (*aRes)->data()->refsToMe();
std::set<std::shared_ptr<ModelAPI_Attribute> >::const_iterator aRefIter = aRefs.cbegin();
for(; aRefIter != aRefs.cend(); aRefIter++) {
- FeaturePtr aReferenced = std::dynamic_pointer_cast<ModelAPI_Feature>((*aRefIter)->owner());
- if (aReferenced.get()) {
- addModified(aReferenced, theFeature);
+ if ((*aRefIter)->isArgument()) {
+ FeaturePtr aReferenced = std::dynamic_pointer_cast<ModelAPI_Feature>((*aRefIter)->owner());
+ if (aReferenced.get()) {
+ addModified(aReferenced, theFeature);
+ }
}
}
}
static const Events_ID kOpAbortEvent = aLoop->eventByName("AbortOperation");
static const Events_ID kOpStartEvent = aLoop->eventByName("StartOperation");
static const Events_ID kStabilityEvent = aLoop->eventByName(EVENT_STABILITY_CHANGED);
+ static const Events_ID kPreviewBlockedEvent = aLoop->eventByName(EVENT_PREVIEW_BLOCKED);
+ static const Events_ID kPreviewRequestedEvent = aLoop->eventByName(EVENT_PREVIEW_REQUESTED);
+ static const Events_ID kReorderEvent = aLoop->eventByName(EVENT_ORDER_UPDATED);
+ static const Events_ID kRedisplayEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+ static const Events_ID kUpdatedSel = aLoop->eventByName(EVENT_UPDATE_SELECTION);
+
#ifdef DEB_UPDATE
std::cout<<"****** Event "<<theMessage->eventID().eventText()<<std::endl;
#endif
updateStability(theMessage->sender());
return;
}
- // creation is added to "update" to avoid recomputation twice: on create and immediately after on update
+ if (theMessage->eventID() == kPreviewBlockedEvent) {
+ myIsPreviewBlocked = true;
+ return;
+ }
+ if (theMessage->eventID() == kPreviewRequestedEvent) {
+ if (myIsPreviewBlocked) {
+ myIsPreviewBlocked = false;
+ processFeatures();
+ myIsPreviewBlocked = true;
+ }
+ return;
+ }
+ if (theMessage->eventID() == kUpdatedSel) {
+ std::shared_ptr<ModelAPI_ObjectUpdatedMessage> aMsg =
+ std::dynamic_pointer_cast<ModelAPI_ObjectUpdatedMessage>(theMessage);
+ updateSelection(aMsg->objects());
+ }
+ // creation is added to "update" to avoid recomputation twice:
+ // on create and immediately after on update
if (theMessage->eventID() == kCreatedEvent) {
std::shared_ptr<ModelAPI_ObjectUpdatedMessage> aMsg =
std::dynamic_pointer_cast<ModelAPI_ObjectUpdatedMessage>(theMessage);
const std::set<ObjectPtr>& anObjs = aMsg->objects();
std::set<ObjectPtr>::const_iterator anObjIter = anObjs.cbegin();
for(; anObjIter != anObjs.cend(); anObjIter++) {
- if (std::dynamic_pointer_cast<Model_Document>((*anObjIter)->document())->executeFeatures())
- ModelAPI_EventCreator::get()->sendUpdated(*anObjIter, kUpdatedEvent);
+ if (std::dynamic_pointer_cast<Model_Document>((*anObjIter)->document())->executeFeatures()) {
+ if ((*anObjIter)->groupName() == ModelAPI_Feature::group()) {
+ // results creation means enabling, not update
+ ModelAPI_EventCreator::get()->sendUpdated(*anObjIter, kUpdatedEvent);
+ } else {
+ ModelAPI_EventCreator::get()->sendUpdated(*anObjIter, kRedisplayEvent);
+ }
+ }
}
return;
}
if (!(*anObjIter)->data()->isValid())
continue;
#ifdef DEB_UPDATE
- std::cout<<">>> in event updated "<<(*anObjIter)->data()->name()<<std::endl;
+ std::cout<<">>> in event updated "<<(*anObjIter)->groupName()<<
+ " "<<(*anObjIter)->data()->name()<<std::endl;
#endif
if ((*anObjIter)->groupName() == ModelAPI_ResultParameter::group()) {
myIsParamUpdated = true;
if (anUpdated.get()) {
if (addModified(anUpdated, FeaturePtr()))
aSomeModified = true;
- } else { // process the updated result as update of features that refers to this result
- const std::set<std::shared_ptr<ModelAPI_Attribute> >& aRefs = (*anObjIter)->data()->refsToMe();
+ } else {
+ // process the updated result as update of features that refers to this result
+ const std::set<std::shared_ptr<ModelAPI_Attribute> >&
+ aRefs = (*anObjIter)->data()->refsToMe();
std::set<std::shared_ptr<ModelAPI_Attribute> >::const_iterator aRefIter = aRefs.cbegin();
for(; aRefIter != aRefs.cend(); aRefIter++) {
if (!(*aRefIter)->owner()->data()->isValid())
}
} else if (theMessage->eventID() == kOpFinishEvent || theMessage->eventID() == kOpAbortEvent ||
theMessage->eventID() == kOpStartEvent) {
+ myIsPreviewBlocked = false;
if (theMessage->eventID() == kOpFinishEvent) {
myIsFinish = true;
addModified(*aFeature, FeaturePtr());
myIsFinish = false;
}
- myProcessOnFinish.clear(); // processed features must be only on finish, so clear anyway (to avoid reimport on load)
+ // processed features must be only on finish, so clear anyway (to avoid reimport on load)
+ myProcessOnFinish.clear();
+
+ // #2156: current must be sketch, left after the macro execution
+ DocumentPtr anActiveDoc = ModelAPI_Session::get()->activeDocument();
+ FeaturePtr aCurrent;
+ if (anActiveDoc.get())
+ aCurrent = anActiveDoc->currentFeature(false);
if (!(theMessage->eventID() == kOpStartEvent)) {
- processFeatures();
+ processFeatures(false);
}
+
+ if (anActiveDoc.get() && aCurrent.get() && aCurrent->data()->isValid()) {
+ if (anActiveDoc->currentFeature(false) != aCurrent)
+ anActiveDoc->setCurrentFeature(aCurrent, false); // #2156 make the current feature back
+ }
+
+
// remove all macros before clearing all created
std::set<FeaturePtr>::iterator anUpdatedIter = myWaitForFinish.begin();
while(anUpdatedIter != myWaitForFinish.end()) {
anUpdatedIter++;
}
}
+ // the redisplay signal should be flushed in order
+ // to erase the feature presentation in the viewer
+ // if should be done after removeFeature() of document,
+ // by this reason, upper processFeatures() do not perform this flush
+ Events_Loop::loop()->flush(kRedisplayEvent);
+
// in the end of transaction everything is updated, so clear the old objects
myIsParamUpdated = false;
myWaitForFinish.clear();
+ } else if (theMessage->eventID() == kReorderEvent) {
+ std::shared_ptr<ModelAPI_OrderUpdatedMessage> aMsg =
+ std::dynamic_pointer_cast<ModelAPI_OrderUpdatedMessage>(theMessage);
+ if (aMsg->reordered().get())
+ addModified(aMsg->reordered(), aMsg->reordered()); // to update all attributes
}
}
-void Model_Update::processFeatures()
+void Model_Update::processFeatures(const bool theFlushRedisplay)
{
- if (!myIsProcessed) { // perform update of everything if it is not performed right now
+ // perform update of everything if it is not performed right now or any preview is blocked
+ if (!myIsProcessed && !myIsPreviewBlocked) {
myIsProcessed = true;
#ifdef DEB_UPDATE
std::cout<<"****** Start processing"<<std::endl;
}
myIsProcessed = false;
- // flush updates just before "myModification" increment: to distinguish
- // updates by "execute" produced by this updater and other updates, coming outside,
- // which are really important for "processEvent" of this updater
+ // to update the object browser if something is updated/created during executions
static Events_Loop* aLoop = Events_Loop::loop();
+ static const Events_ID kCreatedEvent= aLoop->eventByName(EVENT_OBJECT_CREATED);
+ aLoop->flush(kCreatedEvent);
static const Events_ID kUpdatedEvent = aLoop->eventByName(EVENT_OBJECT_UPDATED);
aLoop->flush(kUpdatedEvent);
// flush to update display
- static Events_ID EVENT_DISP = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
- aLoop->flush(EVENT_DISP);
+ if (theFlushRedisplay) {
+ 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
+ myProcessed.clear();
+ }
+}
+
+// collects all the feautres this feature depends on: reasons
+static void allReasons(FeaturePtr theFeature, std::set<FeaturePtr>& theReasons) {
+ std::list<std::pair<std::string, std::list<std::shared_ptr<ModelAPI_Object> > > > aDeps;
+ theFeature->data()->referencesToObjects(aDeps);
+ std::list<std::pair<std::string, std::list<std::shared_ptr<ModelAPI_Object> > > >::iterator
+ anAttrsIter = aDeps.begin();
+ for(; anAttrsIter != aDeps.end(); anAttrsIter++) {
+ if (theFeature->attribute(anAttrsIter->first)->isArgument()) {
+ std::list<std::shared_ptr<ModelAPI_Object> >::iterator aDepIter = anAttrsIter->second.begin();
+ for(; aDepIter != anAttrsIter->second.end(); aDepIter++) {
+ FeaturePtr aDepFeat = std::dynamic_pointer_cast<ModelAPI_Feature>(*aDepIter);
+ if (!aDepFeat.get()) { // so, it depends on the result and process the feature owner of it
+ ResultPtr aDepRes = std::dynamic_pointer_cast<ModelAPI_Result>(*aDepIter);
+ if (aDepRes.get()) {
+ aDepFeat = (*aDepIter)->document()->feature(aDepRes);
+ }
+ }
+ if (aDepFeat.get() && aDepFeat->data()->isValid()) {
+ theReasons.insert(aDepFeat);
+ }
+ }
+ }
+ }
+ if (theFeature->getKind() == "Part") {
+ // part is not depended on its subs directly, but subs must be iterated anyway
+ CompositeFeaturePtr aPart = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(theFeature);
+ int aNum = aPart->numberOfSubs();
+ for(int a = 0; a < aNum; a++) {
+ FeaturePtr aSub = aPart->subFeature(a);
+ if (aSub.get() && aSub->data()->isValid()) {
+ theReasons.insert(aSub);
+ }
+ }
}
}
myProcessed[theFeature] = 0;
} else {
int aCount = myProcessed[theFeature];
- if (aCount > 100) { // too many repetition of processing (in VS it may crash on 330 with stack overflow)
- Events_Error::send(
- "Feature '" + theFeature->data()->name() + "' is updtated in infinitive loop");
+ if (aCount > 100) {
+ // too many repetition of processing (in VS it may crash on 330 with stack overflow)
+ Events_InfoMessage("Model_Update",
+ "Feature '%1' is updated in infinitive loop").arg(theFeature->data()->name()).send();
+ // to stop iteration
+ myModified.clear();
return false;
}
myProcessed[theFeature] = aCount + 1;
if (theFeature->data()->execState() == ModelAPI_StateMustBeUpdated) {
aIsModified = true;
std::set<std::shared_ptr<ModelAPI_Feature> > aNewSet;
- aNewSet.insert(theFeature); // contains itself, so, we don't know which was the reason and the reason is any
+ // contains itself, so, we don't know which was the reason and the reason is any
+ aNewSet.insert(theFeature);
myModified[theFeature] = aNewSet;
}
}
}
}
}
+ std::shared_ptr<GeomAPI_Shape> aShapeBefore = anExtSel->value();
+ if (!aShapeBefore.get() && anExtSel->context()) aShapeBefore = anExtSel->context()->shape();
updateArguments(theFeature);
+ std::shared_ptr<GeomAPI_Shape> aShapeAfter = anExtSel->value();
+ if (!aShapeAfter.get() && anExtSel->context()) aShapeAfter = anExtSel->context()->shape();
+ // if selected plane is changed, try to re-take external references of all subs of the sketch
+ if (aShapeBefore.get() && !aShapeBefore->isEqual(aShapeAfter)) {
+ std::set<FeaturePtr> aWholeR;
+ allReasons(theFeature, aWholeR);
+ std::set<FeaturePtr>::iterator aRIter = aWholeR.begin();
+ for(; aRIter != aWholeR.end(); aRIter++) {
+ if ((*aRIter)->data()->selection("External"))
+ (*aRIter)->attributeChanged("External");
+ }
+ }
}
if (!aIsModified) { // no modification is needed
return false;
}
+ // evaluate parameter before the sub-elements update:
+ // it updates dependencies on evaluation (#1085)
+ if (theFeature->getKind() == "Parameter") {
+ theFeature->execute();
+ }
+
+ bool isReferencedInvalid = false;
// check all features this feature depended on (recursive call of updateFeature)
- std::set<std::shared_ptr<ModelAPI_Feature> >& aReasons = myModified[theFeature];
- if (aReasons.find(theFeature) == aReasons.end()) {
- std::set<std::shared_ptr<ModelAPI_Feature> >::iterator aReasonIter = aReasons.begin();
- for(; aReasonIter != aReasons.end(); aReasonIter++) {
- if (*aReasonIter != theFeature && processFeature(*aReasonIter)) {
+ std::set<FeaturePtr>& aReasons = myModified[theFeature];
+ bool allSubsUsed = aReasons.find(theFeature) != aReasons.end();
+ if (allSubsUsed) {
+ // add all subs in aReasons and temporary remove "theFeature" to avoid processing itself
+ allReasons(theFeature, aReasons);
+ aReasons.erase(theFeature);
+ }
+ // take reasons one by one (they may be added during the feature process
+ // (circle by the radius of sketch)
+ std::set<FeaturePtr> aProcessedReasons;
+ while(!aReasons.empty()) {
+ FeaturePtr aReason = *(aReasons.begin());
+#ifdef DEB_UPDATE
+ //cout<<theFeature->name()<<" process next reason "<<aReason->name()<<endl;
+#endif
+ if (aReason != theFeature && (aReason)->data()->isValid()) {
+ if (processFeature(aReason))
aIsModified = true;
- }
- }
- } else { // check all features this feature depended on because here which one was modified is unknown
- std::list<std::pair<std::string, std::list<std::shared_ptr<ModelAPI_Object> > > > aDeps;
- theFeature->data()->referencesToObjects(aDeps);
- std::list<std::pair<std::string, std::list<std::shared_ptr<ModelAPI_Object> > > >::iterator
- anAttrsIter = aDeps.begin();
- for(; anAttrsIter != aDeps.end(); anAttrsIter++) {
- std::list<std::shared_ptr<ModelAPI_Object> >::iterator aDepIter = anAttrsIter->second.begin();
- for(; aDepIter != anAttrsIter->second.end(); aDepIter++) {
- FeaturePtr aDepFeat = std::dynamic_pointer_cast<ModelAPI_Feature>(*aDepIter);
- if (!aDepFeat.get()) { // so, it depends on the result and process the feature owner of it
- ResultPtr aDepRes = std::dynamic_pointer_cast<ModelAPI_Result>(*aDepIter);
- if (aDepRes.get()) {
- aDepFeat = (*aDepIter)->document()->feature(aDepRes);
- }
- }
- if (aDepFeat.get()) {
- if (processFeature(aDepFeat))
- aIsModified = true;
- }
- }
- }
- if (theFeature->getKind() == "Part") { // part is not depended on its subs directly, but subs must be iterated anyway
- CompositeFeaturePtr aPart = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(theFeature);
- int aNum = aPart->numberOfSubs();
- for(int a = 0; a < aNum; a++) {
- FeaturePtr aSub = aPart->subFeature(a);
- if (aSub.get()) {
- if (processFeature(aSub))
- aIsModified = true;
- }
- }
+ if (aReason->data()->execState() == ModelAPI_StateInvalidArgument)
+ isReferencedInvalid = true;
}
+ // searching for the next not used reason
+ aProcessedReasons.insert(aReason);
+ aReasons.erase(aReason);
+ }
+ // restore the modified reasons: they will be used in the update of arguments
+ if (allSubsUsed) { // restore theFeature in this set
+ aProcessedReasons.insert(theFeature);
}
+ myModified[theFeature] = aProcessedReasons;
// do not execute the composite that contains the current
bool isPostponedMain = false;
CompositeFeaturePtr aCompos = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(theFeature);
if (theFeature->getKind() == "ExtrusionSketch" && aCompos.get()) {
- CompositeFeaturePtr aCurrentOwner =
+ CompositeFeaturePtr aCurrentOwner =
ModelAPI_Tools::compositeOwner(theFeature->document()->currentFeature(false));
isPostponedMain = aCurrentOwner.get() && aCompos->isSub(aCurrentOwner);
}
- #ifdef DEB_UPDATE
- std::cout<<"Update args "<<theFeature->name()<<std::endl;
- #endif
+#ifdef DEB_UPDATE
+ std::cout<<"Update args "<<theFeature->name()<<std::endl;
+#endif
+ // TestImport.py : after arguments are updated, theFeature may be removed
+ if (!theFeature->data()->isValid())
+ return false;
// Update selection and parameters attributes first, before sub-features analysis (sketch plane).
updateArguments(theFeature);
// add this feature to the processed right now to be able remove it from this list on
// update signal during this feature execution
myModified.erase(theFeature);
+ if (myNotPersistentRefs.find(theFeature) != myNotPersistentRefs.end())
+ myNotPersistentRefs.erase(theFeature);
if (theFeature->data()->execState() == ModelAPI_StateMustBeUpdated)
theFeature->data()->execState(ModelAPI_StateDone);
// 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) {
+ if ((theFeature->data()->execState() == ModelAPI_StateInvalidArgument || isReferencedInvalid) &&
+ theFeature->getKind() != "Part") {
+ // 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 "<<theFeature->name()<<std::endl;
#endif
- theFeature->eraseResults();
+ theFeature->eraseResults(false);
redisplayWithResults(theFeature, ModelAPI_StateInvalidArgument); // result also must be updated
return true; // so, feature is modified (results are erased)
}
#ifdef DEB_UPDATE
std::cout<<"Feature is not valid, erase results "<<theFeature->name()<<std::endl;
#endif
- theFeature->eraseResults();
+ theFeature->eraseResults(false);
redisplayWithResults(theFeature, ModelAPI_StateInvalidArgument); // result also must be updated
}
return true;
}
-void Model_Update::redisplayWithResults(FeaturePtr theFeature, const ModelAPI_ExecState theState)
+void Model_Update::redisplayWithResults(FeaturePtr theFeature, const ModelAPI_ExecState theState)
{
// make updated and redisplay all results
static Events_ID EVENT_DISP = Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY);
std::list<ResultPtr>::iterator aRIter = allResults.begin();
for (; aRIter != allResults.cend(); aRIter++) {
std::shared_ptr<ModelAPI_Result> 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 (theFeature->data()->updateID() > aRes->data()->updateID()) {
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();
ModelAPI_ExecState aState = theFeature->data()->execState();
for(; anIter != anAttributes.end(); anIter++) {
AttributePointPtr aPointAttribute =
std::dynamic_pointer_cast<GeomDataAPI_Point>(*anIter);
- if (aPointAttribute.get()) {
+ if (aPointAttribute.get() && (!aPointAttribute->textX().empty() ||
+ !aPointAttribute->textY().empty() || !aPointAttribute->textZ().empty())) {
if (myIsParamUpdated) {
ModelAPI_AttributeEvalMessage::send(aPointAttribute, this);
}
AttributePoint2DPtr aPoint2DAttribute =
std::dynamic_pointer_cast<GeomDataAPI_Point2D>(*anIter);
if (aPoint2DAttribute.get()) {
- if (myIsParamUpdated) {
+ if (myIsParamUpdated && (!aPoint2DAttribute->textX().empty() ||
+ !aPoint2DAttribute->textY().empty())) {
ModelAPI_AttributeEvalMessage::send(aPoint2DAttribute, this);
}
if ((!aPoint2DAttribute->textX().empty() && aPoint2DAttribute->expressionInvalid(0)) ||
}
}
// update the selection attributes if any
- list<AttributePtr> aRefs =
+ std::list<AttributePtr> aRefs =
theFeature->data()->attributes(ModelAPI_AttributeSelection::typeId());
- list<AttributePtr>::iterator aRefsIter = aRefs.begin();
+ std::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 only if the referenced object is ready to use
- if (aContext.get() && !aContext->isDisabled() && isReason(theFeature, aContext)) {
- if (!aSel->update()) { // this must be done on execution since it may be long operation
- bool isObligatory = !aFactory->isNotObligatory(
- theFeature->getKind(), theFeature->data()->id(aSel)) &&
- aFactory->isCase(theFeature, theFeature->data()->id(aSel));
- if (isObligatory)
- aState = ModelAPI_StateInvalidArgument;
+ if (aContext.get() && !aContext->isDisabled()) {
+ if (isReason(theFeature, aContext)) {
+ if (!aSel->update()) { // this must be done on execution since it may be long operation
+ bool isObligatory = !aFactory->isNotObligatory(
+ theFeature->getKind(), theFeature->data()->id(aSel)) &&
+ aFactory->isCase(theFeature, theFeature->data()->id(aSel));
+ if (isObligatory)
+ aState = ModelAPI_StateInvalidArgument;
+ }
}
+ } 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)
+ aState = ModelAPI_StateInvalidArgument;
}
}
// update the selection list attributes if any
if (aSelAttr) {
ObjectPtr aContext = aSelAttr->context();
// update argument only if the referenced object is ready to use
- if (aContext.get() && !aContext->isDisabled() && isReason(theFeature, aContext)) {
- if (!aSelAttr->update()) {
- bool isObligatory = !aFactory->isNotObligatory(
- theFeature->getKind(), theFeature->data()->id(aSel)) &&
- aFactory->isCase(theFeature, theFeature->data()->id(aSel));
- if (isObligatory)
- aState = ModelAPI_StateInvalidArgument;
+ if (aContext.get() && !aContext->isDisabled()) {
+ if (isReason(theFeature, aContext)) {
+ if (!aSelAttr->update()) {
+ bool isObligatory = !aFactory->isNotObligatory(
+ theFeature->getKind(), theFeature->data()->id(aSel)) &&
+ aFactory->isCase(theFeature, theFeature->data()->id(aSel));
+ if (isObligatory)
+ aState = ModelAPI_StateInvalidArgument;
+ }
}
+ } 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)
+ aState = ModelAPI_StateInvalidArgument;
}
}
}
theFeature->data()->execState(aState);
}
-bool Model_Update::isReason(std::shared_ptr<ModelAPI_Feature>& theFeature,
- std::shared_ptr<ModelAPI_Object> theReason)
+bool Model_Update::isReason(std::shared_ptr<ModelAPI_Feature>& theFeature,
+ std::shared_ptr<ModelAPI_Object> theReason)
{
std::map<std::shared_ptr<ModelAPI_Feature>, std::set<std::shared_ptr<ModelAPI_Feature> > >
::iterator aReasonsIt = myModified.find(theFeature);
- if (aReasonsIt == myModified.end())
- return false; // this case only for not-previewed items update state, nothing is changed in args for it
- if (aReasonsIt->second.find(theFeature) != aReasonsIt->second.end())
- return true; // any is reason if it contains itself
- FeaturePtr aReasFeat = std::dynamic_pointer_cast<ModelAPI_Feature>(theReason);
- if (!aReasFeat.get()) { // try to get feature of this result
- ResultPtr aReasRes = std::dynamic_pointer_cast<ModelAPI_Result>(theReason);
- if (aReasRes.get())
- aReasFeat = theReason->document()->feature(aReasRes);
- }
- return aReasonsIt->second.find(aReasFeat) != aReasonsIt->second.end();
+ if (aReasonsIt != myModified.end()) {
+ if (aReasonsIt->second.find(theFeature) != aReasonsIt->second.end())
+ return true; // any is reason if it contains itself
+ FeaturePtr aReasFeat = std::dynamic_pointer_cast<ModelAPI_Feature>(theReason);
+ if (!aReasFeat.get()) { // try to get feature of this result
+ ResultPtr aReasRes = std::dynamic_pointer_cast<ModelAPI_Result>(theReason);
+ if (aReasRes.get())
+ aReasFeat = theReason->document()->feature(aReasRes);
+ }
+ if (aReasonsIt->second.find(aReasFeat) != aReasonsIt->second.end())
+ return true;
+ }
+ // another try: postponed modification by not-persistences
+ std::map<std::shared_ptr<ModelAPI_Feature>, std::set<std::shared_ptr<ModelAPI_Feature> > >
+ ::iterator aNotPersist = myNotPersistentRefs.find(theFeature);
+ if (aNotPersist != myNotPersistentRefs.end()) {
+ FeaturePtr aReasFeat = std::dynamic_pointer_cast<ModelAPI_Feature>(theReason);
+ if (!aReasFeat.get()) { // try to get feature of this result
+ ResultPtr aReasRes = std::dynamic_pointer_cast<ModelAPI_Result>(theReason);
+ if (aReasRes.get())
+ aReasFeat = theReason->document()->feature(aReasRes);
+ }
+ if (aNotPersist->second.find(aReasFeat) != aNotPersist->second.end())
+ return true;
+ }
+ // this case only for not-previewed items update state, nothing is changed in args for it
+ return false;
}
void Model_Update::executeFeature(FeaturePtr theFeature)
}
} catch(...) {
aState = ModelAPI_StateExecFailed;
- Events_Error::send(
- "Feature " + theFeature->getKind() + " has failed during the execution");
+ Events_InfoMessage("Model_Update",
+ "Feature %1 has failed during the execution").arg(theFeature->getKind()).send();
}
- // The macro feature has to be deleted in any case even its execution is failed
+ // The macro feature has to be deleted in any case even its execution is failed
myWaitForFinish.insert(theFeature);
if (aState != ModelAPI_StateDone) {
- theFeature->eraseResults();
+ theFeature->eraseResults(false);
}
theFeature->data()->setUpdateID(ModelAPI_Session::get()->transactionID());
redisplayWithResults(theFeature, aState);
bool added = false; // object may be was crated
ModelAPI_Object* aSender = static_cast<ModelAPI_Object*>(theSender);
if (aSender && aSender->document()) {
- FeaturePtr aFeatureSender =
+ FeaturePtr aFeatureSender =
std::dynamic_pointer_cast<ModelAPI_Feature>(aSender->data()->owner());
if (aFeatureSender.get()) {
- Model_Objects* aDocObjects =
+ Model_Objects* aDocObjects =
std::dynamic_pointer_cast<Model_Document>(aSender->document())->objects();
if (aDocObjects) {
//aDocObjects->synchronizeBackRefs();
// remove or add all concealment refs from this feature
std::list<std::pair<std::string, std::list<ObjectPtr> > > aRefs;
aSender->data()->referencesToObjects(aRefs);
- std::list<std::pair<std::string, std::list<ObjectPtr> > >::iterator aRefIt = aRefs.begin();
+ std::list<std::pair<std::string, std::list<ObjectPtr> > >::iterator
+ aRefIt = aRefs.begin();
for(; aRefIt != aRefs.end(); aRefIt++) {
if (!aFactory->isConcealed(aFeatureSender->getKind(), aRefIt->first))
- continue; // take into account only concealed references (do not remove the sketch constraint and the edge on constraint edit)
+ // take into account only concealed references
+ // (do not remove the sketch constraint and the edge on constraint edit)
+ continue;
std::list<ObjectPtr>& aRefFeaturesList = aRefIt->second;
std::list<ObjectPtr>::iterator aReferenced = aRefFeaturesList.begin();
for(; aReferenced != aRefFeaturesList.end(); aReferenced++) {
- // stability is only on results: feature to feature reference mean nested
+ // stability is only on results: feature to feature reference mean nested
// features, that will remove nesting references
- if (aReferenced->get() && (*aReferenced)->data()->isValid() &&
+ if (aReferenced->get() && (*aReferenced)->data()->isValid() &&
(*aReferenced)->groupName() != ModelAPI_Feature::group()) {
- std::shared_ptr<Model_Data> aData =
+ std::shared_ptr<Model_Data> aData =
std::dynamic_pointer_cast<Model_Data>((*aReferenced)->data());
if (aFeatureSender->isStable()) {
aData->addBackReference(aFeatureSender, aRefIt->first);
}
}
}
+
+void Model_Update::updateSelection(const std::set<std::shared_ptr<ModelAPI_Object> >& theObjects)
+{
+ std::set<std::shared_ptr<ModelAPI_Object> >::iterator anObj = theObjects.begin();
+ for(; anObj != theObjects.end(); anObj++) {
+ std::list<AttributePtr> aRefs =
+ (*anObj)->data()->attributes(ModelAPI_AttributeSelection::typeId());
+ std::list<AttributePtr>::iterator aRefsIter = aRefs.begin();
+ for (; aRefsIter != aRefs.end(); aRefsIter++) {
+ std::shared_ptr<Model_AttributeSelection> aSel =
+ std::dynamic_pointer_cast<Model_AttributeSelection>(*aRefsIter);
+ aSel->updateInHistory();
+ }
+ // update the selection list attributes if any
+ aRefs = (*anObj)->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<Model_AttributeSelection> aSelAttr =
+ std::dynamic_pointer_cast<Model_AttributeSelection>(aSel->value(a));
+ if (aSelAttr.get())
+ aSelAttr->updateInHistory();
+ }
+ }
+ }
+}