bos #26374 Merge branch 'CR26374'

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

diff --git a/src/Model/Model_ResultField.cpp b/src/Model/Model_ResultField.cpp
index 7eaa8b2b47a65364aa87b2705d42ea7795798d2b..e60919a38bfbda0f25e738885f2fcc16ec233387 100644 (file)
--- a/src/Model/Model_ResultField.cpp
+++ b/src/Model/Model_ResultField.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
@@ -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)
@@ -37,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();
   }
 }
@@ -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);
           }
         }
       }
@@ -104,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())));
     }
   }
 }
@@ -143,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