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

diff --git a/src/SMESHGUI/SMESHGUI_SewingDlg.cxx b/src/SMESHGUI/SMESHGUI_SewingDlg.cxx
index 048d93cabb19d5e3b5afdd4f1141b40b5fdcb4ca..cefe45d6bbaf74c59e3658699fd17abf64021f28 100644 (file)
--- 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);
 
       }
       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();
 
 
       QApplication::restoreOverrideCursor();
 

diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index 6461586bdacbc7898c41b6f7ee499a19f067f030..06e6981ee49b30ac26f3c07f75256e00e9508494 100644 (file)
--- 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.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);

       }
     }
   }
       }
     }
   }