setCurrentFeature(currentFeature(false), false);
aSession->setCheckTransactions(true);
aSession->setActiveDocument(Model_Session::get()->moduleDocument(), false);
- aSession->setActiveDocument(anApp->getDocument(myID), true);
+ // this is done in Part result "activate", so no needed here. Causes not-blue active part.
+ // aSession->setActiveDocument(anApp->getDocument(myID), true);
}
return !isError;
}
// close all subs
const std::set<std::string> aSubs = subDocuments(true);
std::set<std::string>::iterator aSubIter = aSubs.begin();
- for (; aSubIter != aSubs.end(); aSubIter++)
- subDoc(*aSubIter)->close(theForever);
+ for (; aSubIter != aSubs.end(); aSubIter++) {
+ std::shared_ptr<Model_Document> aSub = subDoc(*aSubIter);
+ if (aSub->myObjs) // if it was not closed before
+ aSub->close(theForever);
+ }
// close for thid document needs no transaction in this document
std::static_pointer_cast<Model_Session>(Model_Session::get())->setCheckTransactions(false);
aLoop->flush(Events_Loop::eventByName(EVENT_OBJECT_CREATED));
aLoop->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
aLoop->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
- aLoop->flush(Events_Loop::eventByName(EVENT_OBJECT_TOHIDE));
aLoop->flush(Events_Loop::eventByName(EVENT_OBJECT_DELETED));
// this must be here just after everything is finished but before real transaction stop
// to avoid messages about modifications outside of the transaction
// check other subs contains operation that can be undoed
const std::set<std::string> aSubs = subDocuments(true);
std::set<std::string>::iterator aSubIter = aSubs.begin();
- for (; aSubIter != aSubs.end(); aSubIter++)
- if (subDoc(*aSubIter)->canUndo())
- return true;
+ for (; aSubIter != aSubs.end(); aSubIter++) {
+ std::shared_ptr<Model_Document> aSub = subDoc(*aSubIter);
+ if (aSub->myObjs) {// if it was not closed before
+ if (aSub->canUndo())
+ return true;
+ }
+ }
+
return false;
}
// undo for all subs
const std::set<std::string> aSubs = subDocuments(true);
std::set<std::string>::iterator aSubIter = aSubs.begin();
- for (; aSubIter != aSubs.end(); aSubIter++)
+ for (; aSubIter != aSubs.end(); aSubIter++) {
+ if (!subDoc(*aSubIter)->myObjs)
+ continue;
subDoc(*aSubIter)->undoInternal(theWithSubs, theSynchronize);
+ }
}
// after redo of all sub-documents to avoid updates on not-modified data (issue 370)
if (theSynchronize) {
+ myObjs->synchronizeFeatures(true, true, isRoot());
// update the current features status
setCurrentFeature(currentFeature(false), false);
- myObjs->synchronizeFeatures(true, true, isRoot());
}
}
// check other subs contains operation that can be redoed
const std::set<std::string> aSubs = subDocuments(true);
std::set<std::string>::iterator aSubIter = aSubs.begin();
- for (; aSubIter != aSubs.end(); aSubIter++)
+ for (; aSubIter != aSubs.end(); aSubIter++) {
+ if (!subDoc(*aSubIter)->myObjs)
+ continue;
if (subDoc(*aSubIter)->canRedo())
return true;
+ }
return false;
}
for (; aSubIter != aSubs.end(); aSubIter++)
subDoc(*aSubIter)->redo();
- // update the current features status
- setCurrentFeature(currentFeature(false), false);
// after redo of all sub-documents to avoid updates on not-modified data (issue 370)
myObjs->synchronizeFeatures(true, true, isRoot());
+ // update the current features status
+ setCurrentFeature(currentFeature(false), false);
}
std::list<std::string> Model_Document::undoList() const
myTransactions.rbegin()->myId = theId;
}
-FeaturePtr Model_Document::addFeature(std::string theID)
+FeaturePtr Model_Document::addFeature(std::string theID, const bool theMakeCurrent)
{
std::shared_ptr<Model_Session> aSession =
std::dynamic_pointer_cast<Model_Session>(ModelAPI_Session::get());
aDocToAdd = this;
}
if (aFeature) {
- aDocToAdd->myObjs->addFeature(aFeature, currentFeature(false));
+ aDocToAdd->myObjs->addFeature(aFeature, aDocToAdd->currentFeature(false));
if (!aFeature->isAction()) { // do not add action to the data model
- setCurrentFeature(aFeature, false); // after all this feature stays in the document, so make it current
+ if (theMakeCurrent) // after all this feature stays in the document, so make it current
+ aDocToAdd->setCurrentFeature(aFeature, false);
} else { // feature must be executed
// no creation event => updater not working, problem with remove part
aFeature->execute();
void Model_Document::removeFeature(FeaturePtr theFeature)
{
- // if this feature is current, make the current the previous feature
- if (theFeature == currentFeature(false)) {
- int aCurrentIndex = index(theFeature);
- if (aCurrentIndex != -1) {
- setCurrentFeature(std::dynamic_pointer_cast<ModelAPI_Feature>(
- object(ModelAPI_Feature::group(), aCurrentIndex - 1)), false);
- }
- }
myObjs->removeFeature(theFeature);
}
std::shared_ptr<ModelAPI_Feature> Model_Document::currentFeature(const bool theVisible)
{
+ if (!myObjs) // on close document feature destruction it may call this method
+ return std::shared_ptr<ModelAPI_Feature>();
TDF_Label aRefLab = generalLabel().FindChild(TAG_CURRENT_FEATURE);
Handle(TDF_Reference) aRef;
if (aRefLab.FindAttribute(TDF_Reference::GetID(), aRef)) {
void Model_Document::setCurrentFeature(std::shared_ptr<ModelAPI_Feature> theCurrent,
const bool theVisible)
{
+ // blocks the flush signals to avoid each objects visualization in the viewer
+ // they should not be shown once after all modifications are performed
+ Events_Loop* aLoop = Events_Loop::loop();
+ bool isActive = aLoop->activateFlushes(false);
+
TDF_Label aRefLab = generalLabel().FindChild(TAG_CURRENT_FEATURE);
+ CompositeFeaturePtr aMain; // main feature that may nest the new current
if (theCurrent.get()) {
- /*
- if (theVisible) { // make features below which are not in history also enabled: sketch subs
- FeaturePtr aNext = myObjs->nextFeature(theCurrent);
- for (; aNext.get(); aNext = myObjs->nextFeature(theCurrent)) {
- if (aNext->isInHistory()) {
- break; // next in history is not needed
- } else { // next not in history is good for making current
- theCurrent = aNext;
+ aMain = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(theCurrent);
+ if (!aMain.get()) {
+ // if feature nests into compisite feature, make the composite feature as current
+ const std::set<AttributePtr>& aRefsToMe = theCurrent->data()->refsToMe();
+ std::set<AttributePtr>::const_iterator aRefToMe = aRefsToMe.begin();
+ for(; aRefToMe != aRefsToMe.end(); aRefToMe++) {
+ CompositeFeaturePtr aComposite =
+ std::dynamic_pointer_cast<ModelAPI_CompositeFeature>((*aRefToMe)->owner());
+ if (aComposite.get() && aComposite->isSub(theCurrent)) {
+ aMain = aComposite;
+ break;
}
}
- }*/
- // if feature nests into compisite feature, make the composite feature as current
- const std::set<AttributePtr>& aRefsToMe = theCurrent->data()->refsToMe();
- std::set<AttributePtr>::const_iterator aRefToMe = aRefsToMe.begin();
- for(; aRefToMe != aRefsToMe.end(); aRefToMe++) {
- CompositeFeaturePtr aComposite =
- std::dynamic_pointer_cast<ModelAPI_CompositeFeature>((*aRefToMe)->owner());
- if (aComposite.get() && aComposite->isSub(theCurrent)) {
- theCurrent = aComposite;
- }
}
+ }
+ if (theVisible) { // make features below which are not in history also enabled: sketch subs
+ FeaturePtr aNext =
+ theCurrent.get() ? myObjs->nextFeature(theCurrent) : myObjs->firstFeature();
+ for (; aNext.get(); aNext = myObjs->nextFeature(theCurrent)) {
+ if (aNext->isInHistory()) {
+ break; // next in history is not needed
+ } else { // next not in history is good for making current
+ theCurrent = aNext;
+ }
+ }
+ }
+ if (theCurrent.get()) {
std::shared_ptr<Model_Data> aData = std::static_pointer_cast<Model_Data>(theCurrent->data());
- if (!aData.get()) return; // unknown case
+ if (!aData.get() || !aData->isValid()) {
+ aLoop->activateFlushes(isActive);
+ return;
+ }
TDF_Label aFeatureLabel = aData->label().Father();
Handle(TDF_Reference) aRef;
aRefLab.ForgetAttribute(TDF_Reference::GetID());
}
// make all features after this feature disabled in reversed order (to remove results without deps)
- static Events_Loop* aLoop = Events_Loop::loop();
static Events_ID aRedispEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
-
- // if the current feature is composite features, all sub-features also must be enabled
- CompositeFeaturePtr aCurComp = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(theCurrent);
-
+ static Events_ID aCreateEvent = Events_Loop::eventByName(EVENT_OBJECT_CREATED);
+ static Events_ID aDeleteEvent = aLoop->eventByName(EVENT_OBJECT_DELETED);
bool aPassed = false; // flag that the current object is already passed in cycle
FeaturePtr anIter = myObjs->lastFeature();
if (anIter == theCurrent) aPassed = true;
bool aDisabledFlag = !aPassed;
- if (aCurComp.get() && aCurComp->isSub(anIter))
+ if (aMain.get() && aMain->isSub(anIter)) // sub-elements of not-disabled feature are not disabled
+ aDisabledFlag = false;
+ if (anIter->getKind() == "Parameter") // parameters are always out of the history
aDisabledFlag = false;
if (anIter->setDisabled(aDisabledFlag)) {
// state of feature is changed => so feature become updated
ModelAPI_EventCreator::get()->sendUpdated(anIter, aRedispEvent /*, false*/);
}
}
+ // unblock the flush signals and up them after this
+ aLoop->activateFlushes(isActive);
+
+ aLoop->flush(aCreateEvent);
aLoop->flush(aRedispEvent);
+ aLoop->flush(aDeleteEvent);
+}
+
+void Model_Document::setCurrentFeatureUp()
+{
+ // on remove just go up for minimum step: highlight external objects in sketch causes
+ // problems if it is true: here and in "setCurrentFeature"
+ FeaturePtr aCurrent = currentFeature(false);
+ if (aCurrent.get()) { // if not, do nothing because null is the upper
+ FeaturePtr aPrev = myObjs->nextFeature(aCurrent, true);
+ setCurrentFeature(aPrev, false);
+ }
}
TDF_Label Model_Document::generalLabel() const
{
return myObjs->findByName(theName);
}
+
+std::list<std::shared_ptr<ModelAPI_Feature> > Model_Document::allFeatures()
+{
+ return myObjs->allFeatures();
+}
