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
IMP 23373: [CEA 1170] Optimization of a 3D mesh using MG-Tetra
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MergeDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_MergeDlg.h
b/src/SMESHGUI/SMESHGUI_MergeDlg.h
index 52fd3d556d26e97f9dbf4c76ebd5c0ed3b2bcd83..5e827abc84198e250aca314d5d6614c615cdc3ef 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MergeDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_MergeDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-35,6
+35,7
@@
// OCCT includes
#include <gp_XYZ.hxx>
// OCCT includes
#include <gp_XYZ.hxx>
+#include <TColStd_MapOfInteger.hxx>
// STL includes
#include <list>
// STL includes
#include <list>
@@
-59,7
+60,6
@@
class SMESHGUI_SpinBox;
class SMESH_Actor;
class SUIT_SelectionFilter;
class SVTK_Selector;
class SMESH_Actor;
class SUIT_SelectionFilter;
class SVTK_Selector;
-class TColStd_MapOfInteger;
namespace SMESH
{
namespace SMESH
{
@@
-115,8
+115,6
@@
private:
int myTypeId; // manual(1) or automatic(0)
// Widgets
int myTypeId; // manual(1) or automatic(0)
// Widgets
- QGroupBox* GroupConstructors;
- QRadioButton* RadioButton;
QGroupBox* GroupButtons;
QPushButton* buttonOk;
QGroupBox* GroupButtons;
QPushButton* buttonOk;
@@
-129,11
+127,12
@@
private:
QPushButton* SelectMeshButton;
QLineEdit* LineEditMesh;
QPushButton* SelectMeshButton;
QLineEdit* LineEditMesh;
- QGroupBox* GroupCoincident;
- QWidget* GroupCoincidentWidget;
- QLabel* TextLabelTolerance;
+ QWidget* NodeSpecWidget;
SMESHGUI_SpinBox* SpinBoxTolerance;
QCheckBox* SeparateCornersAndMedium;
SMESHGUI_SpinBox* SpinBoxTolerance;
QCheckBox* SeparateCornersAndMedium;
+
+ QGroupBox* GroupCoincident;
+ //QWidget* GroupCoincidentWidget;
QPushButton* DetectButton;
QListWidget* ListCoincident;
QPushButton* AddGroupButton;
QPushButton* DetectButton;
QListWidget* ListCoincident;
QPushButton* AddGroupButton;
@@
-150,6
+149,7
@@
private:
QGroupBox* GroupExclude;
QListWidget* ListExclude;
QGroupBox* GroupExclude;
QListWidget* ListExclude;
+ QGroupBox* GroupKeep;
QButtonGroup* KeepFromButGroup;
QPushButton* SelectKeepNodesButton;
QPushButton* AddKeepNodesButton;
QButtonGroup* KeepFromButGroup;
QPushButton* SelectKeepNodesButton;
QPushButton* AddKeepNodesButton;