using namespace std;
Model_Update MY_UPDATER_INSTANCE; /// the only one instance initialized on load of the library
+#define DEB_UPDATE
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<Events_Message>& theMessage)
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 "<<theMessage->eventID().eventText()<<std::endl;
+#endif
if (theMessage->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);
}
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);
+ // on undo/redo, abort do not update persisten features
+ FeaturePtr anUpdated = std::dynamic_pointer_cast<ModelAPI_Feature>(*anObjIter);
+ if (std::dynamic_pointer_cast<Model_Document>((*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<ModelAPI_Feature>(*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()<<std::endl;
+ }
+#endif
+ }
+
}
- // this event is for solver update, not here, do not react immideately
+ // this event is for solver update, not here, do not react immediately
if (!isOnlyResults && !(theMessage->eventID() == kMovedEvent))
processOperation(false);
} else if (theMessage->eventID() == kOpFinishEvent || theMessage->eventID() == kOpAbortEvent ||
theMessage->eventID() == kOpStartEvent) {
- myIsParamUpdated = false;
if (!(theMessage->eventID() == kOpStartEvent)) {
myIsFinish = true;
}
// in the end of transaction everything is updated, so clear the old objects (the only one
// place where results are cleared)
- myJustUpdated.clear();
+ myIsParamUpdated = false;
+ myUpdated.clear();
+ myModification = 0;
myWaitForFinish.clear();
}
}
+bool Model_Update::iterateUpdate(std::shared_ptr<ModelAPI_CompositeFeature> 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<ModelAPI_Feature> theFeature)
+{
+ // checking that this feature is before the current iterated one: otherwise break is not needed
+ std::list<IterationItem>::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<IterationItem>::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) {
}
// perform update of everything if needed
if (!myIsExecuted) {
+ #ifdef DEB_UPDATE
+ std::cout<<"****** Start processing"<<std::endl;
+ #endif
myIsExecuted = true;
bool isAutomaticChanged = false;
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<Model_Document>(aRootDoc)->objects();
- if (!anObjs) return;
- // two cycles: parameters are first to process
- FeaturePtr aFeatureIter = anObjs->firstFeature();
- std::set<FeaturePtr> aProcessedFeatures; // to avoid processing twice
- for (; aFeatureIter.get(); aFeatureIter = anObjs->nextFeature(aFeatureIter)) {
- if (aFeatureIter->groupName() == "Parameter")
- updateFeature(aFeatureIter, aProcessedFeatures);
- }
- aFeatureIter = anObjs->firstFeature();
- for (; aFeatureIter.get(); aFeatureIter = anObjs->nextFeature(aFeatureIter)) {
- if (aFeatureIter->groupName() != "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();
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
}
}
-void Model_Update::updateFeature(FeaturePtr theFeature, std::set<FeaturePtr>& 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;
+ #ifdef DEB_UPDATE
+ //std::cout<<"Update Feature "<<theFeature->name()<<std::endl;
+ #endif
CompositeFeaturePtr aCompos = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(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);
// 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->groupName() == "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->groupName() != "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
+ 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
return;
}
- bool aJustUpdated = myJustUpdated.find(theFeature) != myJustUpdated.end();
+ // only the currently updated features are executed
+ bool aJustUpdated = myUpdated.find(theFeature) != myUpdated.end() && myUpdated[theFeature] == myModification;
if (myIsAutomatic && theFeature->data()->execState() == ModelAPI_StateMustBeUpdated)
aJustUpdated = true;
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;
}
if (aJustUpdated) {
ModelAPI_ExecState aState = theFeature->data()->execState();
if (aFactory->validate(theFeature)) {
+ #ifdef DEB_UPDATE
+ std::cout<<"Execute Feature "<<theFeature->name()<<std::endl;
+ #endif
executeFeature(theFeature);
} else {
theFeature->eraseResults();
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;
}
}
}
std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aRIter = aResults.begin();
for (; aRIter != aResults.cend(); aRIter++) {
std::shared_ptr<ModelAPI_Result> aRes = *aRIter;
- aRes->data()->execState(theState);
+ 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());
}
return theCurrent;
}
+bool Model_Update::isOlder(std::shared_ptr<ModelAPI_Feature> theFeature,
+ std::shared_ptr<ModelAPI_Object> theArgument)
+{
+ int aFeatureID = theFeature->data()->updateID();
+ int anArgID = theArgument->data()->updateID();
+ if (aFeatureID < anArgID)
+ return true;
+ std::map<std::shared_ptr<ModelAPI_Object>, int >::iterator anAIter = myUpdated.find(theArgument);
+ if (anAIter == myUpdated.end())
+ return false;
+ std::map<std::shared_ptr<ModelAPI_Object>, 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
- // featuers referenced to the active and modified features
+ // features referenced to the active and modified features
static ModelAPI_ValidatorsFactory* aFactory = ModelAPI_Session::get()->validators();
std::shared_ptr<ModelAPI_AttributeSelection> aSel =
std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(*aRefsIter);
ObjectPtr aContext = aSel->context();
- // update argument onlt if the referenced object is changed
- if (aContext.get() && !aContext->isDisabled() &&
- 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());
if (aSelAttr) {
ObjectPtr aContext = aSelAttr->context();
// update argument onlt if the referenced object is changed
- if (aContext.get() && !aContext->isDisabled() &&
- 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;
+ }
}
}
}
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);
}
// number of subs can be changed in execution: like fillet
for(int a = 0; a < aCompos->numberOfSubs(); a++) {
FeaturePtr aSub = aCompos->subFeature(a);
- if (myJustUpdated.find(aSub) != myJustUpdated.end() ||
- (aSub.get() && aSub->data()->updateID() > theFeature->data()->updateID())) {
- if (aState == ModelAPI_StateDone)
+ if (aSub.get() && aState == ModelAPI_StateDone) {
+ if (isOlder(theFeature, aSub)) {
+ aState = ModelAPI_StateMustBeUpdated;
+ }
+ // also check that all results of subs were updated: composite also depends on the results
+ const std::list<std::shared_ptr<ModelAPI_Result> >& aResults = aSub->results();
+ std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aResIter = aResults.begin();
+ for(; aResIter != aResults.end(); aResIter++) {
+ if (aResIter->get() && (*aResIter)->data()->isValid() && !(*aResIter)->isDisabled() &&
+ isOlder(theFeature, *aResIter)) {
aState = ModelAPI_StateMustBeUpdated;
+ }
+ }
}
}
}
theFeature->data()->execState(ModelAPI_StateDone);
try {
theFeature->execute();
- myJustUpdated.erase(theFeature);
if (theFeature->data()->execState() != ModelAPI_StateDone) {
aState = ModelAPI_StateExecFailed;
} else {
theFeature->data()->setUpdateID(ModelAPI_Session::get()->transactionID());
redisplayWithResults(theFeature, aState);
}
+
+///////////////// Updated items iterator ////////////////////////
+Model_Update::IterationItem::IterationItem(std::shared_ptr<ModelAPI_CompositeFeature> 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<Model_Document>(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()) {
+ mySub = myObjects->nextFeature(mySub);
+ }
+ }
+}
+
+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;
+}