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

diff --git a/src/Model/Model_ResultBody.h b/src/Model/Model_ResultBody.h
index 08ce28ab0..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,8 +9,13 @@
 
 #include "Model.h"
 #include <ModelAPI_ResultBody.h>
+//#include <GeomAlgoAPI_MakeShape.h>
+//#include <GeomAPI_DataMapOfShapeShape.h>
+//#include <vector>
+
+//class TNaming_Builder;
 
-/**\class ModelAPI_ResultBody
+/**\class Model_ResultBody
  * \ingroup DataModel
  * \brief The body (shape) result of a feature.
  *
@@ -18,20 +25,42 @@
  */
 class Model_ResultBody : public ModelAPI_ResultBody
 {
-  boost::shared_ptr<ModelAPI_Feature> myOwner;  ///< owner of this result
- public:
-  /// Stores the shape (called by the execution method).
-  MODEL_EXPORT virtual void store(const boost::shared_ptr<GeomAPI_Shape>& theShape);
-  /// Returns the shape-result produced by this feature
-  MODEL_EXPORT virtual boost::shared_ptr<GeomAPI_Shape> shape();
-  /// Returns the source feature of this result
-  MODEL_EXPORT virtual boost::shared_ptr<ModelAPI_Feature> owner();
-
- protected:
+  /// 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;
+
+  /// 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);
+
+  /// 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);
+
+  /// 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();
+
+  /// 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() {};
+
+protected:
   /// Makes a body on the given feature
   Model_ResultBody();
 
-  friend class Model_Document;
+  friend class Model_Objects;
 };
 
 #endif