Merge branch 'V9_7_BR'

[modules/shaper.git] / src / Selector / Selector_WeakName.cpp

diff --git a/src/Selector/Selector_WeakName.cpp b/src/Selector/Selector_WeakName.cpp
index ff74df585591df0f4e46182b85beeeb1176b97f3..a80ab010841766ba733d57019a7317d60e0751eb 100644 (file)
--- a/src/Selector/Selector_WeakName.cpp
+++ b/src/Selector/Selector_WeakName.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2021  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
@@ -22,12 +22,14 @@
 #include <Selector_NameGenerator.h>
 #include <Selector_NExplode.h>
 
+#include <Locale_Convert.h>
+
 #include <TNaming_Tool.hxx>
 #include <TNaming_SameShapeIterator.hxx>
 #include <TNaming_Iterator.hxx>
 #include <TDataStd_Integer.hxx>
 
-Selector_WeakName::Selector_WeakName() : Selector_Algo()
+Selector_WeakName::Selector_WeakName() : Selector_Algo(), myRecomputeWeakIndex(false)
 {
 }
 
@@ -85,16 +87,18 @@ bool Selector_WeakName::restore()
   return restoreBaseArray(anEmptyRefList, myContext);
 }
 
-TDF_Label Selector_WeakName::restoreByName(std::string theName,
+TDF_Label Selector_WeakName::restoreByName(std::wstring theName,
   const TopAbs_ShapeEnum theShapeType, Selector_NameGenerator* theNameGenerator)
 {
-  std::string aWeakIndex = theName.substr(pureWeakNameID().size());
-  std::size_t aContextPosition = aWeakIndex.find("_");
-  myWeakIndex = atoi(aWeakIndex.c_str());
+  size_t aFoundWeak = theName.find(oldPureWeakNameID());
+  std::wstring aWeakIndex = theName.substr(aFoundWeak + oldPureWeakNameID().size());
+  std::size_t aContextPosition = aWeakIndex.find(L"_");
+  myWeakIndex = atoi(Locale::Convert::toString(aWeakIndex).c_str());
+  myRecomputeWeakIndex = aFoundWeak == 0;
   myShapeType = theShapeType;
   TDF_Label aContext;
-  if (aContextPosition != std::string::npos) { // context is also defined
-    std::string aContextName = aWeakIndex.substr(aContextPosition + 1);
+  if (aContextPosition != std::wstring::npos) { // context is also defined
+    std::wstring aContextName = aWeakIndex.substr(aContextPosition + 1);
     if (theNameGenerator->restoreContext(aContextName, aContext, myContext)) {
       if (myContext.IsNull())
         aContext.Nullify();
@@ -116,8 +120,9 @@ bool Selector_WeakName::solve(const TopoDS_Shape& theContext)
     }
   }
   if (!aContext.IsNull()) {
-    Selector_NExplode aNexp(aContext, myShapeType);
+    Selector_NExplode aNexp(aContext, myShapeType, myRecomputeWeakIndex);
     TopoDS_Shape aResult = aNexp.shape(myWeakIndex);
+    myRecomputeWeakIndex = false;
     if (!aResult.IsNull()) {
       Selector_Algo::store(aResult);
       return true;
@@ -126,13 +131,13 @@ bool Selector_WeakName::solve(const TopoDS_Shape& theContext)
   return false;
 }
 
-std::string Selector_WeakName::name(Selector_NameGenerator* theNameGenerator)
+std::wstring Selector_WeakName::name(Selector_NameGenerator* theNameGenerator)
 {
   // _weak_naming_1_Context
-  std::ostringstream aWeakStr;
+  std::wostringstream aWeakStr;
   aWeakStr<<pureWeakNameID()<<myWeakIndex;
-  std::string aResult = aWeakStr.str();
+  std::wstring aResult = aWeakStr.str();
   if (!myContext.IsNull())
-    aResult += "_" + theNameGenerator->contextName(myContext);
+    aResult += L"_" + theNameGenerator->contextName(myContext);
   return aResult;
 }