X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeSelectionList.h;h=a69635c4bdb7b41bede5677b15ca2656f7956b63;hb=4fc2dc9fdc0c14fab5f2780598eccdc1368d81b9;hp=51001b6d0bbb1918df625d4c233a88981784600d;hpb=0906e8d8425cb17be2861a710051e0b1f1e231c2;p=modules%2Fshaper.git

diff --git a/src/Model/Model_AttributeSelectionList.h b/src/Model/Model_AttributeSelectionList.h
index 51001b6d0..a69635c4b 100644
--- a/src/Model/Model_AttributeSelectionList.h
+++ b/src/Model/Model_AttributeSelectionList.h
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        Model_AttributeSelectionList.h
 // Created:     22 Oct 2014
 // Author:      Mikhail PONIKAROV
@@ -9,7 +11,7 @@
 #include "Model_AttributeSelection.h"
 #include <ModelAPI_AttributeSelectionList.h>
 #include <TDataStd_Integer.hxx>
-#include <TDataStd_Real.hxx>
+#include <TDataStd_Comment.hxx>
 #include <vector>
 
 /**\class Model_AttributeSelectionList
@@ -21,34 +23,52 @@
 class Model_AttributeSelectionList : public ModelAPI_AttributeSelectionList
 {
   Handle(TDataStd_Integer) mySize;  ///< Contains size of this list
-  Handle(TDataStd_Real) mySelectionType;  ///< Contains current index, TODO: make it integer, not real
-  std::vector<boost::shared_ptr<Model_AttributeSelection> > mySubs; /// the selection attributes
+  Handle(TDataStd_Comment) mySelectionType;  ///< Contains current type name (same as selection attribute)
+  std::shared_ptr<Model_AttributeSelection> myTmpAttr; ///< temporary attribute (the last one)
 public:
   /// Adds the new reference to the end of the list
+  /// \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 append(
-    const ResultPtr& theContext, const boost::shared_ptr<GeomAPI_Shape>& theSubShape);
+    const ResultPtr& theContext, const std::shared_ptr<GeomAPI_Shape>& theSubShape,
+    const bool theTemporarily = false);
+
+  /// Adds the new reference to the end of the list by the naming name of the selected shape
+  /// The type of shape is taken from the current selection type if the given is empty
+  MODEL_EXPORT virtual void append(const std::string theNamingName, const std::string& theType="");
+
+  /// Removes the last element in the list
+  MODEL_EXPORT virtual void removeLast();
+
+  /// Removes the elements from the list.
+  /// \param theIndices a list of indices of elements to be removed
+  MODEL_EXPORT virtual void remove(const std::set<int>& theIndices);
 
   /// Returns the number ofselection attributes in the list
   MODEL_EXPORT virtual int size();
 
-  MODEL_EXPORT virtual int selectionType();
+  /// The type of all elements selection
+  /// \returns the index of the OCCT enumeration of the type of shape
+  MODEL_EXPORT virtual const std::string selectionType() const;
 
-  MODEL_EXPORT virtual void setSelectionType(int);
+  /// Sets the type of all elements selection
+  /// \param theType the index of the OCCT enumeration of the type of shape
+  MODEL_EXPORT virtual void setSelectionType(const std::string& theType);
 
   /// Returns the attribute selection by the index (zero based)
-  MODEL_EXPORT virtual boost::shared_ptr<ModelAPI_AttributeSelection> value(const int theIndex);
+  MODEL_EXPORT virtual std::shared_ptr<ModelAPI_AttributeSelection> value(const int theIndex);
 
   /// Returns all attributes
   MODEL_EXPORT virtual void clear();
 
-  /// Sets the feature object
-  MODEL_EXPORT virtual void setObject(const boost::shared_ptr<ModelAPI_Object>& theObject);
+  /// Returns true if attribute was  initialized by some value
+  MODEL_EXPORT virtual bool isInitialized();
 
 protected:
   /// Objects are created for features automatically
   MODEL_EXPORT Model_AttributeSelectionList(TDF_Label& theLabel);
-  /// Updates the mySubs if needed since it is not persistent value
-  void updateSubs();
 
   friend class Model_Data;
 };