Merge remote-tracking branch 'origin/Toolbars_Management'

[modules/shaper.git] / src / ModelAPI / ModelAPI_BodyBuilder.h

diff --git a/src/ModelAPI/ModelAPI_BodyBuilder.h b/src/ModelAPI/ModelAPI_BodyBuilder.h
index 6edfd2c001f4cb4e470fe5bb69cc6d94e49ccb7f..f72202360adc13f33d0ef7addd1e0fe45490dfdc 100755 (executable)
--- a/src/ModelAPI/ModelAPI_BodyBuilder.h
+++ b/src/ModelAPI/ModelAPI_BodyBuilder.h
@@ -54,16 +54,14 @@ public:
                              const GeomShapePtr& theNewShape,
                              const bool theIsCleanStored = true) = 0;
 
-  /// Stores the shape without naming support
-  virtual void storeWithoutNaming(const GeomShapePtr& theShape) = 0;
-
   /// Returns the shape-result produced by this feature
   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 GeomShapePtr& theNewShape,
-                         const std::string& theName) = 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
@@ -78,10 +76,6 @@ public:
                         const GeomShapePtr& theNewShape,
                         const std::string& theName = "") = 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 GeomShapePtr& theOldShape) = 0;
-
   /// load deleted shapes
   virtual void loadDeletedShapes(const GeomMakeShapePtr& theAlgo,
                                  const GeomShapePtr& theOldShape,
@@ -95,35 +89,17 @@ public:
                                   const std::string& theName = "") = 0;
 
   /// load and orient generated shapes
-  virtual void loadAndOrientGeneratedShapes(GeomAlgoAPI_MakeShape* theMS,
-                                            GeomShapePtr 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 = "") = 0;
 
   /// load shapes of the first level (to be used during shape import)
   virtual void loadFirstLevel(GeomShapePtr theShape,
-                              const std::string& theName,
-                              int& theTag) = 0;
-
-  /// load disconnected edges
-  virtual void loadDisconnectedEdges(GeomShapePtr theShape,
-                                     const std::string& theName,
-                                     int& theTag) = 0;
-
-  /// load disconnected vetexes
-  virtual void loadDisconnectedVertexes(GeomShapePtr 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;
+                              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 GeomShapePtr& 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
@@ -133,7 +109,7 @@ protected:
   MODELAPI_EXPORT virtual std::shared_ptr<ModelAPI_Document> 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