X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_ResultBody.h;h=8da264eec6f52ea54597172c561a3715ec7ad9c3;hb=6268ce56824c1df106da799af34f4575f247061a;hp=f6174cdee1cb82798e836f80e67b954754e331e3;hpb=d9db5498b576854aae37ddf8c0bb6fceb264712e;p=modules%2Fshaper.git diff --git a/src/Model/Model_ResultBody.h b/src/Model/Model_ResultBody.h index f6174cdee..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 @@ -7,6 +9,8 @@ #include "Model.h" #include +#include +#include #include class TNaming_Builder; @@ -21,49 +25,77 @@ class TNaming_Builder; */ class Model_ResultBody : public ModelAPI_ResultBody { - boost::shared_ptr myOwner; ///< owner of this result /// builders that tores the naming history: one per label to allow store several shapes to one /// label; index in vector corresponds to the label tag 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(); - /// Returns the source feature of this result - MODEL_EXPORT virtual boost::shared_ptr owner(); + 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, + std::shared_ptr theShapeIn, + const int theKindOfShape, + const int theTag); + /// load and orient modified shapes + MODEL_EXPORT virtual void loadAndOrientModifiedShapes ( + GeomAlgoAPI_MakeShape* theMS, + 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, + std::shared_ptr theShapeIn, + const int theKindOfShape, + const int theTag, + const std::string& theName, + GeomAPI_DataMapOfShapeShape& theSubShapes); + + /// 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); + + /// Loads disconnected edges + MODEL_EXPORT virtual void loadDisconnectedEdges(std::shared_ptr theShape, const std::string& theName, 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(); @@ -77,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; };