-// 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 <ModelAPI_CompositeFeature.h>
#include <ModelAPI_Session.h>
#include <ModelAPI_Tools.h>
+#include <ModelAPI_ResultBody.h>
+#include <ModelAPI_ResultPart.h>
+#include <GeomAPI_Shape.h>
#include <GeomDataAPI_Point.h>
#include <GeomDataAPI_Point2D.h>
#include <Events_Loop.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, kReorderEvent);
static const Events_ID kUpdatedSel = aLoop->eventByName(EVENT_UPDATE_SELECTION);
aLoop->registerListener(this, kUpdatedSel);
+ static const Events_ID kAutomaticOff = aLoop->eventByName(EVENT_AUTOMATIC_RECOMPUTATION_DISABLE);
+ aLoop->registerListener(this, kAutomaticOff);
+ static const Events_ID kAutomaticOn = aLoop->eventByName(EVENT_AUTOMATIC_RECOMPUTATION_ENABLE);
+ aLoop->registerListener(this, kAutomaticOn);
// Config_PropManager::findProp("Model update", "automatic_rebuild")->value() == "true";
myIsParamUpdated = false;
myIsFinish = false;
myIsProcessed = false;
myIsPreviewBlocked = false;
+ myUpdateBlocked = false;
}
bool Model_Update::addModified(FeaturePtr theFeature, FeaturePtr theReason) {
if (!theFeature->data()->isValid())
return false; // delete an extrusion created on the sketch
+
bool isNotExecuted = theFeature->isPersistentResult() &&
!std::dynamic_pointer_cast<Model_Document>((theFeature)->document())->executeFeatures();
if (isNotExecuted) {
+ redisplayWithResults(theFeature, ModelAPI_StateNothing, false); // redisplay even not executed
if (!theReason.get()) // no reason => no construction reason
return false;
if (myNotPersistentRefs.find(theFeature) == myNotPersistentRefs.end()) {
// update arguments for "apply button" state change
if ((!theFeature->isPreviewNeeded() && !myIsFinish) || myIsPreviewBlocked) {
- myProcessOnFinish.insert(theFeature);
+ if (theReason.get())
+ myProcessOnFinish[theFeature].insert(theReason);
+ else if (myProcessOnFinish.find(theFeature) == myProcessOnFinish.end())
+ myProcessOnFinish[theFeature] = std::set<std::shared_ptr<ModelAPI_Feature> >();
#ifdef DEB_UPDATE
std::cout<<"*** Add process on finish "<<theFeature->name()<<std::endl;
#endif
if (theReason.get())
aNewSet.insert(theReason);
}
- myModified[theFeature] = aNewSet;
+ myModified[theFeature] = aNewSet;
#ifdef DEB_UPDATE
if (theReason.get()) {
//std::cout<<"*** Add modified "<<theFeature->name()
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;
}
}
}
- // proccess also results
+ // process also results
std::list<ResultPtr> allResults; // list of this feature and results
ModelAPI_Tools::allResults(theFeature, allResults);
std::list<ResultPtr>::iterator aRes = allResults.begin();
void Model_Update::processEvent(const std::shared_ptr<Events_Message>& theMessage)
{
static Events_Loop* aLoop = Events_Loop::loop();
+ 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");
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);
+ static const Events_ID kAutomaticOff = aLoop->eventByName(EVENT_AUTOMATIC_RECOMPUTATION_DISABLE);
+ static const Events_ID kAutomaticOn = aLoop->eventByName(EVENT_AUTOMATIC_RECOMPUTATION_ENABLE);
#ifdef DEB_UPDATE
std::cout<<"****** Event "<<theMessage->eventID().eventText()<<std::endl;
#endif
+ // check the automatic update flag on any event
+ bool aNewAutomaticState = ModelAPI_Session::get()->isAutoUpdateBlocked();
+ if (myUpdateBlocked != aNewAutomaticState) {
+ myUpdateBlocked = aNewAutomaticState;
+ if (!myUpdateBlocked) { // process all modified features, even if preview is blocked
+ bool aPreviewBlockedState = myIsPreviewBlocked; // to update the selected arguments
+ myIsPreviewBlocked = false;
+ // iterate everything and add features in state "MustBeUpdated" into modified
+ std::list<std::shared_ptr<ModelAPI_Document> > allDocs =
+ ModelAPI_Session::get()->allOpenedDocuments();
+ std::list<std::shared_ptr<ModelAPI_Document> >::iterator aDoc = allDocs.begin();
+ for(; aDoc != allDocs.end(); aDoc++) {
+ std::list<std::shared_ptr<ModelAPI_Feature> > allFeats = (*aDoc)->allFeatures();
+ std::list<std::shared_ptr<ModelAPI_Feature> >::iterator aFeat = allFeats.begin();
+ for(; aFeat != allFeats.end(); aFeat++) {
+ if ((*aFeat)->data()->isValid() &&
+ (*aFeat)->data()->execState() == ModelAPI_StateMustBeUpdated) {
+ addModified(*aFeat, FeaturePtr());
+ }
+ }
+ }
+ processFeatures();
+ myIsPreviewBlocked = myIsPreviewBlocked;
+ }
+ }
+
if (theMessage->eventID() == kStabilityEvent) {
updateStability(theMessage->sender());
return;
}
if (theMessage->eventID() == kPreviewRequestedEvent) {
if (myIsPreviewBlocked) {
+ bool anUpdateState = myUpdateBlocked;
+ myUpdateBlocked = false;
myIsPreviewBlocked = false;
processFeatures();
myIsPreviewBlocked = true;
+ myUpdateBlocked = anUpdateState;
}
return;
}
std::dynamic_pointer_cast<ModelAPI_ObjectUpdatedMessage>(theMessage);
updateSelection(aMsg->objects());
}
- // creation is added to "update" to avoid recomputation twice:
+ // 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::set<ObjectPtr>::const_iterator anObjIter = anObjs.cbegin();
for(; anObjIter != anObjs.cend(); anObjIter++) {
if (std::dynamic_pointer_cast<Model_Document>((*anObjIter)->document())->executeFeatures()) {
- if ((*anObjIter)->groupName() == ModelAPI_Feature::group()) {
+ if ((*anObjIter)->groupName() == ModelAPI_Feature::group()) {
// results creation means enabling, not update
ModelAPI_EventCreator::get()->sendUpdated(*anObjIter, kUpdatedEvent);
} else {
if ((*anObjIter)->groupName() == ModelAPI_ResultParameter::group()) {
myIsParamUpdated = true;
}
- // on undo/redo, abort do not update persisten features
+ // on undo/redo, abort do not update persistent features
FeaturePtr anUpdated = std::dynamic_pointer_cast<ModelAPI_Feature>(*anObjIter);
if (anUpdated.get()) {
if (addModified(anUpdated, FeaturePtr()))
aSomeModified = true;
- } else {
+ 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<std::shared_ptr<ModelAPI_Attribute> >&
+ const std::set<std::shared_ptr<ModelAPI_Attribute> >&
aRefs = (*anObjIter)->data()->refsToMe();
std::set<std::shared_ptr<ModelAPI_Attribute> >::const_iterator aRefIter = aRefs.cbegin();
+ FeaturePtr aReason;
+ ResultPtr aReasonResult = std::dynamic_pointer_cast<ModelAPI_Result>(*anObjIter);
+ if (aReasonResult.get())
+ aReason = (*anObjIter)->document()->feature(aReasonResult);
for(; aRefIter != aRefs.cend(); aRefIter++) {
if (!(*aRefIter)->owner()->data()->isValid())
continue;
FeaturePtr anUpdated = std::dynamic_pointer_cast<ModelAPI_Feature>((*aRefIter)->owner());
if (anUpdated.get()) {
- if (addModified(anUpdated, FeaturePtr()))
+ if (addModified(anUpdated, aReason))
aSomeModified = true;
}
}
theMessage->eventID() == kOpStartEvent) {
myIsPreviewBlocked = false;
- if (theMessage->eventID() == kOpFinishEvent) {
+ if (theMessage->eventID() == kOpFinishEvent) {// if update is blocked, skip
myIsFinish = true;
// add features that wait for finish as modified
- std::set<std::shared_ptr<ModelAPI_Feature> >::iterator aFeature = myProcessOnFinish.begin();
- for(; aFeature != myProcessOnFinish.end(); aFeature++)
- if ((*aFeature)->data()->isValid()) // there may be already removed wait for features
- addModified(*aFeature, FeaturePtr());
+ std::map<std::shared_ptr<ModelAPI_Feature>, std::set<std::shared_ptr<ModelAPI_Feature> > >::
+ iterator aFeature = myProcessOnFinish.begin();
+ for(; aFeature != myProcessOnFinish.end(); aFeature++) {
+ if (aFeature->first->data()->isValid()) {// there may be already removed while wait
+ if (aFeature->second.empty()) {
+ addModified(aFeature->first, FeaturePtr());
+ continue;
+ }
+ std::set<std::shared_ptr<ModelAPI_Feature> >::iterator aReasons;
+ for(aReasons = aFeature->second.begin(); aReasons != aFeature->second.end(); aReasons++){
+ addModified(aFeature->first, *aReasons);
+ }
+ }
+ }
myIsFinish = false;
}
- // processed features must be only on finish, so clear anyway (to avoid reimport on load)
- myProcessOnFinish.clear();
+ // processed features must be only on finish, so clear anyway (to avoid re-import 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(false);
}
+
+ if (anActiveDoc.get() && aCurrent.get() && aCurrent->data()->isValid()) {
+ if (anActiveDoc->currentFeature(false) != aCurrent &&
+ ModelAPI_Tools::compositeOwner(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
+ // 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
myIsParamUpdated = false;
myWaitForFinish.clear();
} else if (theMessage->eventID() == kReorderEvent) {
- std::shared_ptr<ModelAPI_OrderUpdatedMessage> aMsg =
+ 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
}
}
-// collects all the feautres this feature depends on: reasons
+// collects all the features 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);
myProcessed[theFeature] = 0;
} else {
int aCount = myProcessed[theFeature];
- if (aCount > 100) {
+ 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;
aIsModified = true;
std::set<std::shared_ptr<ModelAPI_Feature> > aNewSet;
// contains itself, so, we don't know which was the reason and the reason is any
- aNewSet.insert(theFeature);
+ 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);
- // 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);
+ 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:
+ // evaluate parameter before the sub-elements update:
// it updates dependencies on evaluation (#1085)
if (theFeature->getKind() == "Parameter") {
theFeature->execute();
// check all features this feature depended on (recursive call of updateFeature)
std::set<FeaturePtr>& aReasons = myModified[theFeature];
bool allSubsUsed = aReasons.find(theFeature) != aReasons.end();
- if (allSubsUsed) {
+ 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
+ // 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()) {
if (aReason != theFeature && (aReason)->data()->isValid()) {
if (processFeature(aReason))
aIsModified = true;
- if (aReason->data()->execState() == ModelAPI_StateInvalidArgument)
+ // check validity of aReason once again because it may be removed by dependent feature
+ // (e.g. by SketchPlugin_IntersectionPoint)
+ if (!aReason->data()->isValid() ||
+ aReason->data()->execState() == ModelAPI_StateInvalidArgument)
isReferencedInvalid = true;
}
// searching for the next not used reason
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);
+ } else if (theFeature->getKind() == "Sketch" &&
+ std::dynamic_pointer_cast<Model_Document>((theFeature)->document())->executeFeatures()) {
+ // 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* aLoop = Events_Loop::loop();
+ // in case it is finish operation, flush for the sketch other events (#2450)
+ aLoop->flush(aLoop->eventByName(EVENT_OBJECT_UPDATED));
+ aLoop->send(aMsg);
+ // check that sub-elements of sketch are updated => sketch must be re-processed
+ std::set<FeaturePtr> aWholeR;
+ allReasons(theFeature, aWholeR);
+ std::set<FeaturePtr>::iterator aRIter = aWholeR.begin();
+ for(; aRIter != aWholeR.end(); aRIter++) {
+ if (myModified.find(*aRIter) != myModified.end()) {
+ processFeature(theFeature);
+ return true;
+ }
+ }
}
#ifdef DEB_UPDATE
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 || isReferencedInvalid) &&
- theFeature->getKind() != "Part") {
+ // composite feature status may depend on it's sub-elements
+ 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)
}
ModelAPI_ExecState aState = theFeature->data()->execState();
if (aFactory->validate(theFeature)) {
if (!isPostponedMain) {
- executeFeature(theFeature);
+ bool aDoExecute = true;
+ if (myUpdateBlocked) {
+ if (!theFeature->isStable()) {
+ 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());
+ } else {
+ aDoExecute = aState != ModelAPI_StateInvalidArgument;
+ }
+ }
+ if (aDoExecute) {
+ executeFeature(theFeature);
+ } else {
+ // store information that this feature must be executed later
+ theFeature->data()->execState(ModelAPI_StateMustBeUpdated);
+ }
}
} else {
#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, bool theUpdateState)
{
// make updated and redisplay all results
static Events_ID EVENT_DISP = Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY);
for (; aRIter != allResults.cend(); aRIter++) {
std::shared_ptr<ModelAPI_Result> aRes = *aRIter;
if (!aRes->isDisabled()) {
- // update state only for enabled results
+ // update state only for enabled results
// (Placement Result Part may make the original Part Result as invalid)
- aRes->data()->execState(theState);
+ if (theUpdateState)
+ aRes->data()->execState(theState);
}
if (theFeature->data()->updateID() > aRes->data()->updateID()) {
aRes->data()->setUpdateID(theFeature->data()->updateID());
}
// to redisplay "presentable" feature (for ex. distance constraint)
ModelAPI_EventCreator::get()->sendUpdated(theFeature, EVENT_DISP);
- theFeature->data()->execState(theState);
+ if (theUpdateState)
+ theFeature->data()->execState(theState);
}
/// Updates the state by the referenced object: if something bad with it, set state for this one
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() && (!aPointAttribute->textX().empty() ||
+ 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 && (!aPoint2DAttribute->textX().empty() ||
+ if (myIsParamUpdated && (!aPoint2DAttribute->textX().empty() ||
!aPoint2DAttribute->textY().empty())) {
ModelAPI_AttributeEvalMessage::send(aPoint2DAttribute, this);
}
}
}
// 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);
if (aSelAttr) {
ObjectPtr aContext = aSelAttr->context();
// update argument only if the referenced object is ready to use
- if (aContext.get() && !aContext->isDisabled()) {
+ if (aContext.get() && !aContext->isDisabled() && !aSelAttr->isInvalid()) {
if (isReason(theFeature, aContext)) {
if (!aSelAttr->update()) {
bool isObligatory = !aFactory->isNotObligatory(
aState = ModelAPI_StateInvalidArgument;
}
}
- } else if (aContext.get()) {
+ } else if (aContext.get() || aSelAttr->isInvalid()) {
// 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)
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);
}
// this case only for not-previewed items update state, nothing is changed in args for it
- return false;
+ return false;
}
void Model_Update::executeFeature(FeaturePtr theFeature)
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();
aRefIt = aRefs.begin();
for(; aRefIt != aRefs.end(); aRefIt++) {
if (!aFactory->isConcealed(aFeatureSender->getKind(), aRefIt->first))
- // take into account only concealed references
+ // take into account only concealed references
// (do not remove the sketch constraint and the edge on constraint edit)
- continue;
+ 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);
{
std::set<std::shared_ptr<ModelAPI_Object> >::iterator anObj = theObjects.begin();
for(; anObj != theObjects.end(); anObj++) {
- list<AttributePtr> aRefs =
+ std::list<AttributePtr> aRefs =
(*anObj)->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<Model_AttributeSelection> aSel =
std::dynamic_pointer_cast<Model_AttributeSelection>(*aRefsIter);