Merge remote-tracking branch 'remotes/origin/EDF_2020_Lot2'

[modules/shaper.git] / src / Model / Model_ResultField.cpp

diff --git a/src/Model/Model_ResultField.cpp b/src/Model/Model_ResultField.cpp
index 0f406a93465e8855391be51564886414cebdd65a..8ec0fc33becd0cc51b58aec6188d4f4aaf2089b7 100644 (file)
--- a/src/Model/Model_ResultField.cpp
+++ b/src/Model/Model_ResultField.cpp
@@ -24,9 +24,12 @@
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_AttributeIntArray.h>
 #include <ModelAPI_AttributeSelectionList.h>
+#include <ModelAPI_Tools.h>
 
 #include <GeomAlgoAPI_CompoundBuilder.h>
 
+#include <Locale_Convert.h>
+
 #include <Config_PropManager.h>
 
 Model_ResultField::Model_ResultField(std::shared_ptr<ModelAPI_Data> theOwnerData)
@@ -152,10 +155,10 @@ std::shared_ptr<ModelAPI_ResultField::ModelAPI_FieldStep> Model_ResultField::ste
   return NULL;
 }
 
-std::string Model_ResultField::Model_FieldStep::name() {
-  std::ostringstream aStream;
+std::wstring Model_ResultField::Model_FieldStep::name() {
+  std::wostringstream aStream;
   aStream<<myParent->data()->name()<<std::endl;
-  aStream<<"Step "<<(myId + 1)<<" "<<myParent->textLine(myId);
+  aStream<<"Step "<<(myId + 1)<<" "<< Locale::Convert::toWString(myParent->textLine(myId));
   return aStream.str();
 }
 // LCOV_EXCL_STOP