bos #20661 EDF 22847 - Move to the end

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

diff --git a/src/SketchPlugin/SketchPlugin_MacroCircle.cpp b/src/SketchPlugin/SketchPlugin_MacroCircle.cpp
index 0bcabf4ff4731a90b7d26c7f2f34fffe07ca4cc9..6822989a2595b3f2ad58a405904b97c9f9f50dae 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_MacroCircle.cpp
+++ b/src/SketchPlugin/SketchPlugin_MacroCircle.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2020  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
@@ -126,7 +126,6 @@ std::string SketchPlugin_MacroCircle::processEvent(
   std::shared_ptr<SketchPlugin_MacroArcReentrantMessage> aReentrantMessage =
         std::dynamic_pointer_cast<SketchPlugin_MacroArcReentrantMessage>(theMessage);
   if (aReentrantMessage.get()) {
-    FeaturePtr aCreatedFeature = aReentrantMessage->createdFeature();
     std::string aCircleType = aReentrantMessage->typeOfCreation();
 
     string(CIRCLE_TYPE())->setValue(aCircleType);
@@ -289,10 +288,10 @@ void SketchPlugin_MacroCircle::fillByThreePoints()
       aCircBuilder.addPassingPoint(aPassedPoint);
     else {
       aCircBuilder.addTangentCurve(aTangentCurve);
-      AttributePoint2DPtr aPassedPoint =
+      AttributePoint2DPtr aPassedPointAttr =
           std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aPassedAttr);
-      if (aPassedPoint)
-        aCircBuilder.setClosestPoint(aPassedPoint->pnt());
+      if (aPassedPointAttr)
+        aCircBuilder.setClosestPoint(aPassedPointAttr->pnt());
     }
   }
 
@@ -389,11 +388,14 @@ AISObjectPtr SketchPlugin_MacroCircle::getAISObject(AISObjectPtr thePrevious)
     anAIS.reset(new GeomAPI_AISObject());
   }
   anAIS->createShape(aCompound);
+
+  // Modify attributes
+  SketchPlugin_Tools::customizeFeaturePrs(anAIS, boolean(AUXILIARY_ID())->value());
+
   return anAIS;
 }
 
 void SketchPlugin_MacroCircle::attributeChanged(const std::string& theID) {
-  double aRadius = 0.0;
   // If circle type switched reset all attributes.
   if(theID == CIRCLE_TYPE()) {
     SketchPlugin_Tools::resetAttribute(this, CENTER_POINT_ID());