Issue #2612 : Re-calculate model after modification of parameters

[modules/shaper.git] / src / ModelAPI / ModelAPI_Feature.cpp

diff --git a/src/ModelAPI/ModelAPI_Feature.cpp b/src/ModelAPI/ModelAPI_Feature.cpp
index bb387f81c92d22e435e60be0ec24141fc4123301..236ee3dffae018b4abd0b3d589a3f5ede79e74b2 100644 (file)
--- a/src/ModelAPI/ModelAPI_Feature.cpp
+++ b/src/ModelAPI/ModelAPI_Feature.cpp
@@ -1,8 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        ModelAPI_Feature.cpp
-// Created:     17 Jul 2014
-// Author:      Mikhail PONIKAROV
+// Copyright (C) 2014-2017  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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// 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
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
 
 #include "ModelAPI_Feature.h"
 #include <ModelAPI_Events.h>
@@ -104,7 +118,8 @@ void ModelAPI_Feature::eraseResultFromList(const std::shared_ptr<ModelAPI_Result
   }
 }
 
-void ModelAPI_Feature::removeResults(const int theSinceIndex, const bool theFlush)
+void ModelAPI_Feature::removeResults(
+  const int theSinceIndex, const bool theForever, const bool theFlush)
 {
   std::list<std::shared_ptr<ModelAPI_Result> >::iterator aResIter = myResults.begin();
   for(int anIndex = 0; anIndex < theSinceIndex && aResIter != myResults.end(); anIndex++)
@@ -115,12 +130,12 @@ void ModelAPI_Feature::removeResults(const int theSinceIndex, const bool theFlus
   while( aNextIter != myResults.end()) {
     aGroup = (*aNextIter)->groupName();
     // remove previously erased results: to enable later if needed only actual (of history change)
-    //if (theSinceIndex == 0 && (*aNextIter)->isDisabled()) {
-    //  aNextIter = myResults.erase(aNextIter);
-    //} else {
-      (*aNextIter)->setDisabled(*aNextIter, true); // just disable results
+    (*aNextIter)->setDisabled(*aNextIter, true); // just disable results
+    if (theForever) {
+      aNextIter = myResults.erase(aNextIter);
+    } else {
       aNextIter++;
-    //}
+    }
   }
   if (!aGroup.empty() && theFlush) {
     // flush visualisation changes
@@ -132,9 +147,9 @@ void ModelAPI_Feature::removeResults(const int theSinceIndex, const bool theFlus
   }
 }
 
-void ModelAPI_Feature::eraseResults()
+void ModelAPI_Feature::eraseResults(const bool theForever)
 {
-  removeResults(0);
+  removeResults(0, theForever, true);
 }
 
 const std::string& ModelAPI_Feature::documentToAdd()
@@ -166,7 +181,8 @@ void ModelAPI_Feature::erase()
 
 ModelAPI_Feature::~ModelAPI_Feature()
 {
-  erase();
+  if (data() && data()->isValid())
+    erase();
 }
 
 FeaturePtr ModelAPI_Feature::feature(ObjectPtr theObject)
@@ -192,7 +208,7 @@ bool ModelAPI_Feature::setDisabled(const bool theFlag)
   if (myIsDisabled != theFlag) {
     myIsDisabled = theFlag;
     if (myIsDisabled) {
-      removeResults(0, false); // flush will be in setCurrentFeature
+      removeResults(0, false, false); // flush will be in setCurrentFeature
     } else {
       // enable all disabled previously results
       std::list<std::shared_ptr<ModelAPI_Result> >::iterator aResIter = myResults.begin();