X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FModel_AttributeSelection.h;h=1f3c4594570754cab0c5af149c814f32f499c9d6;hb=690012a1c13c51062fc01656ee18dd8edb947e02;hp=74c77344d5daea843647d8d2c63ad4cf0d1f0d7c;hpb=a73784ec83ca10e12b2832c681ce3bf38f8550c9;p=modules%2Fshaper.git

diff --git a/src/Model/Model_AttributeSelection.h b/src/Model/Model_AttributeSelection.h
index 74c77344d..1f3c45945 100644
--- a/src/Model/Model_AttributeSelection.h
+++ b/src/Model/Model_AttributeSelection.h
@@ -21,10 +21,19 @@ class Model_AttributeSelection : public ModelAPI_AttributeSelection
 {
   Model_AttributeReference myRef;  ///< The reference functionality reusage
   TDF_LabelMap myScope; ///< the map of valid labels for naming selection solving
+  /// temporarily storages to avoid keeping in the data structure if not needed
+  ResultPtr myTmpContext;
+  /// temporarily storages to avoid keeping in the data structure if not needed
+  std::shared_ptr<GeomAPI_Shape> myTmpSubShape;
 public:
   /// Defines the result and its selected sub-shape
+  /// \param theContext object where the sub-shape was selected
+  /// \param theSubShape selected sub-shape (if null, the whole context is selected)
+  /// \param theTemporarily if it is true, do not store and name the added in the data framework
+  ///           (used to remove immideately, without the following updates)
   MODEL_EXPORT virtual void setValue(
-    const ResultPtr& theContext, const std::shared_ptr<GeomAPI_Shape>& theSubShape);
+    const ResultPtr& theContext, const std::shared_ptr<GeomAPI_Shape>& theSubShape,
+    const bool theTemporarily = false);
 
   /// Returns the selected subshape
   MODEL_EXPORT virtual std::shared_ptr<GeomAPI_Shape> value();
@@ -40,7 +49,28 @@ public:
   MODEL_EXPORT virtual bool update();
 
   /// Returns a textual string of the selection
-  MODEL_EXPORT virtual std::string namingName();
+  /// \param theDefaultValue a name, which is returned if the naming name can not be obtained
+  MODEL_EXPORT virtual std::string namingName(const std::string& theDefaultValue = "");
+  
+  /// Returns an Id of the selection
+  /// NOTE: This method has been added for temporary export of groups towards old GEOM
+  /// It should then be removed when a direct use of objects from SHAPER
+  /// will be possible from SMESH module of SALOME.
+  MODEL_EXPORT virtual int Id();
+
+  /// Defines the sub-shape by Id
+  /// NOTE: This method is opposite to Id() method.
+  MODEL_EXPORT virtual void setId(int theID);
+
+  /// Selects (i.e. creates Naming data structure) of sub-shape specifed by textual name
+  MODEL_EXPORT virtual void selectSubShape(const std::string& theType, const std::string& theSubShapeName);
+
+  /// Returns true if attribute was  initialized by some value
+  MODEL_EXPORT virtual bool isInitialized();
+
+  /// Returns true if recomute of selection become impossible
+  MODEL_EXPORT virtual bool isInvalid();
+
 
 protected:
   /// Objects are created for features automatically
@@ -50,10 +80,20 @@ protected:
   /// Performs the selection for the body result (TNaming selection)
   virtual void selectBody(
     const ResultPtr& theContext, const std::shared_ptr<GeomAPI_Shape>& theSubShape);
+
   /// Performs the selection for the construction result (selection by index)
   virtual void selectConstruction(
     const ResultPtr& theContext, const std::shared_ptr<GeomAPI_Shape>& theSubShape);
 
+  /// Performs the selection for the part result (selection by name of body result inside of part)
+  /// \param theContext the result - owner of the selection
+  /// \param theSubShape selected shape
+  /// \param theUpdate flag that shows that it must be just update, theShape is null
+  /// \returns true if eveything is selected correctly
+  virtual bool selectPart(
+    const ResultPtr& theContext, const std::shared_ptr<GeomAPI_Shape>& theSubShape,
+    const bool theUpdate = false);
+
   /// Returns the label where TNaming_Selection results are stored
   /// Note: there must be no attributes stored at the same label because Selector clears this lab
   TDF_Label selectionLabel();
@@ -61,6 +101,9 @@ protected:
   /// Returns the prepared map of valid labels for naming selection solving (creates if not exists)
   TDF_LabelMap& scope();
 
+  /// Sets the ID of the attribute in Data (called from Data): here it is used for myRef ID setting
+  MODEL_EXPORT virtual void setID(const std::string theID);
+
   friend class Model_Data;
   friend class Model_AttributeSelectionList;
 };