X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FModel_AttributeSelectionList.h;h=1870d95d4a677971d1bc9f26c6e2ca0edb0076da;hb=f36409774efce7c530518a1553946c9c76526fb9;hp=c3b50a3d7910d33b3f96037510ba84b8bffef23d;hpb=b5eaf6f6971771b1e39f55ba5fc484e2f150ffb8;p=modules%2Fshaper.git

diff --git a/src/Model/Model_AttributeSelectionList.h b/src/Model/Model_AttributeSelectionList.h
index c3b50a3d7..1870d95d4 100644
--- a/src/Model/Model_AttributeSelectionList.h
+++ b/src/Model/Model_AttributeSelectionList.h
@@ -1,8 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        Model_AttributeSelectionList.h
-// Created:     22 Oct 2014
-// Author:      Mikhail PONIKAROV
+// Copyright (C) 2014-2017  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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// 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
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
 
 #ifndef Model_AttributeSelectionList_H_
 #define Model_AttributeSelectionList_H_
@@ -31,6 +45,8 @@ class Model_AttributeSelectionList : public ModelAPI_AttributeSelectionList
   /// 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;
   bool myIsCashed; ///< true if cashing is performed
+  /// If true attribute selects geometry instead of shape.
+  bool myIsGeometricalSelection;
 public:
   /// Adds the new reference to the end of the list
   /// \param theContext object where the sub-shape was selected
@@ -38,12 +54,23 @@ public:
   /// \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 std::shared_ptr<GeomAPI_Shape>& theSubShape,
+    const ObjectPtr& 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="");
+  MODEL_EXPORT virtual void append(const std::string& theNamingName, const std::string& theType="");
+
+  /// Adds the new reference to the end of the list by inner point on the selected shape
+  MODEL_EXPORT virtual void append(const std::shared_ptr<GeomAPI_Pnt>& thePoint,
+                                   const std::string& theType);
+
+  /// Adds the new reference to the end of the list by weak naming index
+  MODEL_EXPORT virtual void append(const std::string& theType, const std::string& theContextName,
+                                   const int theIndex);
+
+  /// Reset temporary stored values
+  virtual void removeTemporaryValues();
 
   /// Removes the last element in the list
   MODEL_EXPORT virtual void removeLast();
@@ -61,7 +88,7 @@ public:
   /// \param theTemporarily if it is true, it checks also the temporary added item
   /// \returns true if the pair is found in the attirbute
   MODEL_EXPORT virtual bool isInList(
-    const ResultPtr& theContext, const std::shared_ptr<GeomAPI_Shape>& theSubShape,
+    const ObjectPtr& theContext, const std::shared_ptr<GeomAPI_Shape>& theSubShape,
     const bool theTemporarily = false);
 
   /// The type of all elements selection
@@ -86,6 +113,13 @@ public:
   /// during non-modification operations with this attribute)
   MODEL_EXPORT virtual void cashValues(const bool theEnabled);
 
+  MODEL_EXPORT virtual void setGeometricalSelection(const bool theIsGeometricalSelection) override;
+
+  /// Returns true if is geometrical selection.
+  MODEL_EXPORT virtual bool isGeometricalSelection() const override {
+    return myIsGeometricalSelection;
+  };
+
 protected:
   /// Objects are created for features automatically
   MODEL_EXPORT Model_AttributeSelectionList(TDF_Label& theLabel);