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

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

diff --git a/src/Model/Model_Objects.cpp b/src/Model/Model_Objects.cpp
index 86c9e5e6f16f4153ca54a527fcd580f843a64c14..f0bd858070c7b9ac6cf9fcccfb29d1f2d23f7349 100644 (file)
--- a/src/Model/Model_Objects.cpp
+++ b/src/Model/Model_Objects.cpp
@@ -32,6 +32,8 @@
 #include <ModelAPI_Validator.h>
 #include <ModelAPI_CompositeFeature.h>
 #include <ModelAPI_Tools.h>
+#include <ModelAPI_Filter.h>
+
 
 #include <Events_Loop.h>
 #include <Events_InfoMessage.h>
@@ -770,7 +772,7 @@ void Model_Objects::setUniqueName(FolderPtr theFolder)
   NCollection_DataMap<TDF_Label, ObjectPtr>::Iterator anIt(myFolders);
   while (anIt.More()) {
     if (anIt.Value()->data()->name() == aName) {
-      aName = composeName(ModelAPI_Folder::ID(), aNbFolders);
+      aName = composeName(ModelAPI_Folder::ID(), ++aNbFolders);
       // reinitialize iterator to make sure a new name is unique
       anIt.Initialize(myFolders);
     } else
@@ -874,11 +876,17 @@ void Model_Objects::synchronizeFeatures(
 
       if (anUpdatedMap.Contains(aFeatureLabel)) {
         if (!theOpen) { // on abort/undo/redo reinitialize attributes if something is changed
-          std::list<std::shared_ptr<ModelAPI_Attribute> > anAttrs =
-            anObject->data()->attributes("");
-          std::list<std::shared_ptr<ModelAPI_Attribute> >::iterator anAttr = anAttrs.begin();
-          for(; anAttr != anAttrs.end(); anAttr++)
-            (*anAttr)->reinit();
+          FiltersFeaturePtr aFilter = std::dynamic_pointer_cast<ModelAPI_FiltersFeature>(anObject);
+          if (aFilter.get()) { // for filters attributes may be added/removed on undo/redo
+            std::dynamic_pointer_cast<Model_Data>(aFilter->data())->clearAttributes();
+            aFilter->initAttributes();
+          } else {
+            std::list<std::shared_ptr<ModelAPI_Attribute> > anAttrs =
+              anObject->data()->attributes("");
+            std::list<std::shared_ptr<ModelAPI_Attribute> >::iterator anAttr = anAttrs.begin();
+            for(; anAttr != anAttrs.end(); anAttr++)
+              (*anAttr)->reinit();
+          }
         }
         ModelAPI_EventCreator::get()->sendUpdated(anObject, anUpdateEvent);
         if (aFeature && aFeature->getKind() == "Parameter") {
@@ -1877,7 +1885,9 @@ void Model_Objects::updateResults(FeaturePtr theFeature, std::set<FeaturePtr>& t
         } else if (aGroup->Get() == ModelAPI_ResultGroup::group().c_str()) {
           aNewBody = createGroup(theFeature->data(), aResIndex);
         } else if (aGroup->Get() == ModelAPI_ResultField::group().c_str()) {
-          aNewBody = createField(theFeature->data(), aResIndex);
+          ResultFieldPtr aField = createField(theFeature->data(), aResIndex);
+          aField->updateSteps(); // to refresh the internal data
+          aNewBody = aField;
         } else if (aGroup->Get() == ModelAPI_ResultParameter::group().c_str()) {
           theFeature->attributeChanged("expression"); // just produce a value
         } else {