-// 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_Session.h>
#include <Model_Application.h>
#include <Model_Events.h>
#include <Model_Validator.h>
+#include <Model_FiltersFactory.h>
#include <ModelAPI_Events.h>
#include <Events_Loop.h>
#include <Events_InfoMessage.h>
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<Events_Message> aStartedMsg
{
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);
}
{
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, suppress the warnings about
return ROOT_DOC->isModified();
}
+void Model_Session::clearUndos()
+{
+ ROOT_DOC->clearUndos();
+}
+
bool Model_Session::canUndo()
{
return ROOT_DOC->canUndo();
{
myPluginsInfoLoaded = false;
myCheckTransactions = true;
- myOperationAttachedToNext = false;
ModelAPI_Session::setSession(std::shared_ptr<ModelAPI_Session>(this));
// register the configuration reading listener
Events_Loop* aLoop = Events_Loop::loop();
}
}
} 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<ModelAPI_ObjectDeletedMessage> aDeleted =
+ std::dynamic_pointer_cast<ModelAPI_ObjectDeletedMessage>(theMessage);
+ std::list<std::shared_ptr<ModelAPI_Document> > allOpened =
+ Model_Session::allOpenedDocuments();
+ std::list<std::pair<std::shared_ptr<ModelAPI_Document>, std::string>>::const_iterator
+ aGIter = aDeleted->groups().cbegin();
+ for (; !aIsActual && aGIter != aDeleted->groups().cend(); aGIter++) {
+ std::list<std::shared_ptr<ModelAPI_Document> >::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) {
return aFactory;
}
+ModelAPI_FiltersFactory* Model_Session::filters()
+{
+ static Model_FiltersFactory* aFactory = new Model_FiltersFactory;
+ return aFactory;
+}
+
int Model_Session::transactionID()
{
return ROOT_DOC->transactionID();