#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>
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;
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;
}
// update arguments for "apply button" state change
static ModelAPI_ValidatorsFactory* aFactory = ModelAPI_Session::get()->validators();
aFactory->validate(theFeature); // need to be validated to update the "Apply" state if not previewed
+ // 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()<<" reason "<<theReason->name()<<std::endl;
+ //std::cout<<"*** Add already modified "<<theFeature->name()<<" reason "<<theReason->name()<<std::endl;
#endif
myModified[theFeature].insert(theReason);
}
if (!aIsDisabled) {
std::set<std::shared_ptr<ModelAPI_Feature> > aNewSet;
if (theFeature->data()->execState() == ModelAPI_StateMustBeUpdated ||
- theFeature->data()->execState() == ModelAPI_StateInvalidArgument) { // issue 1519
+ 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
- if (theReason.get())
- std::cout<<"*** Add modified "<<theFeature->name()<<" reason "<<theReason->name()<<std::endl;
- else
- 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
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
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;
}
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 =
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;
}
// 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(Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY));
+ 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
}
}
}
}
updateArguments(theFeature);
+ // send event that sketch is prepared to be recomputed
+ static Events_ID anID = Events_Loop::eventByName("SketchPrepared");
+ std::shared_ptr<Events_Message> aMsg(new Events_Message(anID, this));
+ Events_Loop::loop()->send(aMsg);
}
if (!aIsModified) { // no modification is needed
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);
{
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;
+ }
+ return false; // this case only for not-previewed items update state, nothing is changed in args for it
}
void Model_Update::executeFeature(FeaturePtr theFeature)
}
}
}
+
+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++) {
+ list<AttributePtr> aRefs =
+ (*anObj)->data()->attributes(ModelAPI_AttributeSelection::typeId());
+ 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();
+ }
+ }
+ }
+}
