X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_BodyBuilder.h;h=32983cd66e04d347e99b20d2b0adaa18159d0a07;hb=9a3d914571afc7318df989643dca720889fcc50b;hp=0217fb3a7cb52ee8d35a677358d28797c6c44ccd;hpb=a276c3f6288ffcd67f1dab8323d7e4666a1aded7;p=modules%2Fshaper.git diff --git a/src/Model/Model_BodyBuilder.h b/src/Model/Model_BodyBuilder.h old mode 100755 new mode 100644 index 0217fb3a7..32983cd66 --- a/src/Model/Model_BodyBuilder.h +++ b/src/Model/Model_BodyBuilder.h @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2021 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 Model_BodyBuilder_H_ @@ -42,32 +41,42 @@ class Model_BodyBuilder : public ModelAPI_BodyBuilder public: /// Stores the shape (called by the execution method). MODEL_EXPORT virtual void store(const GeomShapePtr& theShape, - const bool theIsStoreSameShapes = true); + const bool theIsStoreSameShapes = true) override; /// Stores the generated shape (called by the execution method). MODEL_EXPORT virtual void storeGenerated(const GeomShapePtr& theFromShape, - const GeomShapePtr& theToShape); + const GeomShapePtr& theToShape, + const bool theIsCleanStored = true) override; + + /// Stores the root generated shapes (called by the execution method). + MODEL_EXPORT virtual void storeGenerated(const std::list& theFromShapes, + const GeomShapePtr& theToShape, + const std::shared_ptr theMakeShape) override; /// 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 - /// theNewShape is compound of solids, if zero it is not used + /// \param theIsCleanStored erases all previous data structure of this body if true MODEL_EXPORT virtual void storeModified(const GeomShapePtr& theOldShape, const GeomShapePtr& theNewShape, const bool theIsCleanStored = true) override; - /// Stores the shape without naming support - /// \param theShape shape to store - MODEL_EXPORT virtual void storeWithoutNaming(const GeomShapePtr& theShape); + /// Stores the root modified shape (called by the execution method). + /// \param theOldShapes all shapes that produce result + /// \param theNewShape resulting shape + /// \param theIsCleanStored erases all previous data structure of this body if true + MODEL_EXPORT virtual void storeModified(const std::list& theOldShapes, + const GeomShapePtr& theNewShape, + const std::shared_ptr theMakeShape) override; /// Returns the shape-result produced by this feature MODEL_EXPORT virtual GeomShapePtr 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 GeomShapePtr& theNewShape, - const std::string& theName) override; + /// Returns true if it is stored correctly (the final shape contains this new sub-shape) + MODEL_EXPORT virtual bool generated(const GeomShapePtr& theNewShape, + const std::string& theName, const bool theCheckIsInResult = true) override; /// 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 @@ -83,10 +92,6 @@ public: const GeomShapePtr& theNewShape, const std::string& theName = "") override; - /// 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 GeomShapePtr& theOldShape) override; - /// load deleted shapes MODEL_EXPORT virtual void loadDeletedShapes(const GeomMakeShapePtr& theAlgo, @@ -103,39 +108,21 @@ public: /// load and orient generated shapes MODEL_EXPORT - virtual void loadAndOrientGeneratedShapes(GeomAlgoAPI_MakeShape* theMS, - GeomShapePtr theShapeIn, - const int theKindOfShape, - const int theTag, - const std::string& theName, - GeomAPI_DataMapOfShapeShape& theSubShapes); + virtual void loadGeneratedShapes(const GeomMakeShapePtr& theAlgo, + const GeomShapePtr& theOldShape, + const GeomAPI_Shape::ShapeType theShapeTypeToExplore, + const std::string& theName = "", + const bool theSaveOldIfNotInTree = false) override; /// Loads shapes of the first level (to be used during shape import) MODEL_EXPORT virtual void loadFirstLevel(GeomShapePtr theShape, - const std::string& theName, - int& theTag); - - /// Loads disconnected edges - MODEL_EXPORT virtual void loadDisconnectedEdges(GeomShapePtr theShape, - const std::string& theName, - int& theTag); - - /// Loads disconnected vetexes - MODEL_EXPORT virtual void loadDisconnectedVertexes(GeomShapePtr theShape, - const std::string& theName, - int& theTag); + const std::string& theName) override; /// Removes the stored builders MODEL_EXPORT virtual ~Model_BodyBuilder(); - /// 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 GeomShapePtr& theShape); - + /// Cleans cash related to the already stored elements + MODEL_EXPORT virtual void cleanCash() override; protected: /// Default constructor accessible only by Model_Objects Model_BodyBuilder(ModelAPI_Object* theOwner); @@ -149,17 +136,20 @@ protected: private: /// Loads shapes of the next level (to be used during shape import) void loadNextLevels(GeomShapePtr theShape, - const std::string& theName, int& theTag); + const std::string& theName); /// builds name for the shape kept at the specified tag void buildName(const int theTag, const std::string& theName); private: - int myPrimitiveTag; - int myDividedIndex; - int myVIndex; - int myEIndex; - int myFIndex; + struct IndexTags { + int index; + std::vector tags; + }; + +private: + int myFreePrimitiveTag; + std::map myPrimitivesNamesIndexMap; private: friend class Model_ResultBody;