A unit test for the issue #1799

[modules/shaper.git] / src / Model / Model_AttributeSelectionList.h

diff --git a/src/Model/Model_AttributeSelectionList.h b/src/Model/Model_AttributeSelectionList.h
index d28798dda638f5dac20896b926f8428cd937dc91..0caf621b18c0f8cabc9c61816110723b878ed259 100644 (file)
--- a/src/Model/Model_AttributeSelectionList.h
+++ b/src/Model/Model_AttributeSelectionList.h
@@ -13,6 +13,7 @@
 #include <TDataStd_Integer.hxx>
 #include <TDataStd_Comment.hxx>
 #include <vector>
+#include <map>
 
 /**\class Model_AttributeSelectionList
  * \ingroup DataModel
@@ -22,9 +23,14 @@
 
 class Model_AttributeSelectionList : public ModelAPI_AttributeSelectionList
 {
+  TDF_Label myLab; ///< the main label of this attribute
   Handle(TDataStd_Integer) mySize;  ///< Contains size of this list
-  Handle(TDataStd_Comment) mySelectionType;  ///< Contains current type name (same as selection attribute)
+  /// Contains current type name (same as selection attribute)
+  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;
+  bool myIsCashed; ///< true if cashing is performed
 public:
   /// Adds the new reference to the end of the list
   /// \param theContext object where the sub-shape was selected
@@ -39,6 +45,9 @@ public:
   /// 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="");
 
+  /// Reset temporary stored values
+  virtual void removeTemporaryValues();
+
   /// Removes the last element in the list
   MODEL_EXPORT virtual void removeLast();
 
@@ -52,6 +61,7 @@ public:
   /// Returns true if the object with the shape are in 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, 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,
@@ -74,9 +84,16 @@ public:
   /// Returns true if attribute was  initialized by some value
   MODEL_EXPORT virtual bool isInitialized();
 
+  /// Starts or stops cashing of the values in the attribute (the cash may become invalid
+  /// on modification of the attribute or sub-elements, so the cash must be enabled only
+  /// during non-modification operations with this attribute)
+  MODEL_EXPORT virtual void cashValues(const bool theEnabled);
+
 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();
 
   friend class Model_Data;
 };