X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_ResultBody.h;h=8da264eec6f52ea54597172c561a3715ec7ad9c3;hb=6268ce56824c1df106da799af34f4575f247061a;hp=6526b9d554971e0e60dd80fb2a57d81661882d8d;hpb=7fbaddcd99f065a375775e2c3547ad93a5dd8c70;p=modules%2Fshaper.git diff --git a/src/Model/Model_ResultBody.h b/src/Model/Model_ResultBody.h index 6526b9d55..8da264eec 100644 --- a/src/Model/Model_ResultBody.h +++ b/src/Model/Model_ResultBody.h @@ -1,3 +1,5 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + // File: Model_ResultBody.h // Created: 08 Jul 2014 // Author: Mikhail PONIKAROV @@ -28,69 +30,71 @@ class Model_ResultBody : public ModelAPI_ResultBody std::vector myBuilders; public: /// Stores the shape (called by the execution method). - MODEL_EXPORT virtual void store(const boost::shared_ptr& theShape); + MODEL_EXPORT virtual void store(const std::shared_ptr& theShape); /// Stores the generated shape (called by the execution method). - MODEL_EXPORT virtual void storeGenerated(const boost::shared_ptr& theFromShape, - const boost::shared_ptr& theToShape); + MODEL_EXPORT virtual void storeGenerated(const std::shared_ptr& theFromShape, + const std::shared_ptr& theToShape); /// Stores the modified shape (called by the execution method). - MODEL_EXPORT virtual void storeModified(const boost::shared_ptr& theOldShape, - const boost::shared_ptr& theNewShape); + MODEL_EXPORT virtual void storeModified(const std::shared_ptr& theOldShape, + const std::shared_ptr& theNewShape); /// Returns the shape-result produced by this feature - MODEL_EXPORT virtual boost::shared_ptr shape(); + MODEL_EXPORT virtual std::shared_ptr shape(); /// Records the subshape newShape which was generated during a topological construction. /// As an example, consider the case of a face generated in construction of a box. - MODEL_EXPORT virtual void generated(const boost::shared_ptr& theNewShape, - const int theTag = 1); + MODEL_EXPORT virtual void generated(const std::shared_ptr& theNewShape, + const std::string& theName, const int theTag = 1); /// Records the shape newShape which was generated from the shape oldShape during a topological /// construction. As an example, consider the case of a face generated from an edge in /// construction of a prism. - MODEL_EXPORT virtual void generated(const boost::shared_ptr& theOldShape, - const boost::shared_ptr& theNewShape, const int theTag = 1); + MODEL_EXPORT virtual void generated(const std::shared_ptr& theOldShape, + const std::shared_ptr& theNewShape, const std::string& theName, const int theTag = 1); /// Records the shape newShape which is a modification of the shape oldShape. /// As an example, consider the case of a face split or merged in a Boolean operation. - MODEL_EXPORT virtual void modified(const boost::shared_ptr& theOldShape, - const boost::shared_ptr& theNewShape, const int theTag = 1); + MODEL_EXPORT virtual void modified(const std::shared_ptr& theOldShape, + const std::shared_ptr& theNewShape, const std::string& theName, const int theTag = 1); /// Records the shape oldShape which was deleted from the current label. /// As an example, consider the case of a face removed by a Boolean operation. - MODEL_EXPORT virtual void deleted(const boost::shared_ptr& theOldShape, + MODEL_EXPORT virtual void deleted(const std::shared_ptr& theOldShape, const int theTag = 1); /// load deleted shapes MODEL_EXPORT virtual void loadDeletedShapes (GeomAlgoAPI_MakeShape* theMS, - boost::shared_ptr theShapeIn, + std::shared_ptr theShapeIn, const int theKindOfShape, const int theTag); /// load and orient modified shapes MODEL_EXPORT virtual void loadAndOrientModifiedShapes ( GeomAlgoAPI_MakeShape* theMS, - boost::shared_ptr theShapeIn, + std::shared_ptr theShapeIn, const int theKindOfShape, const int theTag, + const std::string& theName, GeomAPI_DataMapOfShapeShape& theSubShapes); /// load and orient generated shapes MODEL_EXPORT virtual void loadAndOrientGeneratedShapes ( GeomAlgoAPI_MakeShape* theMS, - boost::shared_ptr theShapeIn, + std::shared_ptr theShapeIn, const int theKindOfShape, const int theTag, + const std::string& theName, GeomAPI_DataMapOfShapeShape& theSubShapes); - /// load shapes of the first level (to be used during shape import) - MODEL_EXPORT virtual void loadFirstLevel(boost::shared_ptr theShape, int& theTag); + /// Loads shapes of the first level (to be used during shape import) + MODEL_EXPORT virtual void loadFirstLevel(std::shared_ptr theShape, const std::string& theName, int& theTag); - /// load disconnected edges - MODEL_EXPORT virtual void loadDisconnectedEdges(boost::shared_ptr theShape, int& theTag); + /// Loads disconnected edges + MODEL_EXPORT virtual void loadDisconnectedEdges(std::shared_ptr theShape, const std::string& theName, int& theTag); - /// load disconnected vetexes - MODEL_EXPORT virtual void loadDisconnectedVertexes(boost::shared_ptr theShape, int& theTag); + /// Loads disconnected vetexes + MODEL_EXPORT virtual void loadDisconnectedVertexes(std::shared_ptr theShape, const std::string& theName, int& theTag); /// Removes the stored builders MODEL_EXPORT virtual ~Model_ResultBody(); @@ -105,6 +109,13 @@ protected: /// Returns (creates if necessary) the builder created on the needed tag of sub-label TNaming_Builder* builder(const int theTag); +private: + /// Loads shapes of the next level (to be used during shape import) + void loadNextLevels(std::shared_ptr theShape, const std::string& theName, int& theTag); + + /// builds name for the shape kept at the specified tag + void buildName(const int theTag, const std::string& theName); + friend class Model_Document; };