X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Session.cpp;h=de638bab6a9d6cac721c9273efa43682b00ee0a5;hb=ba71135a8b45672f032240b22086d4b17b7b0b97;hp=065e6276dbd5e8e95bc5ac4ba7ea445040af3ad6;hpb=8cb8790aab830dd91f7d6d3a549e5590c7c22d42;p=modules%2Fshaper.git diff --git a/src/Model/Model_Session.cpp b/src/Model/Model_Session.cpp index 065e6276d..de638bab6 100644 --- a/src/Model/Model_Session.cpp +++ b/src/Model/Model_Session.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2020 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 @@ -12,10 +12,9 @@ // // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -27,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -55,7 +55,7 @@ static Model_Session* myImpl = new Model_Session(); -// t oredirect all calls to the root document +// to redirect all calls to the root document #define ROOT_DOC std::dynamic_pointer_cast(moduleDocument()) bool Model_Session::load(const char* theFileName) @@ -72,11 +72,16 @@ bool Model_Session::save(const char* theFileName, std::list& theRes void Model_Session::closeAll() { Model_Application::getApplication()->deleteAllDocuments(); + static const Events_ID aDocChangeEvent = Events_Loop::eventByName(EVENT_DOCUMENT_CHANGED); + myCurrentDoc = NULL; + static std::shared_ptr aMsg(new Events_Message(aDocChangeEvent)); + Events_Loop::loop()->send(aMsg); + Events_Loop::loop()->flush(aDocChangeEvent); } void Model_Session::startOperation(const std::string& theId, const bool theAttachedToNested) { - myOperationAttachedToNext = theAttachedToNested; + myOperationAttachedToNext.push_back(theAttachedToNested); ROOT_DOC->startOperation(); ROOT_DOC->operationId(theId); static std::shared_ptr aStartedMsg @@ -94,9 +99,13 @@ void Model_Session::finishOperation() { setCheckTransactions(false); ROOT_DOC->finishOperation(); - if (myOperationAttachedToNext) { // twice, with nested - ROOT_DOC->finishOperation(); - myOperationAttachedToNext = false; + if (!myOperationAttachedToNext.empty()) { + while (myOperationAttachedToNext.back()) { + // with nested, the first transaction can not be attached + ROOT_DOC->finishOperation(); + myOperationAttachedToNext.pop_back(); + } + myOperationAttachedToNext.pop_back(); } setCheckTransactions(true); } @@ -105,12 +114,16 @@ void Model_Session::abortOperation() { setCheckTransactions(false); ROOT_DOC->abortOperation(); - if (myOperationAttachedToNext) { // twice, with nested - ROOT_DOC->abortOperation(); - myOperationAttachedToNext = false; + if (!myOperationAttachedToNext.empty()) { + while (myOperationAttachedToNext.back()) { + // with nested, the first transaction can not be attached + ROOT_DOC->abortOperation(); + myOperationAttachedToNext.pop_back(); + } + myOperationAttachedToNext.pop_back(); } setCheckTransactions(true); - // here the update mechanism may work after abort, so, supress the warnings about + // here the update mechanism may work after abort, so, suppress the warnings about // modifications outside of the transactions bool aWasCheck = myCheckTransactions; myCheckTransactions = false; @@ -239,6 +252,12 @@ std::shared_ptr Model_Session::moduleDocument() anApp->createDocument(0); // 0 is a root ID // creation of the root document is always outside of the transaction, so, avoid checking it setCheckTransactions(true); + if (!myCurrentDoc || !Model_Application::getApplication()->hasDocument(myCurrentDoc->id())) { + myCurrentDoc = moduleDocument(); + static std::shared_ptr aMsg( + new Events_Message(Events_Loop::eventByName(EVENT_DOCUMENT_CHANGED))); + Events_Loop::loop()->send(aMsg); + } } return anApp->rootDocument(); } @@ -256,8 +275,9 @@ bool Model_Session::hasModuleDocument() std::shared_ptr Model_Session::activeDocument() { - if (!myCurrentDoc || !Model_Application::getApplication()->hasDocument(myCurrentDoc->id())) - myCurrentDoc = moduleDocument(); + if (!myCurrentDoc || !Model_Application::getApplication()->hasDocument(myCurrentDoc->id())) { + return moduleDocument(); + } return myCurrentDoc; } @@ -290,7 +310,7 @@ void Model_Session::setActiveDocument( std::shared_ptr aPrevious = myCurrentDoc; myCurrentDoc = theDoc; if (theDoc.get() && theSendSignal) { - // this must be before the synchronisation call because features in PartSet lower than this + // this must be before the synchronization call because features in PartSet lower than this // part feature must be disabled and don't recomputed anymore (issue 1156, // translation feature is failed on activation of Part 2) if (isOperation()) { // do it only in transaction, not on opening of document @@ -302,7 +322,7 @@ void Model_Session::setActiveDocument( } } } - // syncronize the document: it may be just opened or opened but removed before + // synchronize the document: it may be just opened or opened but removed before std::shared_ptr aDoc = std::dynamic_pointer_cast(theDoc); if (aDoc.get()) { bool aWasChecked = myCheckTransactions; @@ -316,7 +336,7 @@ void Model_Session::setActiveDocument( new Events_Message(Events_Loop::eventByName(EVENT_DOCUMENT_CHANGED))); Events_Loop::loop()->send(aMsg); } - // make the current state correct and synchronised in the module and sub-documents + // make the current state correct and synchronized in the module and sub-documents if (isOperation()) { // do it only in transaction, not on opening of document if (myCurrentDoc == moduleDocument()) { // make the current feature the latest in root, in previous root current become also last @@ -335,9 +355,9 @@ std::list > Model_Session::allOpenedDocuments std::list > aResult; aResult.push_back(moduleDocument()); // add subs recursively - std::list >::iterator aDoc = aResult.begin(); - for(; aDoc != aResult.end(); aDoc++) { - DocumentPtr anAPIDoc = *aDoc; + std::list >::iterator aDocIt = aResult.begin(); + for(; aDocIt != aResult.end(); aDocIt++) { + DocumentPtr anAPIDoc = *aDocIt; std::shared_ptr aDoc = std::dynamic_pointer_cast(anAPIDoc); if (aDoc) { const std::set aSubs = aDoc->subDocuments(); @@ -350,7 +370,7 @@ std::list > Model_Session::allOpenedDocuments return aResult; } -bool Model_Session::isLoadByDemand(const std::string theDocID, const int theDocIndex) +bool Model_Session::isLoadByDemand(const std::wstring theDocID, const int theDocIndex) { return Model_Application::getApplication()->isLoadByDemand(theDocID, theDocIndex); } @@ -423,7 +443,6 @@ Model_Session::Model_Session() { myPluginsInfoLoaded = false; myCheckTransactions = true; - myOperationAttachedToNext = false; ModelAPI_Session::setSession(std::shared_ptr(this)); // register the configuration reading listener Events_Loop* aLoop = Events_Loop::loop(); @@ -464,10 +483,17 @@ void Model_Session::processEvent(const std::shared_ptr& theMessa if(aMsgAttr->isConcealment()) { validators()->registerConcealment(aMsgAttr->featureId(), aMsgAttr->attributeId()); } + if(aMsgAttr->isMainArgument()) { + validators()->registerMainArgument(aMsgAttr->featureId(), aMsgAttr->attributeId()); + } const std::list >& aCases = aMsgAttr->getCases(); if (!aCases.empty()) { validators()->registerCase(aMsgAttr->featureId(), aMsgAttr->attributeId(), aCases); } + if (aMsgAttr->isGeometricalSelection()) { + validators()->registerGeometricalSelection(aMsgAttr->featureId(), + aMsgAttr->attributeId()); + } } } // plugins information was started to load, so, it will be loaded @@ -493,16 +519,46 @@ void Model_Session::processEvent(const std::shared_ptr& theMessa } } } else { // create/update/delete - if (myCheckTransactions && !isOperation()) - Events_InfoMessage("Model_Session", - "Modification of data structure outside of the transaction").send(); + if (myCheckTransactions && !isOperation()) { + // check it is done in real opened document: 2958 + bool aIsActual = true; + static const Events_ID kDeletedEvent = Events_Loop::eventByName(EVENT_OBJECT_DELETED); + if (theMessage->eventID() == kDeletedEvent) { + aIsActual = false; + std::shared_ptr aDeleted = + std::dynamic_pointer_cast(theMessage); + std::list > allOpened = + Model_Session::allOpenedDocuments(); + std::list, std::string>>::const_iterator + aGIter = aDeleted->groups().cbegin(); + for (; !aIsActual && aGIter != aDeleted->groups().cend(); aGIter++) { + std::list >::iterator anOpened = allOpened.begin(); + for(; anOpened != allOpened.end(); anOpened++) { + if (aGIter->first == *anOpened) { + aIsActual = true; + break; + } + } + } + } + + if (aIsActual) + Events_InfoMessage("Model_Session", + "Modification of data structure outside of the transaction").send(); + } // if part is deleted, make the root as the current document (on undo of Parts creations) static const Events_ID kDeletedEvent = Events_Loop::eventByName(EVENT_OBJECT_DELETED); if (theMessage->eventID() == kDeletedEvent) { std::shared_ptr aDeleted = std::dynamic_pointer_cast(theMessage); - if (aDeleted && - aDeleted->groups().find(ModelAPI_ResultPart::group()) != aDeleted->groups().end()) + + std::list, std::string>>::const_iterator + aGIter = aDeleted->groups().cbegin(); + for (; aGIter != aDeleted->groups().cend(); aGIter++) { + if (aGIter->second == ModelAPI_ResultPart::group()) + break; + } + if (aGIter != aDeleted->groups().cend()) { // check that the current feature of the session is still the active Part (even disabled) bool aFound = false; @@ -564,7 +620,52 @@ ModelAPI_ValidatorsFactory* Model_Session::validators() return aFactory; } +ModelAPI_FiltersFactory* Model_Session::filters() +{ + static Model_FiltersFactory* aFactory = new Model_FiltersFactory; + return aFactory; +} + int Model_Session::transactionID() { return ROOT_DOC->transactionID(); } + +bool Model_Session::isAutoUpdateBlocked() +{ + Handle(Model_Application) anApp = Model_Application::getApplication(); + if (!anApp->hasRoot()) // when document is not yet created, do not create it by such simple call + return false; + return !ROOT_DOC->autoRecomutationState(); +} + +void Model_Session::blockAutoUpdate(const bool theBlock) +{ + bool aCurrentState = isAutoUpdateBlocked(); + if (aCurrentState != theBlock) { + // if there is no operation, start it to avoid modifications outside of transaction + bool isOperation = this->isOperation(); + if (!isOperation) + startOperation("Auto update"); + ROOT_DOC->setAutoRecomutationState(!theBlock); + static Events_Loop* aLoop = Events_Loop::loop(); + if (theBlock) { + static const Events_ID kAutoOff = aLoop->eventByName(EVENT_AUTOMATIC_RECOMPUTATION_DISABLE); + std::shared_ptr aMsg(new Events_Message(kAutoOff)); + aLoop->send(aMsg); + } else { + // if there is no operation, start it to avoid modifications outside of transaction + isOperation = this->isOperation(); + if (!isOperation) + startOperation("Auto update enabling"); + static const Events_ID kAutoOn = aLoop->eventByName(EVENT_AUTOMATIC_RECOMPUTATION_ENABLE); + std::shared_ptr aMsg(new Events_Message(kAutoOn)); + aLoop->send(aMsg); + } + if (!isOperation) { + finishOperation(); + // append this transaction to the previous one: don't need this separated operation in list + ROOT_DOC->appendTransactionToPrevious(); + } + } +}