ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-30 19:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

PAL13190 (EDF159 SMESH: in Merge Nodes and Merge Elements, visualisze nodes or meshes twice):

Browse Source 
union MergeNodes and MergeElements dialogs into 'SMESHGUI_EditMeshDlg' and reconstruct its.
This commit is contained in:
akl 2007-03-23 14:42:48 +00:00
parent 0bef4d9457
commit 3cbe51225b
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/SMESHGUI/SMESHGUI.cxx
View File

@ -57,7 +57,6 @@
#include "SMESHGUI_RotationDlg.h" #include "SMESHGUI_RotationDlg.h"
#include "SMESHGUI_SymmetryDlg.h" #include "SMESHGUI_SymmetryDlg.h"
#include "SMESHGUI_SewingDlg.h" #include "SMESHGUI_SewingDlg.h"
#include "SMESHGUI_MergeNodesDlg.h"
#include "SMESHGUI_EditMeshDlg.h" #include "SMESHGUI_EditMeshDlg.h"
#include "SMESHGUI_MeshPatternDlg.h" #include "SMESHGUI_MeshPatternDlg.h"
#include "SMESHGUI_Selection.h" #include "SMESHGUI_Selection.h"
@ -2151,7 +2150,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
if(checkLock(aStudy)) break; if(checkLock(aStudy)) break;
if(vtkwnd) { if(vtkwnd) {
EmitSignalDeactivateDialog(); EmitSignalDeactivateDialog();
new SMESHGUI_MergeNodesDlg( this ); new SMESHGUI_EditMeshDlg( this, 0 );
} }
else { else {
SUIT_MessageBox::warn1(desktop(), SUIT_MessageBox::warn1(desktop(),
@ -2165,10 +2164,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
if (checkLock(aStudy)) break; if (checkLock(aStudy)) break;
if (vtkwnd) { if (vtkwnd) {
EmitSignalDeactivateDialog(); EmitSignalDeactivateDialog();
new SMESHGUI_EditMeshDlg(this, new SMESHGUI_EditMeshDlg( this, 1 );
"SMESH_MERGE_ELEMENTS_TITLE",
"ICON_DLG_MERGE_ELEMENTS",
1); // MergeEqualElemets
} else { } else {
SUIT_MessageBox::warn1(desktop(), SUIT_MessageBox::warn1(desktop(),
tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"), tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK"),