T1.2-1

Icons/Mesasages and commands for:
- check blocks compound
- getting free faces
- propagate

diff --git a/src/GEOMGUI/GEOM_icons.po b/src/GEOMGUI/GEOM_icons.po
index 97e439650c3e610a584f8bf94cde1f98f898a740..1f9aeab345811e187f6c8d3c23797d53db95ec29 100644 (file)
--- a/src/GEOMGUI/GEOM_icons.po
+++ b/src/GEOMGUI/GEOM_icons.po
@@ -344,6 +344,9 @@ msgstr "chamferface.png"
 msgid "ICON_DLG_CHECKSHAPE"
 msgstr "check.png"
 
+msgid "ICON_DLG_CHECK_COMPOUND_OF_BLOCKS"
+msgstr "check_blocks_compound.png"
+
 #SupressFaceDlg
 msgid "ICON_DLG_SUPRESS_FACE"
 msgstr "supressface.png"
@@ -486,3 +489,9 @@ msgstr "block_face_4e.png"
 
 msgid "ICON_DLG_GLUE_FACES"
 msgstr "glue.png"
+
+msgid "ICON_DLG_FREE_FACES"
+msgstr "free_faces.png"
+
+msgid "ICON_DLG_PROPAGATE"
+msgstr "propagate.png"

diff --git a/src/GEOMGUI/GEOM_msg_en.po b/src/GEOMGUI/GEOM_msg_en.po
index d889f8371fee8ce364491a12634eed299aa3404a..45a186b5561afc7647b246362e1215e89beb74b2 100644 (file)
--- a/src/GEOMGUI/GEOM_msg_en.po
+++ b/src/GEOMGUI/GEOM_msg_en.po
@@ -527,6 +527,25 @@ msgstr "Chamfer"
 msgid "GEOM_CHECK_SHAPE"
 msgstr "Check Shape"
 
+#Check Blocks Compound
+msgid "GEOM_CHECK_BLOCKS_COMPOUND"
+msgstr "Check Blocks Compound"
+
+#Check Blocks Compound Errors
+msgid "GEOM_CHECK_BLOCKS_COMPOUND_ERRORS"
+msgstr "Errors"
+
+#Check Blocks Compound Errors
+msgid "GEOM_CHECK_BLOCKS_COMPOUND_HAS_NO_ERRORS"
+msgstr "The Compound of Blocks has no errors"
+
+msgid "GEOM_CHECK_BLOCKS_COMPOUND_HAS_ERRORS"
+msgstr "The Compound of Blocks has errors"
+
+#Check Blocks Compound SubShapes
+msgid "GEOM_CHECK_BLOCKS_COMPOUND_SUBSHAPES"
+msgstr "Incriminated Sub-Shapes"
+
 #Whatis
 msgid "GEOM_WHATIS"
 msgstr "Whatis"
@@ -820,6 +839,10 @@ msgstr "Cylinder Construction"
 msgid "GEOM_CHECK_TITLE"
 msgstr "Check Shape Informations"
 
+#: MeasureGUI_CheckCompoundOfBlocks.cxx:61
+msgid "GEOM_CHECK_COMPOUND_BLOCKS_TITLE"
+msgstr "Check Blocks Compound"
+
 #: GeometryGUI_CheckShape.cxx:83
 msgid "GEOM_CHECK_INFOS"
 msgstr "Object And Its Topological Informations"
@@ -1595,6 +1618,9 @@ msgstr "Detect"
 msgid "GEOM_FREE_BOUNDARIES"
 msgstr "Free boundaries"
 
+msgid "GEOM_FREE_FACES"
+msgstr "Free faces"
+
 msgid "GEOM_BY_PARAMETER"
 msgstr "By parameter"
 
@@ -1905,6 +1931,9 @@ msgstr "Glue faces"
 msgid "GEOM_GLUE"
 msgstr "Glue"
 
+msgid "GEOM_FREE_FACES_TITLE"
+msgstr "Free faces"
+
 ### New object names for RepairGUI ###
 msgid "SEWING_NEW_OBJ_NAME"
 msgstr "Sewing"
@@ -1933,4 +1962,10 @@ msgstr "SupressFaces"
 msgid "NON_GEOM_OBJECTS_SELECTED"
 msgstr "There are objects selected which do not belong to %1 component."
 
+msgid "GEOM_PROPAGATE_TITLE"
+msgstr "Propagate"
+
+msgid "GEOM_PROPAGATE"
+msgstr "Propagate"
+
 ###

diff --git a/src/GEOMGUI/GEOM_msg_fr.po b/src/GEOMGUI/GEOM_msg_fr.po
index e56d06af559d0372fc678c2c04c64025d7ecf3c6..3a3e3c4813c77b0ed14b71aa351e29c2846d62b0 100644 (file)
--- a/src/GEOMGUI/GEOM_msg_fr.po
+++ b/src/GEOMGUI/GEOM_msg_fr.po
@@ -516,6 +516,25 @@ msgstr "Chanfrein"
 msgid "GEOM_CHECK_SHAPE"
 msgstr "Check Shape"
 
+#Check Blocks Compound
+msgid "GEOM_CHECK_BLOCKS_COMPOUND"
+msgstr "Check Blocks Compound"
+
+#Check Blocks Compound Errors
+msgid "GEOM_CHECK_BLOCKS_COMPOUND_ERRORS"
+msgstr "Errors"
+
+#Check Blocks Compound Errors
+msgid "GEOM_CHECK_BLOCKS_COMPOUND_HAS_NO_ERRORS"
+msgstr "The Compound of Blocks has no errors"
+
+msgid "GEOM_CHECK_BLOCKS_COMPOUND_HAS_ERRORS"
+msgstr "The Compound of Blocks has errors"
+
+#Check Blocks Compound SubShapes
+msgid "GEOM_CHECK_BLOCKS_COMPOUND_SUBSHAPES"
+msgstr "Incriminated Sub-Shapes"
+
 #Whatis
 msgid "GEOM_WHATIS"
 msgstr "Whatis"
@@ -803,6 +822,10 @@ msgstr "Construction d'un Cylindre"
 msgid "GEOM_CHECK_TITLE"
 msgstr "Check Shape"
 
+#: MeasureGUI_CheckCompoundOfBlocks.cxx:61
+msgid "GEOM_CHECK_COMPOUND_BLOCKS_TITLE"
+msgstr "Check Blocks Compound"
+
 #: GeometryGUI_CheckShape.cxx:83
 msgid "GEOM_CHECK_INFOS"
 msgstr "Objet et ses Informations Topologiques"
@@ -1348,3 +1371,15 @@ msgstr "Create a copy"
 #MZN: to be translated
 msgid "GEOM_CREATE_SINGLE_SOLID"
 msgstr "Create a single solid"
+
+msgid "GEOM_FREE_FACES"
+msgstr "Free faces"
+
+msgid "GEOM_FREE_FACES_TITLE"
+msgstr "Free faces"
+
+msgid "GEOM_PROPAGATE_TITLE"
+msgstr "Propagate"
+
+msgid "GEOM_PROPAGATE"
+msgstr "Propagate"

diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index f6766b6778c9f3f857d66cd216950949f493a959..6987b1d2a16f00529388789677da4d218ea14e77 100644 (file)
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -403,17 +403,19 @@ bool GeometryGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
            theCommandID == 607 ||   // MENU REPAIR - REMOVE INTERNAL WIRES
            theCommandID == 608 ||   // MENU REPAIR - ADD POINT ON EDGE
            theCommandID == 609 ||   // MENU REPAIR - FREE BOUNDARIES
+           theCommandID == 610 ||   // MENU REPAIR - FREE FACES
           theCommandID == 602 ) {  // MENU REPAIR - GLUE FACES
     library = geomGUI->getLibrary( "libRepairGUI.so" );
   }
-  else if( theCommandID == 701  ||  // MENU MEASURE - PROPERTIES
-          theCommandID == 702  ||  // MENU MEASURE - CDG
-          theCommandID == 703  ||  // MENU MEASURE - INERTIA
-          theCommandID == 7041 ||  // MENU MEASURE - BOUNDING BOX
-          theCommandID == 7042 ||  // MENU MEASURE - MIN DISTANCE
-          theCommandID == 705  ||  // MENU MEASURE - TOLERANCE
-          theCommandID == 706  ||  // MENU MEASURE - WHATIS
-          theCommandID == 707  ||  // MENU MEASURE - CHECK
+  else if( theCommandID == 701   ||  // MENU MEASURE - PROPERTIES
+          theCommandID == 702   ||  // MENU MEASURE - CDG
+          theCommandID == 703   ||  // MENU MEASURE - INERTIA
+          theCommandID == 7041  ||  // MENU MEASURE - BOUNDING BOX
+          theCommandID == 7042  ||  // MENU MEASURE - MIN DISTANCE
+          theCommandID == 705   ||  // MENU MEASURE - TOLERANCE
+          theCommandID == 706   ||  // MENU MEASURE - WHATIS
+          theCommandID == 707   ||  // MENU MEASURE - CHECK
+          theCommandID == 7072  ||  // MENU MEASURE - CHECK COMPOUND OF BLOCKS
           theCommandID == 708 ) {  // MENU MEASURE - POINT COORDINATES
     library = geomGUI->getLibrary( "libMeasureGUI.so" );
   }
@@ -421,9 +423,10 @@ bool GeometryGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
           theCommandID == 801 ) {  // MENU GROUP - EDIT
     library = geomGUI->getLibrary( "libGroupGUI.so" );
   }
-  else if( theCommandID == 9999 ||  // MENU BLOCKS - HEXAHEDRAL SOLID
-           theCommandID == 9998 ||  // MENU BLOCKS - MULTI-TRANSFORMATION
-           theCommandID == 9997 ||  // MENU BLOCKS - QUADRANGLE FACE
+  else if( theCommandID == 9999  ||  // MENU BLOCKS - HEXAHEDRAL SOLID
+           theCommandID == 9998  ||  // MENU BLOCKS - MULTI-TRANSFORMATION
+           theCommandID == 9997  ||  // MENU BLOCKS - QUADRANGLE FACE
+           theCommandID == 99991 ||  // MENU BLOCKS - PROPAGATE
            theCommandID == 9995 ) { // MENU BLOCKS - EXPLODE ON BLOCKS
     library = geomGUI->getLibrary( "libBlocksGUI.so" );
   }