Merge commit 'f709219506b7cd587e94abc5ebed18d629df92d8'

[modules/shaper.git] / src / Selector / Selector_Modify.h

diff --git a/src/Selector/Selector_Modify.h b/src/Selector/Selector_Modify.h
index 63953d2ca8f2e484944ed6e8461d91e8cdfa5845..4f0593da16a64106140991564d10fc537d55bd71 100644 (file)
--- a/src/Selector/Selector_Modify.h
+++ b/src/Selector/Selector_Modify.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2022  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
@@ -36,6 +36,7 @@ class Selector_Modify: public Selector_Algo
   TDF_Label myFinal; ///< final label of the primitive or generation, where the value is
   TDF_LabelList myBases; ///< initial labels that contain shapes that produce the modification
   int myWeakIndex; ///< weak index in case modification produces several shapes
+  bool myRecomputeWeakIndex; ///< if the index is stored with old (unstable) order, recompute it
 public:
   /// Initializes the selection of this kind by list of named shapes where the modification results
   /// are presented and the selected value.
@@ -51,14 +52,14 @@ public:
 
   /// Restores the selected shape by the topological name string.
   /// Returns not empty label of the context.
-  SELECTOR_EXPORT virtual TDF_Label restoreByName(std::string theName,
+  SELECTOR_EXPORT virtual TDF_Label restoreByName(std::wstring theName,
     const TopAbs_ShapeEnum theShapeType, Selector_NameGenerator* theNameGenerator) override;
 
   /// Updates the current shape by the stored topological name
   SELECTOR_EXPORT virtual bool solve(const TopoDS_Shape& theContext) override;
 
   /// Returns the naming name of the selection
-  SELECTOR_EXPORT virtual std::string name(Selector_NameGenerator* theNameGenerator) override;
+  SELECTOR_EXPORT virtual std::wstring name(Selector_NameGenerator* theNameGenerator) override;
 
 private:
   /// Initializes selector