X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_MacroCircle.cpp;h=6822989a2595b3f2ad58a405904b97c9f9f50dae;hb=f51f8ab55887ac6eff49fb9937a460abe1956517;hp=0bcabf4ff4731a90b7d26c7f2f34fffe07ca4cc9;hpb=c4eab94a20a0d93100549a210582d46409fec1cc;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_MacroCircle.cpp b/src/SketchPlugin/SketchPlugin_MacroCircle.cpp index 0bcabf4ff..6822989a2 100644 --- 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 aReentrantMessage = std::dynamic_pointer_cast(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(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());