Improve angle measurement

diff --git a/src/FeaturesPlugin/Test/TestMeasurementAngle.py b/src/FeaturesPlugin/Test/TestMeasurementAngle.py
index d00f1c8422ac7c8a64d4e78cb1d3f0728ddeb91f..b3033467da28140abc54d6a3d790a71631228fe2 100644 (file)
--- a/src/FeaturesPlugin/Test/TestMeasurementAngle.py
+++ b/src/FeaturesPlugin/Test/TestMeasurementAngle.py
@@ -73,13 +73,13 @@ TOLERANCE = 1.e-6
 
 # reference data
 REF_DATA = [("Sketch_1/Edge-SketchLine_3", "Sketch_1/Edge-SketchLine_6", [90]),
-            ("Extrusion_1_1/Generated_Face_5", "Extrusion_1_1/Generated_Face_5&Extrusion_1_1/To_Face_1", [45]),
-            ("Sketch_1/Edge-SketchCircle_1_2", "Extrusion_1_1/Generated_Face_5&Extrusion_1_1/To_Face_1", [0]),
+            ("Extrusion_1_1/Generated_Face_5", "Extrusion_1_1/Generated_Face_5&Extrusion_1_1/To_Face_1", [135]),
+            ("Sketch_1/Edge-SketchCircle_1_2", "Extrusion_1_1/Generated_Face_5&Extrusion_1_1/To_Face_1", [180]),
             ("Sketch_1/Edge-SketchLine_3", "Sketch_1/Edge-SketchCircle_1_2", []),
             ("Extrusion_1_1/Generated_Face_5&Extrusion_1_1/From_Face_1", "Extrusion_1_1/Generated_Face_5&Extrusion_1_1/To_Face_1", []),
             ("Sketch_2/Edge-SketchLine_7", "Extrusion_1_1/To_Face_1&Extrusion_1_1/Generated_Face_4", [130]),
             ("Sketch_2/Edge-SketchLine_7", "Extrusion_1_1/To_Face_1&Extrusion_1_1/Generated_Face_1", [140]),
-            ("Sketch_2/Edge-SketchLine_7", "Extrusion_1_1/Generated_Face_5&Extrusion_1_1/To_Face_1", [85.95645561, 95.19768874])
+            ("Sketch_2/Edge-SketchLine_7", "Extrusion_1_1/Generated_Face_5&Extrusion_1_1/To_Face_1", [58.78794626, 95.19768874])
            ]
 
 for ref in REF_DATA:

diff --git a/src/GeomAPI/GeomAPI_Angle.cpp b/src/GeomAPI/GeomAPI_Angle.cpp
index 97d45ee3ec22f1fd73495f1e8335711432964c6b..c32a2ef169cab74c0dcf12665f4d5b6a2f18c58f 100644 (file)
--- a/src/GeomAPI/GeomAPI_Angle.cpp
+++ b/src/GeomAPI/GeomAPI_Angle.cpp
@@ -59,11 +59,11 @@ GeomAPI_Angle::GeomAPI_Angle(const std::shared_ptr<GeomAPI_Edge>& theEdge1,
 
   GeomAPI_ProjectPointOnCurve aProj1(aPoint, aCurve1);
   if (aProj1.NbPoints() > 0)
-    aCurve1->D1(aProj1.Parameter(1), aP, anAngle->myDir1);
+    aCurve1->D1(aProj1.LowerDistanceParameter(), aP, anAngle->myDir1);
 
   GeomAPI_ProjectPointOnCurve aProj2(aPoint, aCurve2);
   if (aProj2.NbPoints() > 0)
-    aCurve2->D1(aProj2.Parameter(1), aP, anAngle->myDir2);
+    aCurve2->D1(aProj2.LowerDistanceParameter(), aP, anAngle->myDir2);
 
   setImpl(anAngle);
 }