Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0023064: [CEA 1471] Create and support quadratic polygons in SMESH
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MergeDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_MergeDlg.h
b/src/SMESHGUI/SMESHGUI_MergeDlg.h
index dd9458d616b6c44bd658b356dcd53bc6a7a0c511..b003b3842f42006ad215816093742e201d3497f7 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MergeDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_MergeDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-78,9
+78,7
@@
public:
private:
void Init();
private:
void Init();
- void closeEvent( QCloseEvent* );
void enterEvent( QEvent* ); /* mouse enter the QWidget */
void enterEvent( QEvent* ); /* mouse enter the QWidget */
- void hideEvent( QHideEvent* ); /* ESC key */
void keyPressEvent( QKeyEvent* );
void onEditGroup();
void keyPressEvent( QKeyEvent* );
void onEditGroup();
@@
-132,6
+130,7
@@
private:
QPushButton* AddGroupButton;
QPushButton* RemoveGroupButton;
QCheckBox* SelectAllCB;
QPushButton* AddGroupButton;
QPushButton* RemoveGroupButton;
QCheckBox* SelectAllCB;
+ QCheckBox* ShowIDs;
QGroupBox* GroupEdit;
QListWidget* ListEdit;
QGroupBox* GroupEdit;
QListWidget* ListEdit;
@@
-150,9
+149,11
@@
private:
QString myEntry;
GrpList myGroups;
QString myEntry;
GrpList myGroups;
+protected slots:
+ virtual void reject();
+
private slots:
void ClickOnOk();
private slots:
void ClickOnOk();
- void ClickOnCancel();
bool ClickOnApply();
void ClickOnHelp();
void updateControls();
bool ClickOnApply();
void ClickOnHelp();
void updateControls();
@@
-170,6
+171,8
@@
private:
void DeactivateActiveDialog();
void ActivateThisDialog();
void onTypeChanged(int);
void DeactivateActiveDialog();
void ActivateThisDialog();
void onTypeChanged(int);
+ void onOpenView();
+ void onCloseView();
};
#endif // SMESHGUI_MergeDlg_H
};
#endif // SMESHGUI_MergeDlg_H