From 3cbe51225bf560493a19c0b51192b2a07c389c2c Mon Sep 17 00:00:00 2001 From: akl Date: Fri, 23 Mar 2007 14:42:48 +0000 Subject: [PATCH] PAL13190 (EDF159 SMESH: in Merge Nodes and Merge Elements, visualisze nodes or meshes twice): union MergeNodes and MergeElements dialogs into 'SMESHGUI_EditMeshDlg' and reconstruct its. --- src/SMESHGUI/SMESHGUI.cxx | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx index d56b7424a..e95458723 100644 --- a/src/SMESHGUI/SMESHGUI.cxx +++ b/src/SMESHGUI/SMESHGUI.cxx @@ -57,7 +57,6 @@ #include "SMESHGUI_RotationDlg.h" #include "SMESHGUI_SymmetryDlg.h" #include "SMESHGUI_SewingDlg.h" -#include "SMESHGUI_MergeNodesDlg.h" #include "SMESHGUI_EditMeshDlg.h" #include "SMESHGUI_MeshPatternDlg.h" #include "SMESHGUI_Selection.h" @@ -2151,7 +2150,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) if(checkLock(aStudy)) break; if(vtkwnd) { EmitSignalDeactivateDialog(); - new SMESHGUI_MergeNodesDlg( this ); + new SMESHGUI_EditMeshDlg( this, 0 ); } else { SUIT_MessageBox::warn1(desktop(), @@ -2160,15 +2159,12 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) } break; } - case 4066: // MERGE EQUAL ELEMENTS + case 4066: // MERGE EQUAL ELEMENTS { if (checkLock(aStudy)) break; if (vtkwnd) { EmitSignalDeactivateDialog(); - new SMESHGUI_EditMeshDlg(this, - "SMESH_MERGE_ELEMENTS_TITLE", - "ICON_DLG_MERGE_ELEMENTS", - 1); // MergeEqualElemets + new SMESHGUI_EditMeshDlg( this, 1 ); } else { SUIT_MessageBox::warn1(desktop(), tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),