From 1572a8b60d29fe628015b1781f5f61092f16b636 Mon Sep 17 00:00:00 2001 From: azv Date: Wed, 4 Jul 2018 07:43:26 +0300 Subject: [PATCH] Fix for issue #2545: Radius is not calculated on arc --- .../FeaturesPlugin_Measurement.cpp | 2 +- src/FeaturesPlugin/Test/Test2545.py | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 src/FeaturesPlugin/Test/Test2545.py diff --git a/src/FeaturesPlugin/FeaturesPlugin_Measurement.cpp b/src/FeaturesPlugin/FeaturesPlugin_Measurement.cpp index 0082c2ffd..6b00601e3 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Measurement.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Measurement.cpp @@ -164,7 +164,7 @@ void FeaturesPlugin_Measurement::computeRadius() if (aShape) { if (aShape->isEdge()) { GeomEdgePtr anEdge(new GeomAPI_Edge(aShape)); - if (anEdge->isCircle()) { + if (anEdge->isCircle() || anEdge->isArc()) { aRadius = anEdge->circle()->radius(); } } else if (aShape->isFace()) { diff --git a/src/FeaturesPlugin/Test/Test2545.py b/src/FeaturesPlugin/Test/Test2545.py new file mode 100644 index 000000000..dcc1b884c --- /dev/null +++ b/src/FeaturesPlugin/Test/Test2545.py @@ -0,0 +1,39 @@ +## Copyright (C) 2018-20xx 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 +## License as published by the Free Software Foundation; either +## version 2.1 of the License, or (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## Lesser General Public License for more details. +## +## 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 +## +## See http:##www.salome-platform.org/ or +## email : webmaster.salome@opencascade.com +## + +from salome.shaper import model +import math + +model.begin() +partSet = model.moduleDocument() +Part_1 = model.addPart(partSet) +Part_1_doc = Part_1.document() +ParamR = model.addParameter(Part_1_doc, "R", "100") +Sketch_1 = model.addSketch(Part_1_doc, model.defaultPlane("XOY")) +SketchArc_1 = Sketch_1.addArc(-47.73523320343703, -72.31551328948351, 43.26553250145439, -30.85636904935887, -50.76060275488791, 27.63871192924931, False) +SketchConstraintRadius_1 = Sketch_1.setRadius(SketchArc_1.results()[1], "R") +model.do() +Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_1/Edge-SketchArc_1_2")]) +model.do() + +radius = model.measureRadius(Part_1_doc, model.selection("EDGE", "Edge_1_1")) +assert(math.fabs(radius - ParamR.value()) < 1.e-7) + +model.end() -- 2.39.2