#include <Model_Update.h>
#include <Model_Document.h>
#include <Model_Data.h>
+#include <Model_Objects.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 <GeomDataAPI_Point.h>
+#include <GeomDataAPI_Point2D.h>
#include <Events_Loop.h>
#include <Events_LongOp.h>
#include <Events_Error.h>
Config_Prop::Boolean, "false");
myIsAutomatic =
Config_PropManager::findProp("Model update", "automatic_rebuild")->value() == "true";
+ myIsParamUpdated = false;
}
void Model_Update::processEvent(const std::shared_ptr<Events_Message>& theMessage)
std::dynamic_pointer_cast<ModelAPI_ObjectUpdatedMessage>(theMessage);
const std::set<ObjectPtr>& anObjs = aMsg->objects();
std::set<ObjectPtr>::const_iterator anObjIter = anObjs.cbegin();
+ bool isOnlyResults = true; // check that only results were changed: only redisplay is needed
for(; anObjIter != anObjs.cend(); anObjIter++) {
+ if (!std::dynamic_pointer_cast<ModelAPI_Result>(*anObjIter).get()) {
+ isOnlyResults = 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
if (theMessage->eventID() == kCreatedEvent) {
}
}
// this event is for solver update, not here, do not react immideately
- if (!(theMessage->eventID() == kMovedEvent))
+ if (!isOnlyResults && !(theMessage->eventID() == kMovedEvent))
processOperation(false);
} else if (theMessage->eventID() == kOpStartEvent) {
// we don't need the update only on operation start (caused problems in PartSet_Listener::processEvent)
isOperationChanged = true;
} else if (theMessage->eventID() == kOpFinishEvent || theMessage->eventID() == kOpAbortEvent) {
- processOperation(true);
+ processOperation(true, theMessage->eventID() == kOpFinishEvent);
isOperationChanged = true;
}
if (isOperationChanged) {
- // remove all macros before clearing all created
+ // remove all macros before clearing all created and execute all not-previewed
std::set<ObjectPtr>::iterator aCreatedIter = myJustCreated.begin();
- for(; aCreatedIter != myJustCreated.end(); aCreatedIter++) {
- FeaturePtr aFeature =
- std::dynamic_pointer_cast<ModelAPI_Feature>(*aCreatedIter);
- if (aFeature.get() && aFeature->isMacro()) {
- aFeature->document()->removeFeature(aFeature);
+ std::set<ObjectPtr>::iterator anUpdatedIter = myJustUpdated.begin();
+ for(; aCreatedIter != myJustCreated.end() || anUpdatedIter != myJustUpdated.end();
+ aCreatedIter == myJustCreated.end() ? anUpdatedIter++ : aCreatedIter++) {
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(*
+ (aCreatedIter == myJustCreated.end() ? anUpdatedIter : aCreatedIter));
+ if (aFeature.get()) {
+ // execute not-previewed feature on "apply"
+ if (!aFeature->isPreviewNeeded() && (myJustCreated.find(aFeature) != myJustCreated.end() ||
+ myJustUpdated.find(aFeature) != myJustUpdated.end())) {
+ static ModelAPI_ValidatorsFactory* aFactory = ModelAPI_Session::get()->validators();
+ if (aFactory->validate(aFeature)) {
+ executeFeature(aFeature);
+ }
+ }
+ // remove macro on apply
+ if (aFeature->isMacro()) {
+ aFeature->document()->removeFeature(aFeature);
+ }
}
}
myJustCreated.clear();
myJustUpdated.clear();
+ myIsParamUpdated = false;
}
}
-void Model_Update::processOperation(const bool theTotalUpdate)
+void Model_Update::processOperation(const bool theTotalUpdate, const bool theFinish)
{
- // the hardcode (DBC asked): hide the sketch referenced by extrusion on apply
- std::set<std::shared_ptr<ModelAPI_Object> >::iterator aFIter;
- for(aFIter = myJustCreated.begin(); aFIter != myJustCreated.end(); aFIter++)
- {
- FeaturePtr aF = std::dynamic_pointer_cast<ModelAPI_Feature>(*aFIter);
- if (aF && aF->data().get() && aF->getKind() == "Extrusion") {
- AttributeSelectionListPtr aBase = aF->selectionList("base");
- if (aBase.get()) {
- for(int a = aBase->size() - 1; a >= 0; a--) {
- ResultPtr aSketchRes = aBase->value(a)->context();
- if (aSketchRes) {
- static Events_ID HIDE_DISP = Events_Loop::loop()->eventByName(EVENT_OBJECT_TOHIDE);
- ModelAPI_EventCreator::get()->sendUpdated(aSketchRes, HIDE_DISP);
+ if (theFinish) {
+ // the hardcode (DBC asked): hide the sketch referenced by extrusion on apply
+ std::set<std::shared_ptr<ModelAPI_Object> >::iterator aFIter;
+ for(aFIter = myJustCreated.begin(); aFIter != myJustCreated.end(); aFIter++)
+ {
+ FeaturePtr aF = std::dynamic_pointer_cast<ModelAPI_Feature>(*aFIter);
+ if (aF && aF->data()->isValid() && aF->getKind() == "Extrusion") {
+ AttributeSelectionListPtr aBase = aF->selectionList("base");
+ if (aBase.get()) {
+ for(int a = aBase->size() - 1; a >= 0; a--) {
+ ResultPtr aSketchRes = aBase->value(a)->context();
+ if (aSketchRes) {
+ aSketchRes->setDisplayed(false);
+ }
}
}
}
{
std::set<FeaturePtr> alreadyProcessed; // features that are processed before others
// all features one by one
- for (int aFIndex = 0; aFIndex < theDoc->size(ModelAPI_Feature::group(), true); aFIndex++) {
- FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(
- theDoc->object(ModelAPI_Feature::group(), aFIndex, true));
- if (aFeature && alreadyProcessed.find(aFeature) == alreadyProcessed.end()) {
+ Model_Objects* anObjs = std::dynamic_pointer_cast<Model_Document>(theDoc)->objects();
+ if (!anObjs) return;
+ FeaturePtr aFeatureIter = anObjs->firstFeature();
+ for (; aFeatureIter.get(); aFeatureIter = anObjs->nextFeature(aFeatureIter)) {
+ if (!aFeatureIter->data()->isValid()) // this may be on close of the document
+ continue;
+ if (aFeatureIter && alreadyProcessed.find(aFeatureIter) == alreadyProcessed.end()) {
// update selection and parameters attributes first, before sub-features analysis (sketch plane)
- updateArguments(aFeature);
+ updateArguments(aFeatureIter);
// composite feature must be executed after sub-features execution
CompositeFeaturePtr aComposite =
- std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(aFeature);
+ std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(aFeatureIter);
if (aComposite) {
// number of subs can be changed in execution: like fillet
for(int a = 0; a < aComposite->numberOfSubs(); a++) {
FeaturePtr aSub = aComposite->subFeature(a);
+ updateArguments(aSub);
updateFeature(aSub);
alreadyProcessed.insert(aSub);
}
}
- updateFeature(aFeature);
+ updateFeature(aFeatureIter);
// update the document results recursively
- const std::list<std::shared_ptr<ModelAPI_Result> >& aResults = aFeature->results();
+ const std::list<std::shared_ptr<ModelAPI_Result> >& aResults = aFeatureIter->results();
std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aRIter = aResults.begin();
for (; aRIter != aResults.cend(); aRIter++) {
ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(*aRIter);
if (aPart.get()) {
- if (aPart->isActivated()) {
+ if (!aPart->isDisabled() && aPart->partDoc().get()) {
updateInDoc(aPart->partDoc());
}
}
}
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
+
static ModelAPI_ValidatorsFactory* aFactory = ModelAPI_Session::get()->validators();
- if (theFeature->isDisabled()) // nothing to do with disabled feature
- return;
bool aJustUpdated = false;
- ModelAPI_ExecState aState = ModelAPI_StateDone;
- // check the parameters: values can be changed
- std::list<AttributePtr> aDoubles =
- theFeature->data()->attributes(ModelAPI_AttributeDouble::typeId());
+ ModelAPI_ExecState aState = theFeature->data()->execState();
+ if (aState == ModelAPI_StateInvalidArgument) // a chance to be corrected
+ aState = ModelAPI_StateMustBeUpdated;
+ // check the parameters state
+ // Double
+ std::list<AttributePtr> aDoubles =
+ theFeature->data()->attributes(ModelAPI_AttributeDouble::typeId());
std::list<AttributePtr>::iterator aDoubleIter = aDoubles.begin();
for(; aDoubleIter != aDoubles.end(); aDoubleIter++) {
- AttributeDoublePtr aDouble =
+ AttributeDoublePtr aDouble =
std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(*aDoubleIter);
if (aDouble.get() && !aDouble->text().empty()) {
- double aNewVal;
- if (ModelAPI_Tools::findVariable(aDouble->text(), aNewVal)) {
- if (aNewVal != aDouble->value()) {
- aDouble->setValue(aNewVal);
- aJustUpdated = true;
- }
- } else {
+ if (myIsParamUpdated) {
+ ModelAPI_AttributeEvalMessage::send(aDouble, this);
+ }
+ if (aDouble->expressionInvalid()) {
aState = ModelAPI_StateInvalidArgument;
}
}
}
+ // Point
+ {
+ std::list<AttributePtr> anAttributes =
+ theFeature->data()->attributes(GeomDataAPI_Point::typeId());
+ std::list<AttributePtr>::iterator anIter = anAttributes.begin();
+ for(; anIter != anAttributes.end(); anIter++) {
+ AttributePointPtr aPointAttribute =
+ std::dynamic_pointer_cast<GeomDataAPI_Point>(*anIter);
+ if (aPointAttribute.get()) {
+ if (myIsParamUpdated) {
+ ModelAPI_AttributeEvalMessage::send(aPointAttribute, this);
+ }
+ if ((!aPointAttribute->textX().empty() && aPointAttribute->expressionInvalid(0)) ||
+ (!aPointAttribute->textY().empty() && aPointAttribute->expressionInvalid(1)) ||
+ (!aPointAttribute->textZ().empty() && aPointAttribute->expressionInvalid(2)))
+ aState = ModelAPI_StateInvalidArgument;
+ }
+ }
+ }
+ // Point2D
+ {
+ std::list<AttributePtr> anAttributes =
+ theFeature->data()->attributes(GeomDataAPI_Point2D::typeId());
+ std::list<AttributePtr>::iterator anIter = anAttributes.begin();
+ for(; anIter != anAttributes.end(); anIter++) {
+ AttributePoint2DPtr aPoint2DAttribute =
+ std::dynamic_pointer_cast<GeomDataAPI_Point2D>(*anIter);
+ if (aPoint2DAttribute.get()) {
+ if (myIsParamUpdated) {
+ ModelAPI_AttributeEvalMessage::send(aPoint2DAttribute, this);
+ }
+ if ((!aPoint2DAttribute->textX().empty() && aPoint2DAttribute->expressionInvalid(0)) ||
+ (!aPoint2DAttribute->textY().empty() && aPoint2DAttribute->expressionInvalid(1)))
+ aState = ModelAPI_StateInvalidArgument;
+ }
+ }
+ }
- if (aState == ModelAPI_StateDone) {// all referenced objects are ready to be used
+ //if (aState == ModelAPI_StateDone) {// all referenced objects are ready to be used
//std::cout<<"Execute feature "<<theFeature->getKind()<<std::endl;
// before execution update the selection attributes if any
list<AttributePtr> aRefs =
for (; aRefsIter != aRefs.end(); aRefsIter++) {
std::shared_ptr<ModelAPI_AttributeSelection> aSel =
std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(*aRefsIter);
- 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)))
- aState = ModelAPI_StateInvalidArgument;
+ ObjectPtr aContext = aSel->context();
+ // update argument onlt if the referenced object is changed
+ if (aContext.get() && isUpdated(aContext) && !aContext->isDisabled()) {
+ 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)))
+ aState = ModelAPI_StateInvalidArgument;
+ }
}
}
aRefs = theFeature->data()->attributes(ModelAPI_AttributeSelectionList::typeId());
std::shared_ptr<ModelAPI_AttributeSelection> aSelAttr =
std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(aSel->value(a));
if (aSelAttr) {
- if (!aSelAttr->update()) {
- if (!aFactory->isNotObligatory(
- theFeature->getKind(), theFeature->data()->id(aSel)) &&
+ ObjectPtr aContext = aSelAttr->context();
+ // update argument onlt if the referenced object is changed
+ if (aContext.get() && isUpdated(aContext) && !aContext->isDisabled()) {
+ if (aState == ModelAPI_StateDone)
+ aState = ModelAPI_StateMustBeUpdated;
+ if (!aSelAttr->update()) {
+ if (!aFactory->isNotObligatory(
+ theFeature->getKind(), theFeature->data()->id(aSel)) &&
aFactory->isCase(theFeature, theFeature->data()->id(aSel)))
- aState = ModelAPI_StateInvalidArgument;
+ aState = ModelAPI_StateInvalidArgument;
+ }
}
}
}
}
- }
+ //}
if (aJustUpdated && myJustCreated.find(theFeature) == myJustCreated.end())
myJustUpdated.insert(theFeature);
if (aState != ModelAPI_StateDone)
// check all features this feature depended on (recursive call of updateFeature)
static ModelAPI_ValidatorsFactory* aFactory = ModelAPI_Session::get()->validators();
- if (theFeature->isDisabled()) // nothing to do with disabled feature
+ if (theFeature->data()->execState() == ModelAPI_StateInvalidArgument)
return;
bool aJustUpdated = false;
if (theFeature) {
- if (theFeature->data()->execState() != ModelAPI_StateDone)
+ if (myIsAutomatic && theFeature->data()->execState() == ModelAPI_StateMustBeUpdated)
aJustUpdated = true;
ModelAPI_ExecState aState = ModelAPI_StateDone;
for(; aRef != aRefs.end(); aRef++) {
std::list<ObjectPtr>::iterator aRefObj = aRef->second.begin();
for(; aRefObj != aRef->second.end(); aRefObj++) {
- if (myJustCreated.find(*aRefObj) != myJustCreated.end() ||
- myJustUpdated.find(*aRefObj) != myJustUpdated.end()) {
+ // if reference is null, it may mean that this reference is to other document
+ // the does not supported by RefList: peremeters may be recomputed
+ if (!aRefObj->get() && theFeature->firstResult().get() &&
+ theFeature->firstResult()->groupName() == ModelAPI_ResultParameter::group()) {
+ aJustUpdated = true;
+ } else if (myJustCreated.find(*aRefObj) != myJustCreated.end() ||
+ myJustUpdated.find(*aRefObj) != myJustUpdated.end()) {
aJustUpdated = true;
}
aState = stateByReference(*aRefObj, aState);
//std::cout<<"Update feature "<<theFeature->getKind()<<" must be updated = "<<aMustbeUpdated<<std::endl;
// execute feature if it must be updated
if (aJustUpdated) {
- if (std::dynamic_pointer_cast<Model_Document>(theFeature->document())->executeFeatures() ||
- !theFeature->isPersistentResult()) {
- if (aFactory->validate(theFeature)) {
- if (myIsAutomatic ||
- (myJustCreated.find(theFeature) != myJustCreated.end() ||
- !theFeature->isPersistentResult() /* execute quick, not persistent results */))
- {
- // execute in try-catch to avoid internal problems of the feature
- if (aState == ModelAPI_StateDone || aState == ModelAPI_StateMustBeUpdated) {
- theFeature->data()->execState(ModelAPI_StateDone);
- try {
- theFeature->execute();
- if (theFeature->data()->execState() != ModelAPI_StateDone) {
- aState = ModelAPI_StateExecFailed;
- } else {
- aState = ModelAPI_StateDone;
+ if (theFeature->isDisabled()) { // do not execute the disabled feature
+ // the disabled features must be updated after enabling anyway if their arguments were changed
+ if (theFeature->data()->execState() == ModelAPI_StateDone &&
+ aState == ModelAPI_StateMustBeUpdated)
+ theFeature->data()->execState(ModelAPI_StateMustBeUpdated);
+ } else {
+ if (theFeature->isPreviewNeeded()) {
+ if (std::dynamic_pointer_cast<Model_Document>(theFeature->document())->executeFeatures() ||
+ !theFeature->isPersistentResult()) {
+ if (aFactory->validate(theFeature)) {
+ FeaturePtr aCurrent = theFeature->document()->currentFeature(false);
+ if (myIsAutomatic || !theFeature->isPersistentResult() /* execute quick, not persistent results */
+ || (isUpdated(theFeature) &&
+ (theFeature == aCurrent ||
+ (aCurrent.get() && aCurrent->isMacro())))) // currently edited
+ {
+ if (aState == ModelAPI_StateDone || aState == ModelAPI_StateMustBeUpdated) {
+ executeFeature(theFeature);
+ }
+ } else { // must be updatet, but not updated yet
+ theFeature->data()->execState(ModelAPI_StateMustBeUpdated);
+ const std::list<std::shared_ptr<ModelAPI_Result> >& aResults = theFeature->results();
+ 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(ModelAPI_StateMustBeUpdated);
}
- } catch(...) {
- aState = ModelAPI_StateExecFailed;
- Events_Error::send(
- "Feature " + theFeature->getKind() + " has failed during the execution");
}
- }
- if (aState != ModelAPI_StateDone) {
+ } else {
theFeature->eraseResults();
+ redisplayWithResults(theFeature, ModelAPI_StateInvalidArgument); // result also must be updated
}
- redisplayWithResults(theFeature, aState);
- } else { // must be updatet, but not updated yet
- theFeature->data()->execState(ModelAPI_StateMustBeUpdated);
- const std::list<std::shared_ptr<ModelAPI_Result> >& aResults = theFeature->results();
- 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(ModelAPI_StateMustBeUpdated);
- }
+ } else { // for automatically updated features (on abort, etc) it is necessary to redisplay anyway
+ redisplayWithResults(theFeature, ModelAPI_StateNothing);
}
- } else {
- theFeature->eraseResults();
- redisplayWithResults(theFeature, ModelAPI_StateInvalidArgument); // result also must be updated
+ } else { // preview is not needed => make state Done
+ if (theFeature->data()->execState() == ModelAPI_StateMustBeUpdated)
+ theFeature->data()->execState(ModelAPI_StateDone);
}
- } else { // for automatically updated features (on abort, etc) it is necessary to redisplay anyway
- redisplayWithResults(theFeature, ModelAPI_StateNothing);
}
}
}
}
+
+void Model_Update::executeFeature(FeaturePtr theFeature)
+{
+ // execute in try-catch to avoid internal problems of the feature
+ ModelAPI_ExecState aState = ModelAPI_StateDone;
+ theFeature->data()->execState(ModelAPI_StateDone);
+ try {
+ theFeature->execute();
+ if (theFeature->data()->execState() != ModelAPI_StateDone) {
+ aState = ModelAPI_StateExecFailed;
+ } else {
+ aState = ModelAPI_StateDone;
+ }
+ } catch(...) {
+ aState = ModelAPI_StateExecFailed;
+ Events_Error::send(
+ "Feature " + theFeature->getKind() + " has failed during the execution");
+ }
+ if (aState != ModelAPI_StateDone) {
+ theFeature->eraseResults();
+ }
+ redisplayWithResults(theFeature, aState);
+}
+
+bool Model_Update::isUpdated(const ObjectPtr& theObj)
+{
+ return myJustCreated.find(theObj) != myJustCreated.end() ||
+ myJustUpdated.find(theObj) != myJustUpdated.end();
+}
