Merge branch 'V9_5_BR'

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

diff --git a/src/Model/Model_AttributeSelection.h b/src/Model/Model_AttributeSelection.h
index 50a7ddbb91645726c340b095ce6db0ac97e3acd8..ab7f06cf4a7ab1a2e399df573c84b3a7d215421c 100644 (file)
--- a/src/Model/Model_AttributeSelection.h
+++ b/src/Model/Model_AttributeSelection.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2020  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
@@ -48,7 +48,8 @@ class Model_AttributeSelection : public ModelAPI_AttributeSelection,
   /// Reference to the parent attribute, if any (to split selection compounds in issue 1799)
   Model_AttributeSelectionList* myParent;
 
-  std::shared_ptr<Model_Document> myRestoreDocument; // current document to restore by name
+  /// current document to restore by name
+  std::shared_ptr<Model_Document> myRestoreDocument;
   /// If true attribute selects geometry instead of shape.
   bool myIsGeometricalSelection;
 
@@ -122,7 +123,7 @@ public:
   /// Updates the arguments of selection if something was affected by creation
   /// or reorder of features upper in the history line (issue #1757)
   /// Returns theRemove true if this attribute must be removed (become deleted)
-  MODEL_EXPORT virtual void updateInHistory(bool& theRemove);
+  MODEL_EXPORT virtual void updateInHistory(bool& theRemove) override;
 
   // Implementation of the name generator method from the Selector package
   // This method returns the context name by the label of the sub-selected shape
@@ -208,8 +209,9 @@ protected:
   /// Returns features that conceals theFeature and located in history before theStop
   /// theResultOfFeature if not null defines exact referenced result of a feature
   void concealedFeature(
-    const FeaturePtr theFeature, const FeaturePtr theStop, std::list<FeaturePtr>& theConcealers,
-    const ResultPtr theResultOfFeature);
+    const FeaturePtr theFeature, const FeaturePtr theStop, const bool theCheckCopy,
+    std::list<FeaturePtr>& theConcealers, const ResultPtr theResultOfFeature,
+    const bool theCheckWholeFeature = false);
 
   friend class Model_Data;
   friend class Model_AttributeSelectionList;