X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Events.cpp;h=ee80aabcc5f04b0d5eb9a6b31cf6cdf914c13269;hb=4bccf0ccd2f13dca7b9d16c59f427dea91c289fa;hp=fb94001b86aa83d13717f28861f40b63181da385;hpb=12621bb509825d0eb1fb0847a7f9c8011021ca5a;p=modules%2Fshaper.git diff --git a/src/Model/Model_Events.cpp b/src/Model/Model_Events.cpp index fb94001b8..ee80aabcc 100644 --- a/src/Model/Model_Events.cpp +++ b/src/Model/Model_Events.cpp @@ -1,6 +1,21 @@ -// File: Model_Events.cxx -// Created: 10 Apr 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 @@ -9,17 +24,42 @@ Model_EventCreator MY_CREATOR; /////////////////////// CREATOR ///////////////////////////// -void Model_EventCreator::sendUpdated( - const FeaturePtr& theFeature, const Events_ID& theEvent, const bool isGroupped) const +void Model_EventCreator::sendUpdated(const ObjectPtr& theObject, const Events_ID& theEvent, + const bool isGroupped) const { - Model_FeatureUpdatedMessage aMsg(theFeature, theEvent); + std::shared_ptr aMsg( + new Model_ObjectUpdatedMessage(theObject, theEvent)); Events_Loop::loop()->send(aMsg, isGroupped); } -void Model_EventCreator::sendDeleted( - const boost::shared_ptr& theDoc, const std::string& theGroup) const +void Model_EventCreator::sendUpdated(const std::list& theObjects, + const Events_ID& theEvent, const bool isGroupped) const { - Model_FeatureDeletedMessage aMsg(theDoc, theGroup); + if (theObjects.empty()) + return; + std::list::const_iterator anObj = theObjects.cbegin(); + std::shared_ptr aMsg( + new Model_ObjectUpdatedMessage(*anObj, theEvent)); + for(anObj++; anObj != theObjects.cend(); anObj++) { + std::shared_ptr aJoined( + new Model_ObjectUpdatedMessage(*anObj, theEvent)); + aMsg->Join(aJoined); + } + Events_Loop::loop()->send(aMsg, isGroupped); +} + +void Model_EventCreator::sendDeleted(const std::shared_ptr& theDoc, + const std::string& theGroup) const +{ + std::shared_ptr aMsg( + new Model_ObjectDeletedMessage(theDoc, theGroup)); + Events_Loop::loop()->send(aMsg, true); +} + +void Model_EventCreator::sendReordered(const std::shared_ptr& theReordered) const +{ + std::shared_ptr aMsg( + new Model_OrderUpdatedMessage(theReordered)); Events_Loop::loop()->send(aMsg, true); } @@ -29,58 +69,90 @@ Model_EventCreator::Model_EventCreator() } /////////////////////// UPDATED MESSAGE ///////////////////////////// -Model_FeatureUpdatedMessage::Model_FeatureUpdatedMessage( - const FeaturePtr& theFeature, - const Events_ID& theEvent) : ModelAPI_FeatureUpdatedMessage(theEvent, 0) +Model_ObjectUpdatedMessage::Model_ObjectUpdatedMessage(const ObjectPtr& theObject, + const Events_ID& theEvent) + : ModelAPI_ObjectUpdatedMessage(theEvent, 0) { - if (theFeature) myFeatures.insert(theFeature); + if (theObject) { + myObjects.insert(theObject); + } } -std::set Model_FeatureUpdatedMessage::features() const +const std::set& Model_ObjectUpdatedMessage::objects() const { - return myFeatures; + return myObjects; } -Events_MessageGroup* Model_FeatureUpdatedMessage::newEmpty() +std::shared_ptr Model_ObjectUpdatedMessage::newEmpty() { - FeaturePtr anEmptyFeature; - return new Model_FeatureUpdatedMessage(anEmptyFeature, eventID()); + ObjectPtr anEmptyObject; + return std::shared_ptr( + new Model_ObjectUpdatedMessage(anEmptyObject, eventID())); } -void Model_FeatureUpdatedMessage::Join(Events_MessageGroup& theJoined) +void Model_ObjectUpdatedMessage::Join(const std::shared_ptr& theJoined) { - Model_FeatureUpdatedMessage* aJoined = dynamic_cast(&theJoined); - std::set::iterator aFIter = aJoined->myFeatures.begin(); - for(; aFIter != aJoined->myFeatures.end(); aFIter++) { - myFeatures.insert(*aFIter); + std::shared_ptr aJoined = + std::dynamic_pointer_cast(theJoined); + std::set::iterator aFIter = aJoined->myObjects.begin(); + for (; aFIter != aJoined->myObjects.end(); aFIter++) { + myObjects.insert(*aFIter); } } /////////////////////// DELETED MESSAGE ///////////////////////////// -Model_FeatureDeletedMessage::Model_FeatureDeletedMessage( - const boost::shared_ptr& theDoc, const std::string& theGroup) - : ModelAPI_FeatureDeletedMessage(messageId(), 0), myDoc(theDoc) +Model_ObjectDeletedMessage::Model_ObjectDeletedMessage( + const std::shared_ptr& theDoc, const std::string& theGroup) + : ModelAPI_ObjectDeletedMessage(messageId(), 0) { - if (!theGroup.empty()) - myGroups.insert(theGroup); + if (!theGroup.empty()) { + myGroups.push_back( + std::pair, std::string>(theDoc, theGroup)); + } } -Events_MessageGroup* Model_FeatureDeletedMessage::newEmpty() +std::shared_ptr Model_ObjectDeletedMessage::newEmpty() { - return new Model_FeatureDeletedMessage(myDoc, ""); + static const std::shared_ptr anEmpty; + return std::shared_ptr(new Model_ObjectDeletedMessage(anEmpty, "")); } -const Events_ID Model_FeatureDeletedMessage::messageId() +const Events_ID Model_ObjectDeletedMessage::messageId() { - static Events_ID MY_ID = Events_Loop::eventByName(EVENT_FEATURE_DELETED); + static Events_ID MY_ID = Events_Loop::eventByName(EVENT_OBJECT_DELETED); return MY_ID; } -void Model_FeatureDeletedMessage::Join(Events_MessageGroup& theJoined) +void Model_ObjectDeletedMessage::Join(const std::shared_ptr& theJoined) { - Model_FeatureDeletedMessage* aJoined = dynamic_cast(&theJoined); - std::set::iterator aGIter = aJoined->myGroups.begin(); - for(; aGIter != aJoined->myGroups.end(); aGIter++) { - myGroups.insert(*aGIter); + std::shared_ptr aJoined = + std::dynamic_pointer_cast(theJoined); + + const std::list, std::string>>& aJGroups = + aJoined->groups(); + + std::list, std::string>>::iterator aGIter; + std::list, std::string>>::const_iterator aJIter; + for (aJIter = aJGroups.cbegin(); aJIter != aJGroups.cend(); aJIter++) { + for (aGIter = myGroups.begin(); aGIter != myGroups.end(); aGIter++) { + if (aGIter->first == aJIter->first && aGIter->second == aJIter->second) + break; // exists, so no need to insert + } + if (aGIter == myGroups.end()) + myGroups.push_back(*aJIter); } } + +/////////////////////// REORDERED MESSAGE ///////////////////////////// +Model_OrderUpdatedMessage::Model_OrderUpdatedMessage( + FeaturePtr theReordered, const void* theSender) + : ModelAPI_OrderUpdatedMessage(messageId(), theSender), + myReordered(theReordered) +{ +} + +const Events_ID Model_OrderUpdatedMessage::messageId() +{ + static Events_ID MY_ID = Events_Loop::eventByName(EVENT_ORDER_UPDATED); + return MY_ID; +}