NPAL16559 (EDF507: Measure->Angle) and NPAL16572 (EDF510: Open/Closed surface concept)

diff --git a/src/GEOMGUI/GEOM_images.po b/src/GEOMGUI/GEOM_images.po
index 410405e9d1f550a81579b1b78358e61a6c00381e..e555f35ef4829c7757c832e84a90103dd6a8e650 100644 (file)
--- a/src/GEOMGUI/GEOM_images.po
+++ b/src/GEOMGUI/GEOM_images.po
@@ -269,6 +269,10 @@ msgstr "whatis.png"
 msgid "ICON_DLG_MINDIST"
 msgstr "mindist.png"
 
+#AngleDlg
+msgid "ICON_DLG_ANGLE"
+msgstr "angle.png"
+
 #MirrorDlg (MZN: add icons for point and axe)
 msgid "ICON_DLG_MIRROR_POINT"
 msgstr "mirrorPoint.png"
@@ -737,6 +741,9 @@ msgstr "bounding.png"
 msgid "ICO_MIN_DIST"
 msgstr "mindist.png"
 
+msgid "ICO_MEASURE_ANGLE"
+msgstr "angle.png"
+
 msgid "ICO_TOLERANCE"
 msgstr "tolerance.png"
 
@@ -789,4 +796,4 @@ msgid "ICO_SOLID_SEL_ONLY"
 msgstr "build_solid.png"
 
 msgid "ICO_COMPOUND_SEL_ONLY"
-msgstr "build_compound.png"
\ No newline at end of file
+msgstr "build_compound.png"

diff --git a/src/GEOMGUI/GEOM_msg_en.po b/src/GEOMGUI/GEOM_msg_en.po
index 3a2e2c94daef49e87d1c8291dfe7cef1a76ba451..6489e4de0b64f9efba97abfa1749b8442fd2f945 100644 (file)
--- a/src/GEOMGUI/GEOM_msg_en.po
+++ b/src/GEOMGUI/GEOM_msg_en.po
@@ -877,6 +877,22 @@ msgstr "Minimun Distance Between Two Objects"
 msgid "GEOM_MINDIST_OBJ"
 msgstr "Objects And Results"
 
+#: GeometryGUI_AngleDlg.cxx:82
+msgid "GEOM_MEASURE_ANGLE_TITLE"
+msgstr "Angle Between Two Objects"
+
+#: GeometryGUI_AngleDlg.cxx:86
+msgid "GEOM_MEASURE_ANGLE_ANGLE"
+msgstr "Angle"
+
+#: GeometryGUI_AngleDlg.cxx:90
+msgid "GEOM_MEASURE_ANGLE_OBJ"
+msgstr "Objects And Results"
+
+#: GeometryGUI_AngleDlg.cxx:93
+msgid "GEOM_MEASURE_ANGLE_IS"
+msgstr "Angle is :"
+
 #: GeometryGUI_EdgeDlg.cxx:47
 msgid "GEOM_EDGE_TITLE"
 msgstr "Create An Edge"
@@ -2714,6 +2730,15 @@ msgstr "Min distance"
 msgid "STB_MIN_DIST"
 msgstr "Compute minimum distance"
 
+msgid "TOP_MEASURE_ANGLE"
+msgstr "Compute angle"
+
+msgid "MEN_MEASURE_ANGLE"
+msgstr "Angle"
+
+msgid "STB_MEASURE_ANGLE"
+msgstr "Compute angle between two lines or linear edges"
+
 msgid "TOP_TOLERANCE"
 msgstr "Compute tolerance"
 

diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index db235071fc6beb7807e2f03f0920c0299ee1395b..ee421a5d641116d3f3ddc408ae1cc28c2082c383 100644 (file)
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -511,8 +511,8 @@ void GeometryGUI::OnGUIEvent( int id )
            id == 606 ||   // MENU REPAIR - CLOSE CONTOUR
            id == 607 ||   // MENU REPAIR - REMOVE INTERNAL WIRES
            id == 608 ||   // MENU REPAIR - ADD POINT ON EDGE
-           id == 609 ||   // MENU REPAIR - FREE BOUNDARIES
-           id == 610 ||   // MENU REPAIR - FREE FACES
+           id == 609 ||   // MENU MEASURE - FREE BOUNDARIES
+           id == 610 ||   // MENU MEASURE - FREE FACES
            id == 611 ||   // MENU REPAIR - CHANGE ORIENTATION
           id == 602 ) {  // MENU REPAIR - GLUE FACES
 #ifndef WNT
@@ -526,6 +526,7 @@ void GeometryGUI::OnGUIEvent( int id )
           id == 703   ||  // MENU MEASURE - INERTIA
           id == 7041  ||  // MENU MEASURE - BOUNDING BOX
           id == 7042  ||  // MENU MEASURE - MIN DISTANCE
+          id == 7043  ||  // MENU MEASURE - ANGLE
           id == 705   ||  // MENU MEASURE - TOLERANCE
           id == 706   ||  // MENU MEASURE - WHATIS
           id == 707   ||  // MENU MEASURE - CHECK
@@ -848,6 +849,7 @@ void GeometryGUI::initialize( CAM_Application* app )
   createGeomAction( 703, "INERTIA" );
   createGeomAction( 7041, "BND_BOX" );
   createGeomAction( 7042, "MIN_DIST" );
+  createGeomAction( 7043, "MEASURE_ANGLE" );
 
   createGeomAction( 705, "TOLERANCE" );
   createGeomAction( 706, "WHAT_IS" );
@@ -990,8 +992,8 @@ void GeometryGUI::initialize( CAM_Application* app )
   createMenu( 601, repairId, -1 );
   createMenu( 602, repairId, -1 );
   createMenu( 608, repairId, -1 );
-  createMenu( 609, repairId, -1 );
-  createMenu( 610, repairId, -1 );
+  //createMenu( 609, repairId, -1 );
+  //createMenu( 610, repairId, -1 );
   createMenu( 611, repairId, -1 );
 
   int measurId = createMenu( tr( "MEN_MEASURES" ), -1, -1, 10 );
@@ -1000,11 +1002,17 @@ void GeometryGUI::initialize( CAM_Application* app )
   createMenu( separator(), measurId, -1 );
   createMenu( 702, measurId, -1 );
   createMenu( 703, measurId, -1 );
+  // NPAL16572: move "Check free boundaries" and "Check free faces" from "Repair" to "Measure"
+  createMenu( separator(), measurId, -1 );
+  createMenu( 609, measurId, -1 );
+  createMenu( 610, measurId, -1 );
+  // NPAL16572 END
   createMenu( separator(), measurId, -1 );
 
   int dimId = createMenu( tr( "MEN_DIMENSIONS" ), measurId, -1 );
   createMenu( 7041, dimId, -1 );
   createMenu( 7042, dimId, -1 );
+  createMenu( 7043, dimId, -1 );
   createMenu( separator(), measurId, -1 );
 
   createMenu( 705, measurId, -1 );