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 (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)
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
} else if (theMessage->eventID() == kReorderEvent) {
std::shared_ptr<ModelAPI_OrderUpdatedMessage> aMsg =
std::dynamic_pointer_cast<ModelAPI_OrderUpdatedMessage>(theMessage);
- addModified(aMsg->reordered(), aMsg->reordered()); // to update all attributes
+ 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
// 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)