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

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

diff --git a/src/Model/Model_ResultField.cpp b/src/Model/Model_ResultField.cpp
index 40f7aa5a48ce26ca99e6ff8c6dd73ee3189eb488..56a18c43efaa8a8f4e2d11de96888f2e0632e089 100644 (file)
--- 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-2019  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>
@@ -38,11 +37,12 @@ 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();
   }
 }
 
+// LCOV_EXCL_START
 void Model_ResultField::colorConfigInfo(std::string& theSection, std::string& theName,
                                        std::string& theDefault)
 {
@@ -50,6 +50,7 @@ void Model_ResultField::colorConfigInfo(std::string& theSection, std::string& th
   theName = "result_field_color";
   theDefault = DEFAULT_COLOR();
 }
+// LCOV_EXCL_STOP
 
 std::shared_ptr<GeomAPI_Shape> Model_ResultField::shape()
 {
@@ -105,11 +106,12 @@ void Model_ResultField::updateSteps()
   int aNbSteps = stepsSize();
   if (mySteps.size() != aNbSteps) {
     while(mySteps.size() > aNbSteps) {
-      delete mySteps.back();
+      //delete mySteps.back();
       mySteps.pop_back();
     }
     while(mySteps.size() < aNbSteps) {
-      mySteps.push_back(new Model_ResultField::Model_FieldStep(this, int(mySteps.size())));
+      mySteps.push_back(FieldStepPtr(new Model_ResultField::Model_FieldStep(this,
+        int(mySteps.size()))));
     }
   }
 }
@@ -140,11 +142,20 @@ std::string Model_ResultField::textLine(int theLine) const
   return "";
 }
 
-
-ModelAPI_ResultField::ModelAPI_FieldStep* Model_ResultField::step(int theId) const
+// used by GUI only
+// LCOV_EXCL_START
+std::shared_ptr<ModelAPI_ResultField::ModelAPI_FieldStep> Model_ResultField::step(int theId) const
 {
   if (theId < mySteps.size()) {
     return mySteps[theId];
   }
   return NULL;
 }
+
+std::string Model_ResultField::Model_FieldStep::name() {
+  std::ostringstream aStream;
+  aStream<<myParent->data()->name()<<std::endl;
+  aStream<<"Step "<<(myId + 1)<<" "<<myParent->textLine(myId);
+  return aStream.str();
+}
+// LCOV_EXCL_STOP