Fix for import/export features

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

diff --git a/src/SketchPlugin/SketchPlugin_MultiRotation.cpp b/src/SketchPlugin/SketchPlugin_MultiRotation.cpp
index 982524cf25939be974df8eb9fa7ed27d2a8aac08..5b4f02c81ffbb150807309fbdd16af0d13fd394d 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_MultiRotation.cpp
+++ b/src/SketchPlugin/SketchPlugin_MultiRotation.cpp
@@ -22,6 +22,8 @@
 
 #include <SketcherPrs_Factory.h>
 
+#include <cmath>
+
 #define PI 3.1415926535897932
 
 SketchPlugin_MultiRotation::SketchPlugin_MultiRotation()
@@ -45,6 +47,12 @@ void SketchPlugin_MultiRotation::initAttributes()
 
 void SketchPlugin_MultiRotation::execute()
 {
+  if (!sketch()) {
+    // it is possible, that this method is called before this feature has back reference to sketch
+    // in this case, the execute is performed after this is done
+    return;
+  }
+
   AttributeSelectionListPtr aRotationObjectRefs = selectionList(ROTATION_LIST_ID());
   int aNbCopies = integer(NUMBER_OF_COPIES_ID())->value();
 
@@ -53,6 +61,9 @@ void SketchPlugin_MultiRotation::execute()
       attribute(CENTER_ID()));
   if (!aCenter || !aCenter->isInitialized())
     return;
+  // make a visible points
+  SketchPlugin_Sketch::createPoint2DResult(this, sketch(), CENTER_ID(), 0);
+
   double anAngle = std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(
       attribute(ANGLE_ID()))->value();
   // Convert angle to radians
@@ -95,6 +106,7 @@ void SketchPlugin_MultiRotation::execute()
   for (; aUsedIter != isUsed.end(); aUsedIter++) {
     if (!(*aUsedIter)) {
       aRefListOfShapes->remove(*anInitIter);
+      aRefListOfRotated->remove(*aTargetIter++);
       for (int i = 0; i < aCurrentNbCopies && aTargetIter != aTargetList.end(); i++, aTargetIter++) {
         aRefListOfRotated->remove(*aTargetIter);
         // remove the corresponding feature from the sketch
@@ -204,8 +216,7 @@ ObjectPtr SketchPlugin_MultiRotation::copyFeature(ObjectPtr theObject)
   if (!aFeature || !aResult)
     return ObjectPtr();
 
-  FeaturePtr aNewFeature = sketch()->addFeature(aFeature->getKind());
-  aFeature->data()->copyTo(aNewFeature->data());
+  FeaturePtr aNewFeature = SketchPlugin_Sketch::addUniqueNamedCopiedFeature(aFeature, sketch());
   aNewFeature->execute();
 
   static Events_ID aRedisplayEvent = Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY);
@@ -231,8 +242,8 @@ void SketchPlugin_MultiRotation::rotateFeature(
     double theCenterX, double theCenterY, double theAngle)
 {
   std::shared_ptr<GeomAPI_Pnt2d> aCenter(new GeomAPI_Pnt2d(theCenterX, theCenterY));
-  double cosA = cos(theAngle);
-  double sinA = sin(theAngle);
+  double cosA = std::cos(theAngle);
+  double sinA = std::sin(theAngle);
 
   FeaturePtr anInitialFeature = ModelAPI_Feature::feature(theInitial);
   FeaturePtr aTargetFeature = ModelAPI_Feature::feature(theTarget);