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

This commit is contained in:
akl 2007-03-23 14:09:47 +00:00
parent f899a9e718
commit 88935cd2fb
2 changed files with 9 additions and 3 deletions

View File

@ -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();

View File

@ -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);
}
}
}