X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FModelAPI_BodyBuilder.h;h=ecf3137338df10ba16e832437dc7af0c6aad6a9c;hb=c02fae5493cc6d56c9a1db3bdcf6d872f88fea07;hp=8da3d2158fc56eeb50d6d2e65362f293c816f1bd;hpb=9fffc6fbe2d96642d1798a819b07b84bc3d96e07;p=modules%2Fshaper.git diff --git a/src/ModelAPI/ModelAPI_BodyBuilder.h b/src/ModelAPI/ModelAPI_BodyBuilder.h old mode 100755 new mode 100644 index 8da3d2158..ecf313733 --- a/src/ModelAPI/ModelAPI_BodyBuilder.h +++ b/src/ModelAPI/ModelAPI_BodyBuilder.h @@ -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,10 +12,9 @@ // // 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 // #ifndef ModelAPI_BodyBuilder_H_ @@ -42,92 +41,74 @@ public: MODELAPI_EXPORT virtual ~ModelAPI_BodyBuilder() {}; /// Stores the shape (called by the execution method). - virtual void store(const std::shared_ptr& theShape, + virtual void store(const GeomShapePtr& theShape, const bool theIsStoreSameShapes = true) = 0; /// Stores the generated shape (called by the execution method). - virtual void storeGenerated(const std::shared_ptr& theFromShape, - const std::shared_ptr& theToShape) = 0; + virtual void storeGenerated(const GeomShapePtr& theFromShape, + const GeomShapePtr& theToShape, + const bool theIsCleanStored = true) = 0; + + /// Stores the root generated shapes (called by the execution method). + virtual void storeGenerated(const std::list& theFromShapes, + const GeomShapePtr& theToShape, const std::shared_ptr theMakeShape) = 0; /// Stores the modified shape (called by the execution method). - virtual void storeModified(const std::shared_ptr& theOldShape, - const std::shared_ptr& theNewShape, - const int theDecomposeSolidsTag = 0) = 0; + virtual void storeModified(const GeomShapePtr& theOldShape, + const GeomShapePtr& theNewShape, + const bool theIsCleanStored = true) = 0; - /// Stores the shape without naming support - virtual void storeWithoutNaming(const std::shared_ptr& theShape) = 0; + /// Stores the root modified shapes (called by the execution method). + virtual void storeModified(const std::list& theOldShapes, + const GeomShapePtr& theNewShape, const std::shared_ptr theMakeShape)=0; /// Returns the shape-result produced by this feature - virtual std::shared_ptr shape() = 0; + virtual GeomShapePtr shape() = 0; /// 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. - virtual void generated( - const std::shared_ptr& theNewShape, const std::string& theName, - const int theTag = 1) = 0; + /// Returns true if it is stored correctly (the final shape contains this new sub-shape) + virtual bool generated(const GeomShapePtr& theNewShape, + const std::string& theName, const bool theCheckIsInResult = true) = 0; /// 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. - virtual void generated(const std::shared_ptr& theOldShape, - const std::shared_ptr& theNewShape, const std::string& theName, - const int theTag = 1) = 0; + virtual void generated(const GeomShapePtr& theOldShape, + const GeomShapePtr& theNewShape, + const std::string& theName = "") = 0; /// 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. - virtual void modified(const std::shared_ptr& theOldShape, - const std::shared_ptr& theNewShape, const std::string& theName, - const int theTag = 1) = 0; - - /// 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. - virtual void deleted( - const std::shared_ptr& theOldShape, const int theTag = 1) = 0; + virtual void modified(const GeomShapePtr& theOldShape, + const GeomShapePtr& theNewShape, + const std::string& theName = "") = 0; /// load deleted shapes - virtual void loadDeletedShapes (GeomAlgoAPI_MakeShape* theMS, - std::shared_ptr theShapeIn, - const int theKindOfShape, - const int theTag, - const GeomShapePtr theShapes = GeomShapePtr()) = 0; + virtual void loadDeletedShapes(const GeomMakeShapePtr& theAlgo, + const GeomShapePtr& theOldShape, + const GeomAPI_Shape::ShapeType theShapeTypeToExplore, + const GeomShapePtr& theShapesToAvoid = GeomShapePtr()) = 0; + /// load and orient modified shapes - virtual void loadAndOrientModifiedShapes ( - GeomAlgoAPI_MakeShape* theMS, - std::shared_ptr theShapeIn, - const int theKindOfShape, - const int theTag, - const std::string& theName, - GeomAPI_DataMapOfShapeShape& theSubShapes, - const bool theIsStoreSeparate = false, - const bool theIsStoreAsGenerated = false) = 0; + virtual void loadModifiedShapes(const GeomMakeShapePtr& theAlgo, + const GeomShapePtr& theOldShape, + const GeomAPI_Shape::ShapeType theShapeTypeToExplore, + const std::string& theName = "") = 0; + /// load and orient generated shapes - virtual void loadAndOrientGeneratedShapes ( - GeomAlgoAPI_MakeShape* theMS, - std::shared_ptr theShapeIn, - const int theKindOfShape, - const int theTag, - const std::string& theName, - GeomAPI_DataMapOfShapeShape& theSubShapes) = 0; + virtual void loadGeneratedShapes(const GeomMakeShapePtr& theAlgo, + const GeomShapePtr& theOldShape, + const GeomAPI_Shape::ShapeType theShapeTypeToExplore, + const std::string& theName = "", + const bool theSaveOldIfNotInTree = false) = 0; /// load shapes of the first level (to be used during shape import) - virtual void loadFirstLevel(std::shared_ptr theShape, - const std::string& theName, int& theTag) = 0; - - /// load disconnected edges - virtual void loadDisconnectedEdges(std::shared_ptr theShape, - const std::string& theName, int& theTag) = 0; - - /// load disconnected vetexes - virtual void loadDisconnectedVertexes(std::shared_ptr theShape, - const std::string& theName,int& theTag) = 0; - - /// Converts evolution of sub-shapes stored in naming structure to selection - /// (theFlag = true) and back (theFlag = false) - virtual void evolutionToSelection(const bool theFlag) = 0; + virtual void loadFirstLevel(GeomShapePtr theShape, + const std::string& theName) = 0; - /// Returns true if the latest modification of this body in the naming history - // is equal to the given shape - virtual bool isLatestEqual(const std::shared_ptr& theShape) = 0; + /// Cleans cash related to the already stored elements + MODELAPI_EXPORT virtual void cleanCash() = 0; protected: /// Returns the data manager of this object: attributes @@ -137,7 +118,7 @@ protected: MODELAPI_EXPORT virtual std::shared_ptr document() const; protected: - /// Deafult constructor accessible only from Model_Object + /// Default constructor accessible only from Model_Object MODELAPI_EXPORT ModelAPI_BodyBuilder(ModelAPI_Object* theOwner); ModelAPI_Object* myOwner; ///< the owner object this builder belongs to