NPAL16559: Measure Angle. Show errors; fix some text labels.

diff --git a/src/GEOMGUI/GEOM_msg_en.po b/src/GEOMGUI/GEOM_msg_en.po
index 187b1ac5eab45c5a0dd5f4c13668ddf49e9810d5..722993755b16a13c55e51ade2f72a16e0471fdbe 100644 (file)
--- a/src/GEOMGUI/GEOM_msg_en.po
+++ b/src/GEOMGUI/GEOM_msg_en.po
@@ -335,7 +335,7 @@ msgstr "Height :"
 
 #Length
 msgid "GEOM_LENGTH"
-msgstr "Length is :"
+msgstr "Length :"
 
 #Weight
 msgid "GEOM_WEIGHT"
@@ -914,7 +914,7 @@ msgstr "Objects And Results"
 
 #: GeometryGUI_AngleDlg.cxx:82
 msgid "GEOM_MEASURE_ANGLE_TITLE"
-msgstr "Angle Between Two Objects"
+msgstr "Angle Between Two Straight Edges/Lines/Vectors"
 
 #: GeometryGUI_AngleDlg.cxx:86
 msgid "GEOM_MEASURE_ANGLE_ANGLE"
@@ -926,7 +926,7 @@ msgstr "Objects And Results"
 
 #: GeometryGUI_AngleDlg.cxx:93
 msgid "GEOM_MEASURE_ANGLE_IS"
-msgstr "Angle is :"
+msgstr "Angle in degrees :"
 
 #: GeometryGUI_EdgeDlg.cxx:47
 msgid "GEOM_EDGE_TITLE"

diff --git a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx
index 468d6788c95fea7befeb7dc2168a6ed630b10b25..167422f5fe62bc6619481de2fbec8d1fb8ebf27f 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx
@@ -33,12 +33,15 @@
 #include "GEOMBase.h"
 #include "GEOM_Displayer.h"
 #include "DlgRef_SpinBox.h"
+#include "GeometryGUI.h"
 
 #include "SUIT_Session.h"
 #include "SUIT_ViewWindow.h"
+#include "SUIT_MessageBox.h"
 #include "SOCC_Prs.h"
 #include "SOCC_ViewModel.h"
 #include "SalomeApp_Tools.h"
+#include "SalomeApp_Application.h"
 
 // OCCT Includes
 #include <AIS_AngleDimension.hxx>
@@ -196,7 +199,15 @@ bool MeasureGUI_AngleDlg::getParameters (double& theAngle)
       return false;
     }
 
-    return getOperation()->IsDone();
+    bool isDone = getOperation()->IsDone();
+    if (!isDone) {
+      CORBA::String_var aMsg = getOperation()->GetErrorCode();
+      SUIT_MessageBox::warn1((QWidget*)myGeomGUI->getApp()->desktop(),
+                             QObject::tr("WRN_WARNING"),
+                             QObject::tr(aMsg.in()),
+                             QObject::tr("BUT_OK"));
+    }
+    return isDone;
   }
 
   return false;