-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019 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
//
// 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
+// 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>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <Model_Update.h>
#include <ModelAPI_CompositeFeature.h>
#include <ModelAPI_Session.h>
#include <ModelAPI_Tools.h>
+#include <ModelAPI_ResultBody.h>
+#include <ModelAPI_ResultPart.h>
+#include <ModelAPI_ResultConstruction.h>
#include <GeomAPI_Shape.h>
#include <GeomDataAPI_Point.h>
+#include <GeomDataAPI_Dir.h>
#include <GeomDataAPI_Point2D.h>
#include <Events_Loop.h>
#include <Events_LongOp.h>
aLoop->registerListener(this, kReorderEvent);
static const Events_ID kUpdatedSel = aLoop->eventByName(EVENT_UPDATE_SELECTION);
aLoop->registerListener(this, kUpdatedSel);
+ static const Events_ID kAutoRecomp = aLoop->eventByName(EVENT_AUTOMATIC_RECOMPUTATION_ENABLE);
+ aLoop->registerListener(this, kAutoRecomp);
// 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 (theReason.get())
aNewSet.insert(theReason);
}
- myModified[theFeature] = aNewSet;
+ myModified[theFeature] = aNewSet;
#ifdef DEB_UPDATE
if (theReason.get()) {
//std::cout<<"*** Add modified "<<theFeature->name()
}
}
}
- // 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");
#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);
const std::set<ObjectPtr>& anObjs = aMsg->objects();
std::set<ObjectPtr>::const_iterator anObjIter = anObjs.cbegin();
+ std::list<ObjectPtr> aFeatures, aResults;
for(; anObjIter != anObjs.cend(); anObjIter++) {
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);
+ aFeatures.push_back(*anObjIter);
} else {
- ModelAPI_EventCreator::get()->sendUpdated(*anObjIter, kRedisplayEvent);
+ aResults.push_back(*anObjIter);
}
}
}
+ ModelAPI_EventCreator::get()->sendUpdated(aFeatures, kUpdatedEvent);
+ ModelAPI_EventCreator::get()->sendUpdated(aResults, kRedisplayEvent);
return;
}
if (theMessage->eventID() == kUpdatedEvent) {
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;
+ 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> >&
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::map<std::shared_ptr<ModelAPI_Feature>, std::set<std::shared_ptr<ModelAPI_Feature> > >::
continue;
}
std::set<std::shared_ptr<ModelAPI_Feature> >::iterator aReasons;
- for(aReasons = aFeature->second.begin(); aReasons != aFeature->second.end(); 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)
+ // 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
}
if (anActiveDoc.get() && aCurrent.get() && aCurrent->data()->isValid()) {
- if (anActiveDoc->currentFeature(false) != aCurrent)
+ 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()) {
}
}
-// 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);
// update the sketch plane before the sketch sub-elements are recomputed
// (otherwise sketch will update plane, modify subs, after executed, but with old subs edges)
- if (aIsModified && theFeature->getKind() == "Sketch") {
+ if (aIsModified && theFeature->getKind() == "Sketch") {
#ifdef DEB_UPDATE
- std::cout<<"****** Update sketch args "<<theFeature->name()<<std::endl;
+ std::cout << "****** Update sketch args " << theFeature->name() << std::endl;
#endif
- AttributeSelectionPtr anExtSel = theFeature->selection("External");
- if (anExtSel.get()) {
- ResultPtr aContext = anExtSel->context();
- if (aContext.get() && aContext->document().get()) {
- FeaturePtr anExtBase = aContext->document()->feature(aContext);
- if (anExtBase.get()) {
- processFeature(anExtBase);
+ AttributeSelectionPtr anExtSel = theFeature->selection("External");
+ if (anExtSel.get()) {
+ ResultPtr aContext = anExtSel->context();
+ if (aContext.get() && aContext->document().get()) {
+ FeaturePtr anExtBase = aContext->document()->feature(aContext);
+ if (anExtBase.get()) {
+ processFeature(anExtBase);
+ }
+ std::shared_ptr<GeomDataAPI_Point> anOrigin =
+ std::dynamic_pointer_cast<GeomDataAPI_Point>(theFeature->attribute("Origin"));
+ double anOX = anOrigin->x(), anOY = anOrigin->y(), anOZ = anOrigin->z();
+ std::shared_ptr<GeomDataAPI_Dir> aDir =
+ std::dynamic_pointer_cast<GeomDataAPI_Dir>(theFeature->attribute("DirX"));
+ double aDX = aDir->x(), aDY = aDir->y(), aDZ = aDir->z();
+ std::shared_ptr<GeomDataAPI_Dir> aNorm =
+ std::dynamic_pointer_cast<GeomDataAPI_Dir>(theFeature->attribute("Norm"));
+ double aNX = aNorm->x(), aNY = aNorm->y(), aNZ = aNorm->z();
+ // update sketch plane
+ updateArguments(theFeature);
+ theFeature->attributeChanged("External"); // to recompute origin, direction and normal
+ // check it is updated, so all must be changed
+ if (anOrigin->x() != anOX || anOrigin->y() != anOY || anOrigin->z() != anOZ ||
+ aDir->x() != aDX || aDir->y() != aDY || aDir->z() != aDZ ||
+ aNorm->x() != aNX || aNorm->y() != aNY || aNorm->z() != aNZ)
+ {
+ std::set<FeaturePtr> aWholeR;
+ allReasons(theFeature, aWholeR);
+ std::set<FeaturePtr>::iterator aRIter = aWholeR.begin();
+ for (; aRIter != aWholeR.end(); aRIter++) {
+ if ((*aRIter)->data()->selection("External").get())
+ (*aRIter)->attributeChanged("External");
+ }
+ }
}
}
}
- std::shared_ptr<GeomAPI_Shape> aShapeBefore = anExtSel->value();
- if (!aShapeBefore.get() && anExtSel->context()) aShapeBefore = anExtSel->context()->shape();
- updateArguments(theFeature);
- 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;
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
+ // 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
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() ||
+ theFeature->getKind() == "Sketch");
+ } 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
if (aSelAttr) {
ObjectPtr aContext = aSelAttr->context();
// update argument only if the referenced object is ready to use
- if (aContext.get() && !aContext->isDisabled() && !aSelAttr->isInvalid()) {
+ if (aContext.get() && !aContext->isDisabled()) {
if (isReason(theFeature, aContext)) {
if (!aSelAttr->update()) {
bool isObligatory = !aFactory->isNotObligatory(
aState = ModelAPI_StateInvalidArgument;
}
}
- } else if (aContext.get() || aSelAttr->isInvalid()) {
+ } else if (aContext.get()) {
// 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)
redisplayWithResults(theFeature, aState);
}
+// it is called on GUI edit of feature start
+// LCOV_EXCL_START
void Model_Update::updateStability(void* theSender)
{
static ModelAPI_ValidatorsFactory* aFactory = ModelAPI_Session::get()->validators();
}
}
}
+// LCOV_EXCL_STOP
void Model_Update::updateSelection(const std::set<std::shared_ptr<ModelAPI_Object> >& theObjects)
{