Fix for sketcher plane selection in complex operations like ExtrusionCut

[modules/shaper.git] / src / Model / Model_Events.cpp

diff --git a/src/Model/Model_Events.cpp b/src/Model/Model_Events.cpp
index fb5b650d1e068cfdaa3e22588461e65e9e19ba45..30d6e70a4321301f96d804b55120fcf018f7909d 100644 (file)
--- a/src/Model/Model_Events.cpp
+++ b/src/Model/Model_Events.cpp
@@ -1,8 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// 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<mailto:webmaster.salome@opencascade.com>
+//
 
 #include <Model_Events.h>
 #include <Events_Loop.h>
@@ -27,11 +41,10 @@ void Model_EventCreator::sendDeleted(const std::shared_ptr<ModelAPI_Document>& t
   Events_Loop::loop()->send(aMsg, true);
 }
 
-void Model_EventCreator::sendReordered(const std::shared_ptr<ModelAPI_Document>& theDoc,
-                                       const std::string& theGroup) const
+void Model_EventCreator::sendReordered(const std::shared_ptr<ModelAPI_Feature>& theReordered) const
 {
   std::shared_ptr<Model_OrderUpdatedMessage> aMsg(
-    new Model_OrderUpdatedMessage(theDoc, theGroup));
+    new Model_OrderUpdatedMessage(theReordered));
   Events_Loop::loop()->send(aMsg, true);
 }
 
@@ -64,7 +77,7 @@ std::shared_ptr<Events_MessageGroup> Model_ObjectUpdatedMessage::newEmpty()
 
 void Model_ObjectUpdatedMessage::Join(const std::shared_ptr<Events_MessageGroup>& theJoined)
 {
-  std::shared_ptr<Model_ObjectUpdatedMessage> aJoined = 
+  std::shared_ptr<Model_ObjectUpdatedMessage> aJoined =
     std::dynamic_pointer_cast<Model_ObjectUpdatedMessage>(theJoined);
   std::set<ObjectPtr>::iterator aFIter = aJoined->myObjects.begin();
   for (; aFIter != aJoined->myObjects.end(); aFIter++) {
@@ -95,7 +108,7 @@ const Events_ID Model_ObjectDeletedMessage::messageId()
 
 void Model_ObjectDeletedMessage::Join(const std::shared_ptr<Events_MessageGroup>& theJoined)
 {
-  std::shared_ptr<Model_ObjectDeletedMessage> aJoined = 
+  std::shared_ptr<Model_ObjectDeletedMessage> aJoined =
     std::dynamic_pointer_cast<Model_ObjectDeletedMessage>(theJoined);
   std::set<std::string>::iterator aGIter = aJoined->myGroups.begin();
   for (; aGIter != aJoined->myGroups.end(); aGIter++) {
@@ -105,17 +118,10 @@ void Model_ObjectDeletedMessage::Join(const std::shared_ptr<Events_MessageGroup>
 
 /////////////////////// REORDERED MESSAGE /////////////////////////////
 Model_OrderUpdatedMessage::Model_OrderUpdatedMessage(
-    const std::shared_ptr<ModelAPI_Document>& theDoc, const std::string& theGroup)
-    : ModelAPI_OrderUpdatedMessage(messageId(), 0),
-      myDoc(theDoc)
-{
-  if (!theGroup.empty())
-    myGroups.insert(theGroup);
-}
-
-std::shared_ptr<Events_MessageGroup> Model_OrderUpdatedMessage::newEmpty()
+    FeaturePtr theReordered, const void* theSender)
+    : ModelAPI_OrderUpdatedMessage(messageId(), theSender),
+    myReordered(theReordered)
 {
-  return std::shared_ptr<Model_OrderUpdatedMessage>(new Model_OrderUpdatedMessage(myDoc, ""));
 }
 
 const Events_ID Model_OrderUpdatedMessage::messageId()
@@ -123,13 +129,3 @@ const Events_ID Model_OrderUpdatedMessage::messageId()
   static Events_ID MY_ID = Events_Loop::eventByName(EVENT_ORDER_UPDATED);
   return MY_ID;
 }
-
-void Model_OrderUpdatedMessage::Join(const std::shared_ptr<Events_MessageGroup>& theJoined)
-{
-  std::shared_ptr<Model_OrderUpdatedMessage> aJoined = 
-    std::dynamic_pointer_cast<Model_OrderUpdatedMessage>(theJoined);
-  std::set<std::string>::iterator aGIter = aJoined->myGroups.begin();
-  for (; aGIter != aJoined->myGroups.end(); aGIter++) {
-    myGroups.insert(*aGIter);
-  }
-}