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 23078: [CEA 1498] Sewing of meshes without having to set the nodes ids
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MergeDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_MergeDlg.h
b/src/SMESHGUI/SMESHGUI_MergeDlg.h
index 754dde0f0e87f469bbd4902da377f2c914a36e68..52fd3d556d26e97f9dbf4c76ebd5c0ed3b2bcd83 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MergeDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_MergeDlg.h
@@
-38,25
+38,27
@@
// STL includes
#include <list>
// STL includes
#include <list>
+#include <vector>
// IDL includes
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Mesh)
// IDL includes
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Mesh)
+class LightApp_SelectionMgr;
+class QButtonGroup;
+class QCheckBox;
class QGroupBox;
class QLabel;
class QLineEdit;
class QGroupBox;
class QLabel;
class QLineEdit;
+class QListWidget;
class QPushButton;
class QRadioButton;
class QPushButton;
class QRadioButton;
-class QCheckBox;
-class QListWidget;
-class QButtonGroup;
class SMESHGUI;
class SMESHGUI;
+class SMESHGUI_IdPreview;
class SMESHGUI_SpinBox;
class SMESH_Actor;
class SMESHGUI_SpinBox;
class SMESH_Actor;
-class SVTK_Selector;
-class LightApp_SelectionMgr;
class SUIT_SelectionFilter;
class SUIT_SelectionFilter;
+class SVTK_Selector;
class TColStd_MapOfInteger;
namespace SMESH
class TColStd_MapOfInteger;
namespace SMESH
@@
-76,6
+78,8
@@
public:
SMESHGUI_MergeDlg( SMESHGUI*, int );
~SMESHGUI_MergeDlg();
SMESHGUI_MergeDlg( SMESHGUI*, int );
~SMESHGUI_MergeDlg();
+ static QPixmap IconFirst();
+
private:
void Init();
void enterEvent( QEvent* ); /* mouse enter the QWidget */
private:
void Init();
void enterEvent( QEvent* ); /* mouse enter the QWidget */
@@
-84,7
+88,8
@@
private:
bool isKeepNodesIDsSelection();
bool isNewKeepNodesGroup( const char* entry );
bool isKeepNodesIDsSelection();
bool isNewKeepNodesGroup( const char* entry );
- void FindGravityCenter( TColStd_MapOfInteger&,
+ void FindGravityCenter( TColStd_MapOfInteger&,
+ std::vector<int>& ,
std::list<gp_XYZ>& );
// add the centers of gravity of ElemsIdMap elements to the GrCentersXYZ list
std::list<gp_XYZ>& );
// add the centers of gravity of ElemsIdMap elements to the GrCentersXYZ list
@@
-103,7
+108,7
@@
private:
SUIT_SelectionFilter* myMeshOrSubMeshOrGroupFilter;
SUIT_SelectionFilter* mySubMeshOrGroupFilter;
SUIT_SelectionFilter* myMeshOrSubMeshOrGroupFilter;
SUIT_SelectionFilter* mySubMeshOrGroupFilter;
- SMESH
::TIdPreview*
myIdPreview;
+ SMESH
GUI_IdPreview*
myIdPreview;
int myAction;
bool myIsBusy;
int myAction;
bool myIsBusy;