X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_ResultBody.h;h=bbb23da35ed80a810fa26396569f16852fe75baf;hb=077c2197bae13c5a45842f12845ef0491d4905c7;hp=a12ccb87d509deee934bdffbd5c30c1e27237153;hpb=4b378265f0b502fe00e8af93ce9f2c5739acfc1c;p=modules%2Fshaper.git

diff --git a/src/Model/Model_ResultBody.h b/src/Model/Model_ResultBody.h
index a12ccb87d..bbb23da35 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,13 +9,13 @@
 
 #include "Model.h"
 #include <ModelAPI_ResultBody.h>
-#include <GeomAlgoAPI_MakeShape.h>
-#include <GeomAPI_DataMapOfShapeShape.h>
-#include <vector>
+//#include <GeomAlgoAPI_MakeShape.h>
+//#include <GeomAPI_DataMapOfShapeShape.h>
+//#include <vector>
 
-class TNaming_Builder;
+//class TNaming_Builder;
 
-/**\class ModelAPI_ResultBody
+/**\class Model_ResultBody
  * \ingroup DataModel
  * \brief The body (shape) result of a feature.
  *
@@ -25,78 +27,40 @@ class Model_ResultBody : public ModelAPI_ResultBody
 {
   /// 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<TNaming_Builder*> myBuilders;
-public:
-  /// Stores the shape (called by the execution method).
-  MODEL_EXPORT virtual void store(const boost::shared_ptr<GeomAPI_Shape>& theShape);
-
-  /// Stores the generated shape (called by the execution method).
-  MODEL_EXPORT virtual void storeGenerated(const boost::shared_ptr<GeomAPI_Shape>& theFromShape,
-	                                       const boost::shared_ptr<GeomAPI_Shape>& theToShape);
-
-  /// Stores the modified shape (called by the execution method).
-  MODEL_EXPORT virtual void storeModified(const boost::shared_ptr<GeomAPI_Shape>& theOldShape,
-	                                       const boost::shared_ptr<GeomAPI_Shape>& theNewShape);
-
-  /// Returns the shape-result produced by this feature
-  MODEL_EXPORT virtual boost::shared_ptr<GeomAPI_Shape> shape();
+  //std::vector<TNaming_Builder*> myBuilders;
 
-  /// 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<GeomAPI_Shape>& theNewShape, 
-    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<GeomAPI_Shape>& theOldShape,
-    const boost::shared_ptr<GeomAPI_Shape>& theNewShape, const int theTag = 1);
+  /// Flag that stores the previous state of "concealed": if it is changed,
+  /// The event is used to redisplay the body.
+  bool myWasConcealed;
+public:
+  /// Request for initialization of data model of the result: adding all attributes
+  virtual void initAttributes();
 
+  /// Returns the parameters of color definition in the resources config manager
+  MODEL_EXPORT virtual void colorConfigInfo(std::string& theSection, std::string& theName,
+                                            std::string& theDefault);
 
-  /// 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<GeomAPI_Shape>& theOldShape,
-    const boost::shared_ptr<GeomAPI_Shape>& theNewShape, const int theTag = 1);
+  /// Disables the result body: keeps the resulting shape as selection, but erases the underlaying
+  /// naming data structure if theFlag if false. Or restores everything on theFlag is true.
+  MODEL_EXPORT virtual bool setDisabled(std::shared_ptr<ModelAPI_Result> theThis,
+    const bool theFlag);
 
-  /// 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<GeomAPI_Shape>& theOldShape,
-    const int theTag = 1);
+  /// The compsolid is concealed if at least one of the sub is concealed,
+  /// so, sub is Concealed if at least one sub is concealed
+  MODEL_EXPORT virtual bool isConcealed();
 
-  /// load deleted shapes
-  MODEL_EXPORT virtual void loadDeletedShapes (GeomAlgoAPI_MakeShape* theMS,
-                                               boost::shared_ptr<GeomAPI_Shape>  theShapeIn,
-                                               const int  theKindOfShape,
-                                               const int  theTag);
-  /// load and orient modified shapes
-  MODEL_EXPORT virtual void loadAndOrientModifiedShapes (
-	                                           GeomAlgoAPI_MakeShape* theMS,
-                                               boost::shared_ptr<GeomAPI_Shape>  theShapeIn,
-                                               const int  theKindOfShape,
-                                               const int  theTag,
-                                               GeomAPI_DataMapOfShapeShape& theSubShapes);
-   /// load and orient generated shapes
-  MODEL_EXPORT virtual void loadAndOrientGeneratedShapes (
-	                                           GeomAlgoAPI_MakeShape* theMS,
-                                               boost::shared_ptr<GeomAPI_Shape>  theShapeIn,
-                                               const int  theKindOfShape,
-                                               const int  theTag,
-                                               GeomAPI_DataMapOfShapeShape& theSubShapes);
+  /// 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<GeomAPI_Shape>& theShape);
 
   /// Removes the stored builders
-  MODEL_EXPORT virtual ~Model_ResultBody();
+  MODEL_EXPORT virtual ~Model_ResultBody() {};
 
 protected:
   /// Makes a body on the given feature
   Model_ResultBody();
 
-  /// Removes the stored builders
-  void clean();
-
-  /// Returns (creates if necessary) the builder created on the needed tag of sub-label
-  TNaming_Builder* builder(const int theTag);
-
-  friend class Model_Document;
+  friend class Model_Objects;
 };
 
 #endif