Update for bug 0019891 from Mantis.

diff --git a/doc/salome/gui/GEOM/input/tui_measurement_tools.doc b/doc/salome/gui/GEOM/input/tui_measurement_tools.doc
index 1b49413947326c16ff9de8ad07f0c85b75b761c1..ff70d793a218f2a6e7fe758b384197c3893a16e6 100644 (file)
--- a/doc/salome/gui/GEOM/input/tui_measurement_tools.doc
+++ b/doc/salome/gui/GEOM/input/tui_measurement_tools.doc
@@ -286,6 +286,13 @@ if math.fabs(Angle - 45.0) > 1e-05:
     print "  Error: returned angle is", Angle, "while must be 45.0"
     pass
 
+Angle = geompy.GetAngleRadians(OX, OXY)
+
+print "\nAngle between OX and OXY in radians = ", Angle
+if math.fabs(Angle - math.pi/4) > 1e-05:
+    print "  Error: returned angle is", Angle, "while must be pi/4"
+    pass
+
 # not in one plane
 OXY_shift = geompy.MakeTranslation(OXY,10,-10,20)
 Angle = geompy.GetAngle(OX, OXY_shift)

diff --git a/doc/salome/gui/GEOM/input/using_measurement_tools.doc b/doc/salome/gui/GEOM/input/using_measurement_tools.doc
index 4793b929917ad6f9ebf79f89b2602c708f04ee89..506fe2cffddb90939fff102ea60e51dcc233aebe 100644 (file)
--- a/doc/salome/gui/GEOM/input/using_measurement_tools.doc
+++ b/doc/salome/gui/GEOM/input/using_measurement_tools.doc
@@ -148,9 +148,11 @@ distance is computed.
 \anchor angle_anchor
 <br><h2>Angle</h2>
 
-\n Returns the angle between two lines or linear edges
+\n Returns the angle between two lines or linear edges in degrees
 \n <b>TUI Command:</b> <em>geompy.GetAngle(shape1, shape2),</em> where
-Shape1 and Shape2 are shapes between which the angle is computed.
+Shape1 and Shape2 are shapes between which the angle is computed. 
+Another TUI command is <em>geompy.GetAngleRadians(shape1,shape2),</em> 
+which returns the value of angle in radians.
 
 \image html angle.png
 

diff --git a/src/GEOM_SWIG/geompyDC.py b/src/GEOM_SWIG/geompyDC.py
index cdb8854ed83acdd4241c4683c1dc362d626e6032..29d14debfc4dd69991e27806378e0bd5d4339277 100644 (file)
--- a/src/GEOM_SWIG/geompyDC.py
+++ b/src/GEOM_SWIG/geompyDC.py
@@ -2414,9 +2414,9 @@ class geompyDC(GEOM._objref_GEOM_Gen):
             aRes = [aTuple[0], aTuple[4] - aTuple[1], aTuple[5] - aTuple[2], aTuple[6] - aTuple[3]]
             return aRes
 
-        ## Get angle between the given shapes.
+        ## Get angle between the given shapes in degrees.
         #  @param theShape1,theShape2 Lines or linear edges to find angle between.
-        #  @return Value of the angle between the given shapes.
+        #  @return Value of the angle between the given shapes in degrees.
         #
         #  @ref tui_measurement_tools_page "Example"
         def GetAngle(self, theShape1, theShape2):
@@ -2424,6 +2424,11 @@ class geompyDC(GEOM._objref_GEOM_Gen):
             anAngle = self.MeasuOp.GetAngle(theShape1, theShape2)
             RaiseIfFailed("GetAngle", self.MeasuOp)
             return anAngle
+        ## Get angle between the given shapes in radians.
+        #  @param theShape1,theShape2 Lines or linear edges to find angle between.
+        #  @return Value of the angle between the given shapes in radians.
+        #
+        #  @ref tui_measurement_tools_page "Example"
         def GetAngleRadians(self, theShape1, theShape2):
             # Example: see GEOM_TestMeasures.py
             anAngle = self.MeasuOp.GetAngle(theShape1, theShape2)*math.pi/180.