X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Document.cpp;h=2913075901a1c12bf6c05823643c786bb872ffa2;hb=f8f03f6e3b092381922b2703670ce57440714839;hp=e5c87013ede6a926641a0f41b1c82a0c4fa167aa;hpb=47665e7c3b12557e119de16b72514180dc0d6b07;p=modules%2Fshaper.git diff --git a/src/Model/Model_Document.cpp b/src/Model/Model_Document.cpp index e5c87013e..291307590 100644 --- a/src/Model/Model_Document.cpp +++ b/src/Model/Model_Document.cpp @@ -171,7 +171,8 @@ bool Model_Document::load(const char* theFileName, DocumentPtr theThis) 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; } @@ -257,8 +258,11 @@ void Model_Document::close(const bool theForever) // close all subs const std::set aSubs = subDocuments(true); std::set::iterator aSubIter = aSubs.begin(); - for (; aSubIter != aSubs.end(); aSubIter++) - subDoc(*aSubIter)->close(theForever); + for (; aSubIter != aSubs.end(); aSubIter++) { + std::shared_ptr 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::get())->setCheckTransactions(false); @@ -324,7 +328,6 @@ bool Model_Document::finishOperation() 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 @@ -424,9 +427,14 @@ bool Model_Document::canUndo() // check other subs contains operation that can be undoed const std::set aSubs = subDocuments(true); std::set::iterator aSubIter = aSubs.begin(); - for (; aSubIter != aSubs.end(); aSubIter++) - if (subDoc(*aSubIter)->canUndo()) - return true; + for (; aSubIter != aSubs.end(); aSubIter++) { + std::shared_ptr aSub = subDoc(*aSubIter); + if (aSub->myObjs) {// if it was not closed before + if (aSub->canUndo()) + return true; + } + } + return false; } @@ -445,14 +453,17 @@ void Model_Document::undoInternal(const bool theWithSubs, const bool theSynchron // undo for all subs const std::set aSubs = subDocuments(true); std::set::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()); } } @@ -468,9 +479,12 @@ bool Model_Document::canRedo() // check other subs contains operation that can be redoed const std::set aSubs = subDocuments(true); std::set::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; } @@ -490,10 +504,10 @@ void Model_Document::redo() 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 Model_Document::undoList() const @@ -545,10 +559,10 @@ FeaturePtr Model_Document::addFeature(std::string theID, const bool theMakeCurre 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 if (theMakeCurrent) // after all this feature stays in the document, so make it current - setCurrentFeature(aFeature, false); + aDocToAdd->setCurrentFeature(aFeature, false); } else { // feature must be executed // no creation event => updater not working, problem with remove part aFeature->execute(); @@ -566,14 +580,6 @@ void Model_Document::refsToFeature(FeaturePtr theFeature, 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( - object(ModelAPI_Feature::group(), aCurrentIndex - 1)), false); - } - } myObjs->removeFeature(theFeature); } @@ -636,6 +642,8 @@ int Model_Document::size(const std::string& theGroupID) std::shared_ptr Model_Document::currentFeature(const bool theVisible) { + if (!myObjs) // on close document feature destruction it may call this method + return std::shared_ptr(); TDF_Label aRefLab = generalLabel().FindChild(TAG_CURRENT_FEATURE); Handle(TDF_Reference) aRef; if (aRefLab.FindAttribute(TDF_Reference::GetID(), aRef)) { @@ -654,32 +662,47 @@ std::shared_ptr Model_Document::currentFeature(const bool theV void Model_Document::setCurrentFeature(std::shared_ptr 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(theCurrent); + if (!aMain.get()) { + // if feature nests into compisite feature, make the composite feature as current + const std::set& aRefsToMe = theCurrent->data()->refsToMe(); + std::set::const_iterator aRefToMe = aRefsToMe.begin(); + for(; aRefToMe != aRefsToMe.end(); aRefToMe++) { + CompositeFeaturePtr aComposite = + std::dynamic_pointer_cast((*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& aRefsToMe = theCurrent->data()->refsToMe(); - std::set::const_iterator aRefToMe = aRefsToMe.begin(); - for(; aRefToMe != aRefsToMe.end(); aRefToMe++) { - CompositeFeaturePtr aComposite = - std::dynamic_pointer_cast((*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 aData = std::static_pointer_cast(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; @@ -692,12 +715,9 @@ void Model_Document::setCurrentFeature(std::shared_ptr theCurr 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(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(); @@ -706,7 +726,9 @@ void Model_Document::setCurrentFeature(std::shared_ptr theCurr 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 @@ -716,7 +738,23 @@ void Model_Document::setCurrentFeature(std::shared_ptr theCurr 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 @@ -792,3 +830,8 @@ ResultPtr Model_Document::findByName(const std::string theName) { return myObjs->findByName(theName); } + +std::list > Model_Document::allFeatures() +{ + return myObjs->allFeatures(); +}