updated copyright message

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

diff --git a/src/Model/Model_ResultField.cpp b/src/Model/Model_ResultField.cpp
index 0f406a93465e8855391be51564886414cebdd65a..21afaed30bfe1bff08c3553c1b248d0b118159c8 100644 (file)
--- a/src/Model/Model_ResultField.cpp
+++ b/src/Model/Model_ResultField.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2020  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -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)
@@ -87,7 +90,7 @@ std::shared_ptr<GeomAPI_Shape> Model_ResultField::shape()
         for(int a = aList->size() - 1; a >= 0; a--) {
           std::shared_ptr<GeomAPI_Shape> aSelection = aList->value(a)->value();
           if (aSelection && !aSelection->isNull()) {
-            aSubs.push_back(aSelection);
+            aSubs.push_front(aSelection);
           }
         }
       }
@@ -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