X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_MultiRotation.cpp;h=8bdf4ef847b72b8abf595c2a42fa21231b6d712d;hb=cdbbde4803e9c320204d537d22af4ac7ef024962;hp=3fd19dc330fb75afab595294c0da47b59bb78326;hpb=b3695c3af5289903f1c0fa01bbb7c40203c5e544;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 3fd19dc33..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"
@@ -23,6 +22,7 @@
 
 #include <GeomDataAPI_Point2D.h>
 #include <ModelAPI_AttributeRefAttr.h>
+#include <ModelAPI_AttributeBoolean.h>
 #include <ModelAPI_AttributeDouble.h>
 #include <ModelAPI_AttributeString.h>
 #include <ModelAPI_AttributeInteger.h>
@@ -43,9 +43,12 @@
 
 #include <cmath>
 
-#define PI 3.1415926535897932
+static const double PI = 3.1415926535897932;
+static const double PERIOD = 360.0;
+static const double ANGLETOL = 1.e-7;
 
 SketchPlugin_MultiRotation::SketchPlugin_MultiRotation()
+  : isUpdatingAngle(false)
 {
 }
 
@@ -59,6 +62,8 @@ void SketchPlugin_MultiRotation::initAttributes()
   data()->addAttribute(SketchPlugin_Constraint::ENTITY_A(), ModelAPI_AttributeRefList::typeId());
   data()->addAttribute(SketchPlugin_Constraint::ENTITY_B(), ModelAPI_AttributeRefList::typeId());
   data()->addAttribute(ROTATION_LIST_ID(), ModelAPI_AttributeRefList::typeId());
+  data()->addAttribute(REVERSED_ID(), ModelAPI_AttributeBoolean::typeId());
+
   ModelAPI_Session::get()->validators()->
     registerNotObligatory(getKind(), SketchPlugin_Constraint::ENTITY_A());
   ModelAPI_Session::get()->validators()->
@@ -95,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()));
@@ -147,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;
@@ -157,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++;
@@ -190,6 +200,7 @@ void SketchPlugin_MultiRotation::execute()
       }
     }
     ModelAPI_Tools::removeFeaturesAndReferences(aFeaturesToBeRemoved);
+    aFeaturesToBeRemoved.clear();
 
     for (aTargetIter = aTargetList.begin(); aTargetIter != aTargetList.end(); aTargetIter++)
       aRefListOfRotated->append(*aTargetIter);
@@ -205,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)
@@ -227,7 +229,6 @@ AISObjectPtr SketchPlugin_MultiRotation::getAISObject(AISObjectPtr thePrevious)
     return thePrevious;
 
   AISObjectPtr anAIS = SketcherPrs_Factory::rotateConstraint(this, sketch(),
-                                                             sketch()->coordinatePlane(),
                                                              thePrevious);
   return anAIS;
 }
@@ -372,4 +373,29 @@ void SketchPlugin_MultiRotation::attributeChanged(const std::string& theID)
       reflist(SketchPlugin_Constraint::ENTITY_A())->clear();
     }
   }
+  else if (!isUpdatingAngle && real(ANGLE_ID())->isInitialized())
+  {
+    isUpdatingAngle = true;
+    AttributeDoublePtr anAngle = real(ANGLE_ID());
+    if (theID == ANGLE_TYPE() && integer(NUMBER_OF_OBJECTS_ID())->isInitialized()) {
+      if (string(ANGLE_TYPE())->value() != "SingleAngle")
+        anAngle->setValue(anAngle->value() * (integer(NUMBER_OF_OBJECTS_ID())->value() - 1));
+      else
+      {
+        int aNbSplits = integer(NUMBER_OF_OBJECTS_ID())->value();
+        if (anAngle->value() < PERIOD - ANGLETOL)
+          aNbSplits -= 1;
+        anAngle->setValue(anAngle->value() / aNbSplits);
+      }
+    }
+    else if (theID == ANGLE_ID()) {
+      if (anAngle->value() > PERIOD + ANGLETOL || anAngle->value() < -ANGLETOL)
+        anAngle->setValue(anAngle->value() + PERIOD * ceil(-anAngle->value() / PERIOD));
+      if (fabs(anAngle->value() - PERIOD) < ANGLETOL)
+        anAngle->setValue(PERIOD);
+      else if (fabs(anAngle->value()) < ANGLETOL)
+        anAngle->setValue(0.);
+    }
+    isUpdatingAngle = false;
+  }
 }