From 676ee79de539b14b242a561857c1505cce13d951 Mon Sep 17 00:00:00 2001 From: nds Date: Thu, 17 Mar 2016 14:26:30 +0300 Subject: [PATCH] Issue 1299 Angle presentation: complementary angle. --- src/PartSet/PartSet_icons.qrc | 2 +- ...le_supplementary.png => angle_complementary.png} | Bin src/SketchPlugin/SketchPlugin_ConstraintAngle.cpp | 2 +- src/SketchPlugin/plugin-Sketch.xml | 4 ++-- src/SketcherPrs/SketcherPrs_Angle.cpp | 2 +- src/SketcherPrs/SketcherPrs_Tools.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename src/PartSet/icons/{angle_supplementary.png => angle_complementary.png} (100%) diff --git a/src/PartSet/PartSet_icons.qrc b/src/PartSet/PartSet_icons.qrc index da666716b..e725a6a82 100644 --- a/src/PartSet/PartSet_icons.qrc +++ b/src/PartSet/PartSet_icons.qrc @@ -6,7 +6,7 @@ icons/angle_up.png icons/angle_direct.png icons/angle_down.png - icons/angle_supplementary.png + icons/angle_complementary.png icons/arc.png icons/arc_base_32x32.png icons/arc_3pt_32x32.png diff --git a/src/PartSet/icons/angle_supplementary.png b/src/PartSet/icons/angle_complementary.png similarity index 100% rename from src/PartSet/icons/angle_supplementary.png rename to src/PartSet/icons/angle_complementary.png diff --git a/src/SketchPlugin/SketchPlugin_ConstraintAngle.cpp b/src/SketchPlugin/SketchPlugin_ConstraintAngle.cpp index 8caf3ee89..91469e9ce 100644 --- a/src/SketchPlugin/SketchPlugin_ConstraintAngle.cpp +++ b/src/SketchPlugin/SketchPlugin_ConstraintAngle.cpp @@ -198,7 +198,7 @@ double SketchPlugin_ConstraintAngle::calculateAngle() switch (anAngleType) { case SketcherPrs_Tools::ANGLE_DIRECT: break; - case SketcherPrs_Tools::ANGLE_SUPPLEMENTARY: + case SketcherPrs_Tools::ANGLE_COMPLEMENTARY: anAngle = 180 - anAngle; break; case SketcherPrs_Tools::ANGLE_BACKWARD: diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml index 5e1e924db..380a120f3 100644 --- a/src/SketchPlugin/plugin-Sketch.xml +++ b/src/SketchPlugin/plugin-Sketch.xml @@ -211,8 +211,8 @@ buttons_dir="horizontal" label="Angle type" tooltip="Type of angle" - string_list="Direct Supplementary Backward" - icons_list=":icons/angle_direct.png :icons/angle_supplementary.png :icons/angle_backward.png" + string_list="Direct Complementary Additional" + icons_list=":icons/angle_direct.png :icons/angle_complementary.png :icons/angle_backward.png" default="0" /> diff --git a/src/SketcherPrs/SketcherPrs_Angle.cpp b/src/SketcherPrs/SketcherPrs_Angle.cpp index 42934eb7f..2d4e5838e 100644 --- a/src/SketcherPrs/SketcherPrs_Angle.cpp +++ b/src/SketcherPrs/SketcherPrs_Angle.cpp @@ -121,7 +121,7 @@ void SketcherPrs_Angle::Compute(const Handle(PrsMgr_PresentationManager3d)& theP SetMeasuredGeometry(aEdge1, aEdge2); } break; - case SketcherPrs_Tools::ANGLE_SUPPLEMENTARY: { + case SketcherPrs_Tools::ANGLE_COMPLEMENTARY: { // to calculate center, first and end points SetGeometryOrientedAngle(false, false); SetMeasuredGeometry(aEdge1, aEdge2); diff --git a/src/SketcherPrs/SketcherPrs_Tools.h b/src/SketcherPrs/SketcherPrs_Tools.h index 7e10fac73..f6f8c3ac7 100644 --- a/src/SketcherPrs/SketcherPrs_Tools.h +++ b/src/SketcherPrs/SketcherPrs_Tools.h @@ -44,7 +44,7 @@ namespace SketcherPrs_Tools { /// Type of angle enum AngleType{ ANGLE_DIRECT, ///< Angle from the first line to the second line - ANGLE_SUPPLEMENTARY, ///< Additional angle to the angle from first to second line + ANGLE_COMPLEMENTARY, ///< Additional angle to the angle from first to second line ANGLE_BACKWARD ///< Angle from the second line to the first line }; -- 2.39.2