Test1967: Update tolerance ratio for moving vs creating.

[modules/shaper.git] / src / SketchPlugin / SketchPlugin_MultiRotation.cpp

diff --git a/src/SketchPlugin/SketchPlugin_MultiRotation.cpp b/src/SketchPlugin/SketchPlugin_MultiRotation.cpp
index 12ded259fa8d2d395b030e56e908ee3f7cd8b21a..4e862e11987ee89d71964af248e1f395af997de4 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_MultiRotation.cpp
+++ b/src/SketchPlugin/SketchPlugin_MultiRotation.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -100,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()));
@@ -152,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;
@@ -162,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++;
@@ -195,6 +200,7 @@ void SketchPlugin_MultiRotation::execute()
       }
     }
     ModelAPI_Tools::removeFeaturesAndReferences(aFeaturesToBeRemoved);
+    aFeaturesToBeRemoved.clear();
 
     for (aTargetIter = aTargetList.begin(); aTargetIter != aTargetList.end(); aTargetIter++)
       aRefListOfRotated->append(*aTargetIter);
@@ -210,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)