From: akl <akl@opencascade.com>
Date: Fri, 23 Mar 2007 14:09:47 +0000 (+0000)
Subject: To update MergeEqualElements() interface in accordance with PAL13190 improvement.
X-Git-Tag: V3_2_6pre3~9
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=88935cd2fb171cadfa690492a322af403a4ba4d3;p=modules%2Fsmesh.git

To update MergeEqualElements() interface in accordance with PAL13190 improvement.
---

diff --git a/src/SMESHGUI/SMESHGUI_SewingDlg.cxx b/src/SMESHGUI/SMESHGUI_SewingDlg.cxx
index 048d93cab..cefe45d6b 100644
--- a/src/SMESHGUI/SMESHGUI_SewingDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_SewingDlg.cxx
@@ -561,8 +561,11 @@ bool SMESHGUI_SewingDlg::ClickOnApply()
       }
       aResult = (anError == SMESH::SMESH_MeshEditor::SEW_OK);
 
-      if (toMerge && aResult)
-        aMeshEditor->MergeEqualElements();
+      if (toMerge && aResult) {
+	SMESH::array_of_long_array_var aGroupsOfElementsID = new SMESH::array_of_long_array;
+	aMeshEditor->FindEqualElements(myMesh, aGroupsOfElementsID);
+        aMeshEditor->MergeEqualElements(aGroupsOfElementsID.inout());
+      }
 
       QApplication::restoreOverrideCursor();
 
diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index 6461586bd..06e6981ee 100644
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -1319,7 +1319,10 @@ SMESH::SMESH_Mesh_ptr SMESH_Gen_i::Concatenate(const SMESH::mesh_array& theMeshe
 	aNewEditor.FindCoincidentNodes( aMeshNodes, theMergeTolerance, aGroupsOfNodes );
 	aNewEditor.MergeNodes( aGroupsOfNodes );
 	// merge elements
-	aNewEditor.MergeEqualElements();
+	set<const SMDS_MeshElement*> aMeshElements; // no input elements
+	SMESH_MeshEditor::TListOfListOfElementsID aGroupsOfElementsID;
+	aNewEditor.FindEqualElements(aMeshElements, aGroupsOfElementsID);
+	aNewEditor.MergeEqualElements(aGroupsOfElementsID);
       }
     }
   }