X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Session.cpp;h=89f90ee4aff07fa7f3799e7dc193dab01b471437;hb=ad2e59f946f2fb5092b1e3de09bae96d6f9a3a10;hp=924783bb25e1955dd2ce3dbe4fda71cd65b2e054;hpb=b707e7178424958f7dc1ed87a0aabd813f671d88;p=modules%2Fshaper.git diff --git a/src/Model/Model_Session.cpp b/src/Model/Model_Session.cpp index 924783bb2..89f90ee4a 100644 --- a/src/Model/Model_Session.cpp +++ b/src/Model/Model_Session.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: Model_Session.cxx -// Created: 20 Mar 2014 -// Author: Mikhail PONIKAROV +// 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 +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// 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 +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include #include @@ -13,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -21,19 +35,27 @@ #include #include #include +#include #include #include #include +#include #include #include #include #include +#include +#include +#include + +#include + 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) @@ -50,11 +72,15 @@ 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); + 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 @@ -72,9 +98,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); } @@ -83,12 +113,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; @@ -144,6 +178,29 @@ std::list Model_Session::redoList() return ROOT_DOC->redoList(); } +ModelAPI_Plugin* Model_Session::getPlugin(const std::string& thePluginName) +{ + if (myPluginObjs.find(thePluginName) == myPluginObjs.end()) { + // before load the used plugins + if (myUsePlugins.find(thePluginName) != myUsePlugins.end()) { + std::string aUse = myUsePlugins[thePluginName]; + std::stringstream aUseStream(aUse); + std::string aPluginName; + while (std::getline(aUseStream, aPluginName, ',')) { + if (myPluginObjs.find(aPluginName) == myPluginObjs.end()) + getPlugin(aPluginName); + } + } + // load plugin library if not yet done + Config_ModuleReader::loadPlugin(thePluginName); + } + if (myPluginObjs.find(thePluginName) == myPluginObjs.end()) { + Events_InfoMessage("Model_Session", "Can not load plugin '%1'").arg(thePluginName).send(); + return NULL; + } + return myPluginObjs[thePluginName]; +} + FeaturePtr Model_Session::createFeature(std::string theFeatureID, Model_Document* theDocOwner) { if (this != myImpl) { @@ -157,26 +214,20 @@ FeaturePtr Model_Session::createFeature(std::string theFeatureID, Model_Document std::pair& aPlugin = myPlugins[theFeatureID]; // plugin and doc kind if (!aPlugin.second.empty() && aPlugin.second != theDocOwner->kind()) { Events_InfoMessage("Model_Session", - "Feature '%1' can be created only in document '%2' by the XML definition") - .arg(theFeatureID).arg(aPlugin.second).send(); + "Feature '%1' can be created only in document '%2' by the XML definition") + .arg(theFeatureID).arg(aPlugin.second).send(); return FeaturePtr(); } - myCurrentPluginName = aPlugin.first; - if (myPluginObjs.find(myCurrentPluginName) == myPluginObjs.end()) { - // load plugin library if not yet done - Config_ModuleReader::loadPlugin(myCurrentPluginName); - } - if (myPluginObjs.find(myCurrentPluginName) != myPluginObjs.end()) { - FeaturePtr aCreated = myPluginObjs[myCurrentPluginName]->createFeature(theFeatureID); + ModelAPI_Plugin* aPluginObj = getPlugin(aPlugin.first); + if (aPluginObj) { + FeaturePtr aCreated = aPluginObj->createFeature(theFeatureID); if (!aCreated) { - Events_InfoMessage("Model_Session", - "Can not initialize feature '%1' in plugin '%2'") - .arg(theFeatureID).arg(myCurrentPluginName).send(); + Events_InfoMessage("Model_Session", "Can not initialize feature '%1' in plugin '%2'") + .arg(theFeatureID).arg(aPlugin.first).send(); } return aCreated; } else { - Events_InfoMessage("Model_Session", - "Can not load plugin '%1'").arg(myCurrentPluginName).send(); + Events_InfoMessage("Model_Session", "Can not load plugin '%1'").arg(aPlugin.first).send(); } } else { Events_InfoMessage("Model_Session", @@ -251,7 +302,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 @@ -263,7 +314,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; @@ -277,7 +328,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 @@ -311,9 +362,9 @@ std::list > Model_Session::allOpenedDocuments return aResult; } -bool Model_Session::isLoadByDemand(const std::string theDocID) +bool Model_Session::isLoadByDemand(const std::string theDocID, const int theDocIndex) { - return Model_Application::getApplication()->isLoadByDemand(theDocID); + return Model_Application::getApplication()->isLoadByDemand(theDocID, theDocIndex); } std::shared_ptr Model_Session::copy( @@ -331,6 +382,50 @@ std::shared_ptr Model_Session::copy( aRT->SetRelocation(aSourceRoot, aTargetRoot); TDF_CopyTool::Copy(aDS, aRT); + // TODO: remove after fix in OCCT. + // All named shapes are stored in reversed order, so to fix this we reverse them back. + for(TDF_ChildIDIterator aChildIter(aTargetRoot, TNaming_NamedShape::GetID(), true); + aChildIter.More(); + aChildIter.Next()) { + Handle(TNaming_NamedShape) aNamedShape = + Handle(TNaming_NamedShape)::DownCast(aChildIter.Value()); + if (aNamedShape.IsNull()) { + continue; + } + + TopoDS_Shape aShape = aNamedShape->Get(); + if(aShape.IsNull() || aShape.ShapeType() != TopAbs_COMPOUND) { + continue; + } + + TNaming_Evolution anEvol = aNamedShape->Evolution(); + std::list > aShapePairs; // to store old and new shapes + for(TNaming_Iterator anIter(aNamedShape); anIter.More(); anIter.Next()) { + aShapePairs.push_back( + std::pair(anIter.OldShape(), anIter.NewShape())); + } + + // Add in reverse order. + TDF_Label aLabel = aNamedShape->Label(); + TNaming_Builder aBuilder(aLabel); + for(std::list >::iterator aPairsIter = + aShapePairs.begin(); + aPairsIter != aShapePairs.end(); + aPairsIter++) { + if (anEvol == TNaming_GENERATED) { + aBuilder.Generated(aPairsIter->first, aPairsIter->second); + } else if (anEvol == TNaming_MODIFY) { + aBuilder.Modify(aPairsIter->first, aPairsIter->second); + } else if (anEvol == TNaming_DELETE) { + aBuilder.Delete(aPairsIter->first); + } else if (anEvol == TNaming_PRIMITIVE) { + aBuilder.Generated(aPairsIter->second); + } else if (anEvol == TNaming_SELECTED) { + aBuilder.Select(aPairsIter->second, aPairsIter->first); + } + } + } + TDF_LabelList anEmptyUpdated; aNew->objects()->synchronizeFeatures(anEmptyUpdated, true, true, true, true); return aNew; @@ -340,7 +435,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(); @@ -351,6 +445,7 @@ Model_Session::Model_Session() aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_UPDATED), 0, true); aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_DELETED), 0, true); aLoop->registerListener(this, Events_Loop::eventByName(EVENT_VALIDATOR_LOADED)); + aLoop->registerListener(this, Events_Loop::eventByName(Config_PluginMessage::EVENT_ID())); } void Model_Session::processEvent(const std::shared_ptr& theMessage) @@ -358,6 +453,7 @@ void Model_Session::processEvent(const std::shared_ptr& theMessa static const Events_ID kFeatureEvent = Events_Loop::eventByName(Config_FeatureMessage::MODEL_EVENT()); static const Events_ID kValidatorEvent = Events_Loop::eventByName(EVENT_VALIDATOR_LOADED); + static const Events_ID kPluginEvent = Events_Loop::eventByName(Config_PluginMessage::EVENT_ID()); if (theMessage->eventID() == kFeatureEvent) { const std::shared_ptr aMsg = std::dynamic_pointer_cast(theMessage); @@ -379,10 +475,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 @@ -398,17 +501,56 @@ void Model_Session::processEvent(const std::shared_ptr& theMessa aMsg->parameters()); } } + } else if (theMessage->eventID() == kPluginEvent) { // plugin is started to load + std::shared_ptr aMsg = + std::dynamic_pointer_cast(theMessage); + if (aMsg.get()) { + myCurrentPluginName = aMsg->pluginId(); + if (!aMsg->uses().empty()) { + myUsePlugins[myCurrentPluginName] = aMsg->uses(); + } + } } 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; @@ -453,8 +595,7 @@ void Model_Session::registerPlugin(ModelAPI_Plugin* thePlugin) { myPluginObjs[myCurrentPluginName] = thePlugin; static Events_ID EVENT_LOAD = Events_Loop::loop()->eventByName(EVENT_PLUGIN_LOADED); - ModelAPI_EventCreator::get()->sendUpdated(ObjectPtr(), EVENT_LOAD); - Events_Loop::loop()->flush(EVENT_LOAD); + ModelAPI_EventCreator::get()->sendUpdated(ObjectPtr(), EVENT_LOAD, false); // If the plugin has an ability to process GUI events, register it Events_Listener* aListener = dynamic_cast(thePlugin); if (aListener) { @@ -471,7 +612,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 + bool 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(); + } + } +}