ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-02-21 00:09:42 +05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jfa 2007-10-31 10:06:29 +00:00
parent 450f829f37
commit 9b6fcc08eb
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/GEOMGUI/GEOM_msg_en.po
View File

@ -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"

13
src/MeasureGUI/MeasureGUI_AngleDlg.cxx
View File

@ -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;