PAL13312 (EDF262 SMESH mesh concatenation operation needed):

  add SMESHGUI_BuildCompoundDlg

diff --git a/src/SMESHGUI/Makefile.in b/src/SMESHGUI/Makefile.in
index ee1d7f6919b911af47e8b76bfd6bffa0be51c028..821ca6f91868eee1e66d70887c2416fe554f7708 100644 (file)
--- a/src/SMESHGUI/Makefile.in
+++ b/src/SMESHGUI/Makefile.in
@@ -91,6 +91,7 @@ LIB_SRC =     SMESHGUI.cxx \
                SMESHGUI_SewingDlg.cxx \
                SMESHGUI_MergeNodesDlg.cxx \
                SMESHGUI_EditMeshDlg.cxx \
+               SMESHGUI_BuildCompoundDlg.cxx \
                SMESHGUI_Utils.cxx \
                SMESHGUI_GEOMGenUtils.cxx \
                SMESHGUI_MeshUtils.cxx \
@@ -151,6 +152,7 @@ LIB_MOC = \
                SMESHGUI_SewingDlg.h \
                SMESHGUI_MergeNodesDlg.h \
                SMESHGUI_EditMeshDlg.h \
+               SMESHGUI_BuildCompoundDlg.h \
                SMESHGUI_CreatePolyhedralVolumeDlg.h \
                SMESHGUI_Operation.h \
                SMESHGUI_SelectionOp.h \

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 89d212a3cea60404a85cd8132b7d16150a2fe249..912a26260b870743e27d3136a400c722f05d6ebc 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -66,6 +66,7 @@
 #include "SMESHGUI_MeshOp.h"
 #include "SMESHGUI_Displayer.h"
 #include "SMESHGUI_MakeNodeAtPointDlg.h"
+#include "SMESHGUI_BuildCompoundDlg.h"
 
 #include "SMESHGUI_Utils.h"
 #include "SMESHGUI_GEOMGenUtils.h"
@@ -1391,6 +1392,16 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
   case 704: // Edit mesh/sub-mesh
     startOperation( 704 );
     break;
+  case 710: // Build compound mesh
+    {
+      if (checkLock(aStudy)) break;
+      EmitSignalDeactivateDialog();
+      new SMESHGUI_BuildCompoundDlg( this,
+                                    tr("SMESH_BUILD_COMPOUND_TITLE"),
+                                    tr("ICON_DLG_BUILD_COMPOUND"),
+                                    1 );
+    }
+    break;
   case 407: // DIAGONAL INVERSION
   case 408: // Delete diagonal
     {
@@ -2348,6 +2359,7 @@ void SMESHGUI::initialize( CAM_Application* app )
   createSMESHAction(  702, "CREATE_MESH",     "ICON_DLG_INIT_MESH" );
   createSMESHAction(  703, "CREATE_SUBMESH",  "ICON_DLG_ADD_SUBMESH" );
   createSMESHAction(  704, "EDIT_MESHSUBMESH","ICON_DLG_EDIT_MESH" );
+  createSMESHAction(  710, "BUILD_COMPOUND",  "ICON_UNION" );
   createSMESHAction(  801, "CREATE_GROUP",    "ICON_SMESH_TREE_GROUP" );
   createSMESHAction(  802, "CONSTRUCT_GROUP", "ICON_CONSTRUCT_GROUP" );
   createSMESHAction(  803, "EDIT_GROUP",      "ICON_EDIT_GROUP" );
@@ -2476,6 +2488,8 @@ void SMESHGUI::initialize( CAM_Application* app )
   createMenu( separator(), meshId, -1 );
   createMenu( 701, meshId, -1 );
   createMenu( separator(), meshId, -1 );
+  createMenu( 710, meshId, -1 );
+  createMenu( separator(), meshId, -1 );
   createMenu( 801, meshId, -1 );
   createMenu( 802, meshId, -1 );
   createMenu( 803, meshId, -1 );
@@ -2567,6 +2581,8 @@ void SMESHGUI::initialize( CAM_Application* app )
   createTool( separator(), meshTb );
   createTool( 701, meshTb );
   createTool( separator(), meshTb );
+  createTool( 710, meshTb );
+  createTool( separator(), meshTb );
   createTool( 801, meshTb );
   createTool( 802, meshTb );
   createTool( 803, meshTb );

diff --git a/src/SMESHGUI/SMESH_images.po b/src/SMESHGUI/SMESH_images.po
index faa8a16af00b81f736b6a68cd69bd37a192755d3..c344a5c56c4882a20e469ff5231dfd169e1c0e46 100644 (file)
--- a/src/SMESHGUI/SMESH_images.po
+++ b/src/SMESHGUI/SMESH_images.po
@@ -137,6 +137,10 @@ msgstr "mesh_merge_nodes.png"
 msgid "ICON_DLG_MERGE_ELEMENTS"
 msgstr "mesh_merge_elements.png"
 
+#Build compound
+msgid "ICON_DLG_BUILD_COMPOUND"
+msgstr "mesh_build_compound.png"
+
 #-----------------------------------------------------------
 # Hypothesis
 #-----------------------------------------------------------

diff --git a/src/SMESHGUI/SMESH_msg_en.po b/src/SMESHGUI/SMESH_msg_en.po
index 77ab43c9c6bc6a2b3a21c4bb8f14f6caca1d61bb..a3320a865c214b8b83fe15a61d2c19a09c1bcc31 100644 (file)
--- a/src/SMESHGUI/SMESH_msg_en.po
+++ b/src/SMESHGUI/SMESH_msg_en.po
@@ -790,6 +790,10 @@ msgstr "Create a copy"
 msgid "SMESH_ROTATION"
 msgstr "Rotation"
 
+#Build compound
+msgid "SMESH_BUILD_COMPOUND_TITLE"
+msgstr "Create a Compound"
+
 # -------------- Mesh Infos --------------
 
 #Mesh Infos
@@ -2132,6 +2136,9 @@ msgstr "Compute"
 msgid "MEN_CREATE_SUBMESH"
 msgstr "Create Sub-mesh"
 
+msgid "MEN_BUILD_COMPOUND"
+msgstr "Build Compound"
+
 msgid "MEN_GLOBAL_HYPO"
 msgstr "Global Hypothesis"
 
@@ -2491,6 +2498,9 @@ msgstr "Compute"
 msgid "TOP_CREATE_SUBMESH"
 msgstr "Create Sub-mesh"
 
+msgid "TOP_BUILD_COMPOUND"
+msgstr "Build Compound Mesh"
+
 msgid "TOP_GLOBAL_HYPO"
 msgstr "Global Hypothesis"
 
@@ -2798,6 +2808,9 @@ msgstr "Compute"
 msgid "STB_CREATE_SUBMESH"
 msgstr "Create Sub-mesh"
 
+msgid "STB_BUILD_COMPOUND"
+msgstr "Build Compound Mesh"
+
 msgid "STB_GLOBAL_HYPO"
 msgstr "Global Hypothesis"
 
@@ -3221,6 +3234,31 @@ msgstr "Edit mesh/sub-mesh"
 
 msgid "SMESHGUI_MeshDlg::HYPOTHESES_SETS"
 msgstr "Assign a set of hypotheses"
+#-----------------------------------------------------------
+
+msgid "SMESHGUI_BuildCompoundDlg::COMPOUND"
+msgstr "Compound"
+
+msgid "SMESHGUI_BuildCompoundDlg::RESULT_NAME"
+msgstr "Result name"
+
+msgid "SMESHGUI_BuildCompoundDlg::COMPOUND_MESH"
+msgstr "Compound_Mesh"
+
+msgid "SMESHGUI_BuildCompoundDlg::MESHES"
+msgstr "Meshes"
+
+msgid "SMESHGUI_BuildCompoundDlg::PROCESSING_IDENTICAL_GROUPS"
+msgstr "Processing identical groups"
+
+msgid "SMESHGUI_BuildCompoundDlg::UNITE"
+msgstr "Unite"
+
+msgid "SMESHGUI_BuildCompoundDlg::RENAME"
+msgstr "Rename"
+
+msgid "SMESHGUI_BuildCompoundDlg::MERGE_NODES_AND_ELEMENTS"
+msgstr "Merge coincident nodes and elements"
 
 #-----------------------------------------------------------