From 7c2599769744bac022a3470d8d2c2d32e4da1a6d Mon Sep 17 00:00:00 2001 From: jfa Date: Wed, 31 Oct 2007 09:56:04 +0000 Subject: [PATCH] NPAL16559: Measure Angle. Show errors; fix some text labels. --- src/GEOMGUI/GEOM_msg_en.po | 6 +++--- src/MeasureGUI/MeasureGUI_AngleDlg.cxx | 13 ++++++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/GEOMGUI/GEOM_msg_en.po b/src/GEOMGUI/GEOM_msg_en.po index 187b1ac5e..722993755 100644 --- 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 468d6788c..167422f5f 100644 --- 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 @@ -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; -- 2.39.2