X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Events.cpp;h=e113d3ae7f73b1cbcd66bce97a8dc37b41ff8172;hb=f36409774efce7c530518a1553946c9c76526fb9;hp=0d421704ba56c4eac5ecf8b8cafe0212d2a4ec83;hpb=b99cdc27de72cd0c87701ac053b99734f5965e11;p=modules%2Fshaper.git diff --git a/src/Model/Model_Events.cpp b/src/Model/Model_Events.cpp index 0d421704b..e113d3ae7 100644 --- a/src/Model/Model_Events.cpp +++ b/src/Model/Model_Events.cpp @@ -1,6 +1,22 @@ -// File: Model_Events.cxx -// Created: 10 Apr 2014 -// Author: Mikhail PONIKAROV +// Copyright (C) 2014-2017 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 @@ -12,19 +28,26 @@ Model_EventCreator MY_CREATOR; void Model_EventCreator::sendUpdated(const ObjectPtr& theObject, const Events_ID& theEvent, const bool isGroupped) const { - boost::shared_ptr aMsg( + std::shared_ptr aMsg( new Model_ObjectUpdatedMessage(theObject, theEvent)); Events_Loop::loop()->send(aMsg, isGroupped); } -void Model_EventCreator::sendDeleted(const boost::shared_ptr& theDoc, +void Model_EventCreator::sendDeleted(const std::shared_ptr& theDoc, const std::string& theGroup) const { - boost::shared_ptr aMsg( + 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); +} + Model_EventCreator::Model_EventCreator() { ModelAPI_EventCreator::set(this); @@ -35,26 +58,27 @@ Model_ObjectUpdatedMessage::Model_ObjectUpdatedMessage(const ObjectPtr& theObjec const Events_ID& theEvent) : ModelAPI_ObjectUpdatedMessage(theEvent, 0) { - if (theObject) + if (theObject) { myObjects.insert(theObject); + } } -std::set Model_ObjectUpdatedMessage::objects() const +const std::set& Model_ObjectUpdatedMessage::objects() const { return myObjects; } -boost::shared_ptr Model_ObjectUpdatedMessage::newEmpty() +std::shared_ptr Model_ObjectUpdatedMessage::newEmpty() { ObjectPtr anEmptyObject; - return boost::shared_ptr( + return std::shared_ptr( new Model_ObjectUpdatedMessage(anEmptyObject, eventID())); } -void Model_ObjectUpdatedMessage::Join(const boost::shared_ptr& theJoined) +void Model_ObjectUpdatedMessage::Join(const std::shared_ptr& theJoined) { - boost::shared_ptr aJoined = - boost::dynamic_pointer_cast(theJoined); + 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); @@ -63,17 +87,19 @@ void Model_ObjectUpdatedMessage::Join(const boost::shared_ptr& theDoc, const std::string& theGroup) - : ModelAPI_ObjectDeletedMessage(messageId(), 0), - myDoc(theDoc) + 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)); + } } -boost::shared_ptr Model_ObjectDeletedMessage::newEmpty() +std::shared_ptr Model_ObjectDeletedMessage::newEmpty() { - return boost::shared_ptr(new Model_ObjectDeletedMessage(myDoc, "")); + static const std::shared_ptr anEmpty; + return std::shared_ptr(new Model_ObjectDeletedMessage(anEmpty, "")); } const Events_ID Model_ObjectDeletedMessage::messageId() @@ -82,12 +108,36 @@ const Events_ID Model_ObjectDeletedMessage::messageId() return MY_ID; } -void Model_ObjectDeletedMessage::Join(const boost::shared_ptr& theJoined) +void Model_ObjectDeletedMessage::Join(const std::shared_ptr& theJoined) { - boost::shared_ptr aJoined = - boost::dynamic_pointer_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; +}