X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FModelAPI_Events.cpp;h=f1bcd1e26707e11949f962c8a4b94f87c7236da8;hb=bb4d0036dd0785056ab21fc237ec7fcc0870ae5f;hp=c660afca2965748dd5c759be5b64ae5ba3e4ed73;hpb=5c59bf6725e7e4855b5ca956475d705e2d5b014c;p=modules%2Fshaper.git diff --git a/src/ModelAPI/ModelAPI_Events.cpp b/src/ModelAPI/ModelAPI_Events.cpp index c660afca2..f1bcd1e26 100644 --- a/src/ModelAPI/ModelAPI_Events.cpp +++ b/src/ModelAPI/ModelAPI_Events.cpp @@ -1,4 +1,4 @@ -// 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 @@ -12,51 +12,47 @@ // // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include #include +#include + +//#define DEBUG_OBJECT_MOVED_MESSAGE +#ifdef DEBUG_OBJECT_MOVED_MESSAGE +#include +#endif + ModelAPI_ObjectUpdatedMessage::ModelAPI_ObjectUpdatedMessage(const Events_ID theID, const void* theSender) : Events_MessageGroup(theID, theSender) -{ - -} +{} ModelAPI_ObjectUpdatedMessage::~ModelAPI_ObjectUpdatedMessage() -{ - -} +{} ModelAPI_ObjectDeletedMessage::ModelAPI_ObjectDeletedMessage(const Events_ID theID, const void* theSender) : Events_MessageGroup(theID, theSender) -{ - -} +{} ModelAPI_ObjectDeletedMessage::~ModelAPI_ObjectDeletedMessage() -{ - -} +{} ModelAPI_OrderUpdatedMessage::ModelAPI_OrderUpdatedMessage(const Events_ID theID, const void* theSender) : Events_Message(theID, theSender) -{ - -} +{} ModelAPI_OrderUpdatedMessage::~ModelAPI_OrderUpdatedMessage() -{ - -} +{} +// used by GUI only +// LCOV_EXCL_START ModelAPI_FeatureStateMessage::ModelAPI_FeatureStateMessage(const Events_ID theID, const void* theSender) : Events_Message(theID, theSender) @@ -65,9 +61,7 @@ ModelAPI_FeatureStateMessage::ModelAPI_FeatureStateMessage(const Events_ID theID } ModelAPI_FeatureStateMessage::~ModelAPI_FeatureStateMessage() -{ - -} +{} std::shared_ptr ModelAPI_FeatureStateMessage::feature() const { @@ -106,7 +100,7 @@ std::list ModelAPI_FeatureStateMessage::features() const } return result; } - +// LCOV_EXCL_STOP ModelAPI_DocumentCreatedMessage::ModelAPI_DocumentCreatedMessage( const Events_ID theID, const void* theSender) @@ -233,14 +227,10 @@ const std::list >& ModelAPI_ComputePositionsMessage::positio ModelAPI_ObjectRenamedMessage::ModelAPI_ObjectRenamedMessage(const Events_ID theID, const void* theSender) : Events_Message(theID, theSender) -{ - -} +{} ModelAPI_ObjectRenamedMessage::~ModelAPI_ObjectRenamedMessage() -{ - -} +{} void ModelAPI_ObjectRenamedMessage::send(ObjectPtr theObject, const std::string& theOldName, @@ -288,14 +278,10 @@ void ModelAPI_ObjectRenamedMessage::setNewName(const std::string& theNewName) ModelAPI_ReplaceParameterMessage::ModelAPI_ReplaceParameterMessage(const Events_ID theID, const void* theSender) : Events_Message(theID, theSender) -{ - -} +{} ModelAPI_ReplaceParameterMessage::~ModelAPI_ReplaceParameterMessage() -{ - -} +{} void ModelAPI_ReplaceParameterMessage::send(ObjectPtr theObject, const void* theSender) @@ -322,12 +308,10 @@ ModelAPI_SolverFailedMessage::ModelAPI_SolverFailedMessage(const Events_ID theID const void* theSender) : Events_Message(theID, theSender), myDOF(-1) -{ -} +{} ModelAPI_SolverFailedMessage::~ModelAPI_SolverFailedMessage() -{ -} +{} void ModelAPI_SolverFailedMessage::setObjects(const std::set& theObjects) { @@ -338,3 +322,63 @@ const std::set& ModelAPI_SolverFailedMessage::objects() const { return myObjects; } + + +// ===== ModelAPI_ObjectMovedMessage ===== +ModelAPI_ObjectMovedMessage::ModelAPI_ObjectMovedMessage(const void* theSender) + : Events_Message(Events_Loop::eventByName(EVENT_OBJECT_MOVED), theSender) +{} + +void ModelAPI_ObjectMovedMessage::setMovedObject(const ObjectPtr& theMovedObject) +{ + myMovedObject = theMovedObject; + myMovedAttribute = AttributePtr(); +} + +void ModelAPI_ObjectMovedMessage::setMovedAttribute(const AttributePtr& theMovedAttribute) +{ + myMovedAttribute = theMovedAttribute; + myMovedObject = ObjectPtr(); +} + +void ModelAPI_ObjectMovedMessage::setOriginalPosition(double theX, double theY) +{ + myOriginalPosition = std::shared_ptr(new GeomAPI_Pnt2d(theX, theY)); +#ifdef DEBUG_OBJECT_MOVED_MESSAGE + std::cout << "setOriginalPosition: " << myOriginalPosition->x() << ", " + << myOriginalPosition->y() << std::endl; +#endif +} + +void ModelAPI_ObjectMovedMessage::setOriginalPosition( + const std::shared_ptr& thePoint) +{ + myOriginalPosition = thePoint; +#ifdef DEBUG_OBJECT_MOVED_MESSAGE + std::cout << "setOriginalPosition: " << myOriginalPosition->x() << ", " + << myOriginalPosition->y() << std::endl; +#endif +} + +void ModelAPI_ObjectMovedMessage::setCurrentPosition(double theX, double theY) +{ + myCurrentPosition = std::shared_ptr(new GeomAPI_Pnt2d(theX, theY)); +#ifdef DEBUG_OBJECT_MOVED_MESSAGE + std::cout << "setCurrentPosition: " << myCurrentPosition->x() << ", " << myCurrentPosition->y() + << ", myCurrentPosition - myOriginalPosition: " + << myCurrentPosition->x() - myOriginalPosition->x() << ", " + << myCurrentPosition->y() - myOriginalPosition->y() << std::endl; +#endif +} + +void ModelAPI_ObjectMovedMessage::setCurrentPosition( + const std::shared_ptr& thePoint) +{ + myCurrentPosition = thePoint; +#ifdef DEBUG_OBJECT_MOVED_MESSAGE + std::cout << "setCurrentPosition: " << myCurrentPosition->x() << ", " << myCurrentPosition->y() + << ", myCurrentPosition - myOriginalPosition: " + << myCurrentPosition->x() - myOriginalPosition->x() << ", " + << myCurrentPosition->y() - myOriginalPosition->y() << std::endl; +#endif +}