X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_MultiRotation.cpp;h=8bdf4ef847b72b8abf595c2a42fa21231b6d712d;hb=cdbbde4803e9c320204d537d22af4ac7ef024962;hp=0b798f30cc9579e3009346f055a4c37d06cb9b06;hpb=6d31c8100e6a561ec496f1ea1d010984da58c0b5;p=modules%2Fshaper.git

diff --git a/src/SketchPlugin/SketchPlugin_MultiRotation.cpp b/src/SketchPlugin/SketchPlugin_MultiRotation.cpp
old mode 100755
new mode 100644
index 0b798f30c..8bdf4ef84
--- a/src/SketchPlugin/SketchPlugin_MultiRotation.cpp
+++ b/src/SketchPlugin/SketchPlugin_MultiRotation.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  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
@@ -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 "SketchPlugin_MultiRotation.h"
@@ -101,6 +100,11 @@ void SketchPlugin_MultiRotation::execute()
   if (isUpdateFlushed)
     Events_Loop::loop()->setFlushed(anUpdateEvent, false);
 
+  // Save the current feature of the document, because new features may appear while executing.
+  // In this case, they will become current. But if the number of copies is updated from outside
+  // of sketch (e.g. by parameter change), the history line should not hold in sketch.
+  keepCurrentFeature();
+
   std::shared_ptr<ModelAPI_Data> aData = data();
   AttributeRefListPtr aRefListOfShapes = std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(
       aData->attribute(SketchPlugin_Constraint::ENTITY_A()));
@@ -153,6 +157,7 @@ void SketchPlugin_MultiRotation::execute()
       anInitIter++;
   }
   ModelAPI_Tools::removeFeaturesAndReferences(aFeaturesToBeRemoved);
+  aFeaturesToBeRemoved.clear();
   // change number of copies
   if (aCurrentNbCopies != 0 && aNbCopies != aCurrentNbCopies) {
     bool isAdd = aNbCopies > aCurrentNbCopies;
@@ -163,7 +168,6 @@ void SketchPlugin_MultiRotation::execute()
     aTargetList = aRefListOfRotated->list();
     aTargetIter = aTargetList.begin();
     ObjectPtr anObjToCopy = *aTargetIter;
-    std::set<FeaturePtr> aFeaturesToBeRemoved;
     while (aTargetIter != aTargetList.end()) {
       aRefListOfRotated->remove(*aTargetIter);
       aTargetIter++;
@@ -196,6 +200,7 @@ void SketchPlugin_MultiRotation::execute()
       }
     }
     ModelAPI_Tools::removeFeaturesAndReferences(aFeaturesToBeRemoved);
+    aFeaturesToBeRemoved.clear();
 
     for (aTargetIter = aTargetList.begin(); aTargetIter != aTargetList.end(); aTargetIter++)
       aRefListOfRotated->append(*aTargetIter);
@@ -211,16 +216,7 @@ void SketchPlugin_MultiRotation::execute()
     }
   }
 
-////  if (fabs(anAngle) > 1.e-12) {
-////    // Recalculate positions of features
-////    aTargetList = aRefListOfRotated->list();
-////    aTargetIter = aTargetList.begin();
-////    while (aTargetIter != aTargetList.end()) {
-////      ObjectPtr anInitialObject = *aTargetIter++;
-////      for (int i = 0; i < aNbCopies && aTargetIter != aTargetList.end(); i++, aTargetIter++)
-//// rotateFeature(anInitialObject, *aTargetIter, aCenter->x(), aCenter->y(), anAngle * (i + 1));
-////    }
-////  }
+  restoreCurrentFeature();
 
   // send events to update the sub-features by the solver
   if (isUpdateFlushed)