X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_BodyBuilder.h;h=983c03a7564f5f7564d0e9a48c8641d721a1589a;hb=72b9423caaa48805589d6ab87d366f79ecde5bfe;hp=85032d4f81d5282f3a93f60f6324e6f81d563625;hpb=4748bf45f55c8185533d460302d3dbefc948b56e;p=modules%2Fshaper.git diff --git a/src/Model/Model_BodyBuilder.h b/src/Model/Model_BodyBuilder.h index 85032d4f8..983c03a75 100755 --- a/src/Model/Model_BodyBuilder.h +++ b/src/Model/Model_BodyBuilder.h @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: Model_ResultBody.h -// Created: 08 Jul 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 +// #ifndef Model_BodyBuilder_H_ #define Model_BodyBuilder_H_ @@ -22,12 +36,13 @@ class TNaming_Builder; */ class Model_BodyBuilder : public ModelAPI_BodyBuilder { - /// builders that tores the naming history: one per label to allow store several shapes to one + /// builders that store 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; + std::map myBuilders; public: /// Stores the shape (called by the execution method). - MODEL_EXPORT virtual void store(const std::shared_ptr& theShape); + MODEL_EXPORT virtual void store(const std::shared_ptr& theShape, + const bool theIsStoreSameShapes = true); /// Stores the generated shape (called by the execution method). MODEL_EXPORT virtual void storeGenerated(const std::shared_ptr& theFromShape, @@ -36,7 +51,7 @@ public: /// Stores the modified shape (called by the execution method). /// \param theOldShape shape that produces result /// \param theNewShape resulting shape - /// \param theDecomposeSolidsTag tag for starting of solids sub-elements placement in case + /// \param theDecomposeSolidsTag tag for starting of solids sub-elements placement in case /// theNewShape is compound of solids, if zero it is not used MODEL_EXPORT virtual void storeModified(const std::shared_ptr& theOldShape, const std::shared_ptr& theNewShape, @@ -51,20 +66,22 @@ public: /// 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 std::shared_ptr& theNewShape, + 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 + /// 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 std::shared_ptr& theOldShape, - const std::shared_ptr& theNewShape, const std::string& theName, const int theTag = 1); + 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 std::shared_ptr& theOldShape, - const std::shared_ptr& theNewShape, const std::string& theName, const int theTag = 1); + 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. @@ -83,7 +100,9 @@ public: const int theKindOfShape, const int theTag, const std::string& theName, - GeomAPI_DataMapOfShapeShape& theSubShapes); + GeomAPI_DataMapOfShapeShape& theSubShapes, + const bool theIsStoreSeparate = false, + const bool theIsStoreAsGenerated = false); /// load and orient generated shapes MODEL_EXPORT virtual void loadAndOrientGeneratedShapes ( GeomAlgoAPI_MakeShape* theMS, @@ -92,23 +111,30 @@ public: 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); - + 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); + 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); + MODEL_EXPORT virtual void loadDisconnectedVertexes(std::shared_ptr theShape, + const std::string& theName, int& theTag); /// Removes the stored builders MODEL_EXPORT virtual ~Model_BodyBuilder(); - /// Converts evolution of sub-shapes stored in naming structure to selection + /// Converts evolution of sub-shapes stored in naming structure to selection /// (theFlag = true) and back (theFlag = false) MODEL_EXPORT virtual void evolutionToSelection(const bool theFlag); + /// Returns true if the latest modification of this body in the naming history + // is equal to the given shape + MODEL_EXPORT virtual bool isLatestEqual(const std::shared_ptr& theShape); + protected: /// Default constructor accessible only by Model_Objects Model_BodyBuilder(ModelAPI_Object* theOwner); @@ -121,9 +147,10 @@ protected: 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); + void loadNextLevels(std::shared_ptr theShape, + const std::string& theName, int& theTag); - /// builds name for the shape kept at the specified tag + /// builds name for the shape kept at the specified tag void buildName(const int theTag, const std::string& theName); friend class Model_ResultBody;