X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_ResultField.cpp;h=8ec0fc33becd0cc51b58aec6188d4f4aaf2089b7;hb=3ce3e69a217055142b03d67add35d054979a6340;hp=11498517665be5e9f5da91e0c22ac16a134c10e7;hpb=eff1842480409939adfafb5b39bca801e834aedd;p=modules%2Fshaper.git

diff --git a/src/Model/Model_ResultField.cpp b/src/Model/Model_ResultField.cpp
index 114985176..8ec0fc33b 100644
--- a/src/Model/Model_ResultField.cpp
+++ b/src/Model/Model_ResultField.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  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
@@ -12,10 +12,9 @@
 //
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include <Model_ResultField.h>
@@ -25,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)
@@ -38,7 +40,7 @@ Model_ResultField::Model_ResultField(std::shared_ptr<ModelAPI_Data> theOwnerData
 Model_ResultField::~Model_ResultField()
 {
   while(mySteps.size() > 0) {
-    delete mySteps.back();
+    //delete mySteps.back();
     mySteps.pop_back();
   }
 }
@@ -105,13 +107,14 @@ void Model_ResultField::updateSteps()
 {
   // Update Array of steps
   int aNbSteps = stepsSize();
-  if (mySteps.size() != aNbSteps) {
-    while(mySteps.size() > aNbSteps) {
-      delete mySteps.back();
+  if ((int)mySteps.size() != aNbSteps) {
+    while((int)mySteps.size() > aNbSteps) {
+      //delete mySteps.back();
       mySteps.pop_back();
     }
-    while(mySteps.size() < aNbSteps) {
-      mySteps.push_back(new Model_ResultField::Model_FieldStep(this, int(mySteps.size())));
+    while((int)mySteps.size() < aNbSteps) {
+      mySteps.push_back(FieldStepPtr(new Model_ResultField::Model_FieldStep(this,
+        (int)mySteps.size())));
     }
   }
 }
@@ -144,11 +147,18 @@ std::string Model_ResultField::textLine(int theLine) const
 
 // used by GUI only
 // LCOV_EXCL_START
-ModelAPI_ResultField::ModelAPI_FieldStep* Model_ResultField::step(int theId) const
+std::shared_ptr<ModelAPI_ResultField::ModelAPI_FieldStep> Model_ResultField::step(int theId) const
 {
-  if (theId < mySteps.size()) {
+  if (theId < (int)mySteps.size()) {
     return mySteps[theId];
   }
   return NULL;
 }
+
+std::wstring Model_ResultField::Model_FieldStep::name() {
+  std::wostringstream aStream;
+  aStream<<myParent->data()->name()<<std::endl;
+  aStream<<"Step "<<(myId + 1)<<" "<< Locale::Convert::toWString(myParent->textLine(myId));
+  return aStream.str();
+}
 // LCOV_EXCL_STOP