From 434479009dcf4b66fcd5e7e93e5fc3fcc9517da2 Mon Sep 17 00:00:00 2001
From: nds <nds@opencascade.com>
Date: Mon, 3 Apr 2017 16:20:56 +0300
Subject: [PATCH] Issue #2024 Redesign of circle and arc of circle : build
 coincidence to attribute selected on previous macro arc.

Filling of Center attribute is approved by DBV.
---
 src/SketchPlugin/SketchPlugin_MacroArc.cpp | 28 +++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/SketchPlugin/SketchPlugin_MacroArc.cpp b/src/SketchPlugin/SketchPlugin_MacroArc.cpp
index e2d9940f3..e963cfe14 100644
--- a/src/SketchPlugin/SketchPlugin_MacroArc.cpp
+++ b/src/SketchPlugin/SketchPlugin_MacroArc.cpp
@@ -215,6 +215,11 @@ void SketchPlugin_MacroArc::attributeChanged(const std::string& theID)
   }
 
   bool aWasBlocked = data()->blockSendAttributeUpdated(true);
+  if(myCenter.get()) {
+    // center attribute is used in processEvent() to set reference to reentrant arc
+    std::dynamic_pointer_cast<GeomDataAPI_Point2D>(attribute(CENTER_POINT_ID()))
+        ->setValue(myCenter);
+  }
   real(RADIUS_ID())->setValue(aRadius);
   real(ANGLE_ID())->setValue(anAngle);
   data()->blockSendAttributeUpdated(aWasBlocked, false);
@@ -400,16 +405,33 @@ std::string SketchPlugin_MacroArc::processEvent(const std::shared_ptr<Events_Mes
           aPointAttr->setValue(aClickedPoint);
           // fill reference attribute
           AttributeRefAttrPtr aRefAttr = std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(
-                                                            attribute(aReferenceAttributeName));
+                                                          attribute(aReferenceAttributeName));
           if (aRefAttr.get()) {
-            if (anAttribute.get())
+            if (anAttribute.get()) {
+              if (!anAttribute->owner().get() || !anAttribute->owner()->data()->isValid()) {
+                FeaturePtr aCreatedFeature = aReentrantMessage->createdFeature();
+                if (aCreatedFeature.get()) {
+                  std::string anID = anAttribute->id();
+                  std::string anArcID;
+                  if (anID == END_POINT_1_ID() || anID == END_POINT_2_ID() ||
+                      anID == END_POINT_3_ID())
+                    anArcID = SketchPlugin_Arc::END_ID();
+                  else if (anID == START_POINT_1_ID() || anID ==START_POINT_2_ID())
+                    anArcID = SketchPlugin_Arc::START_ID();
+                  else if (anID == CENTER_POINT_ID())
+                    anArcID = SketchPlugin_Arc::CENTER_ID();
+                  anAttribute = aCreatedFeature->attribute(anArcID);
+                }
+              }
               aRefAttr->setAttr(anAttribute);
+            }
             else if (anObject.get()) {
               // if presentation of previous reentrant macro arc is used, the object is invalid,
               // we should use result of previous feature of the message(Arc)
               if (!anObject->data()->isValid()) {
                 FeaturePtr aCreatedFeature = aReentrantMessage->createdFeature();
-                anObject = aCreatedFeature->lastResult();
+                if (aCreatedFeature.get())
+                  anObject = aCreatedFeature->lastResult();
               }
               aRefAttr->setObject(anObject);
             }
-- 
2.39.2