X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeSelectionList.h;h=3ed3e2804aca7e396befd8f711a858dd1829a9d2;hb=09365c927ebe8d881de2eda7f96bc33a2d9511c8;hp=d84ca1ff4187b766745b8e7262242aa73e6ec8df;hpb=a55eb7b05cb791412b0f72e2353ee2f2f0ae519d;p=modules%2Fshaper.git

diff --git a/src/Model/Model_AttributeSelectionList.h b/src/Model/Model_AttributeSelectionList.h
index d84ca1ff4..3ed3e2804 100644
--- a/src/Model/Model_AttributeSelectionList.h
+++ b/src/Model/Model_AttributeSelectionList.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,9 @@
 //
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #ifndef Model_AttributeSelectionList_H_
@@ -43,7 +42,7 @@ class Model_AttributeSelectionList : public ModelAPI_AttributeSelectionList
   Handle(TDataStd_Comment) mySelectionType;
   std::shared_ptr<Model_AttributeSelection> myTmpAttr; ///< temporary attribute (the last one)
   /// the cashed shapes to optimize isInList method: from context to set of shapes in this context
-  std::map<ResultPtr, std::list<std::shared_ptr<GeomAPI_Shape> > > myCash;
+  std::map<ObjectPtr, std::list<std::shared_ptr<GeomAPI_Shape> > > myCash;
   bool myIsCashed; ///< true if cashing is performed
 public:
   /// Adds the new reference to the end of the list
@@ -116,13 +115,24 @@ public:
   /// Returns true if is geometrical selection.
   MODEL_EXPORT virtual bool isGeometricalSelection() const override;
 
+  /// Returns a selection filters feature if it is defined for this selection list
+  MODEL_EXPORT virtual FiltersFeaturePtr filters() const;
+
+  /// Sets a selection filters feature if it is defined for this selection list
+  MODEL_EXPORT virtual void setFilters(FiltersFeaturePtr theFeature);
+
 protected:
   /// Objects are created for features automatically
   MODEL_EXPORT Model_AttributeSelectionList(TDF_Label& theLabel);
   /// Reinitializes the internal state of the attribute (may be needed on undo/redo, abort, etc)
   virtual void reinit();
 
+  /// Tries to merge attributes in this list with the same result shape. Returns true
+  /// if theStart matches with some later attribute and theStart is removed from the list.
+  bool merge(Model_AttributeSelection* theStart);
+
   friend class Model_Data;
+  friend class Model_AttributeSelection;
 };
 
 #endif