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
Join modifications from V3_2_0_maintainance branch
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_GroupDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_GroupDlg.h
b/src/SMESHGUI/SMESHGUI_GroupDlg.h
index c3fae7debf2d5504c0085b6e736da3c74c8ace90..be6f5ebdd8845bea1fdf6d208774f46b40f04d85 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_GroupDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_GroupDlg.h
@@
-28,6
+28,8
@@
#ifndef DIALOGBOX_GROUP_H
#define DIALOGBOX_GROUP_H
#ifndef DIALOGBOX_GROUP_H
#define DIALOGBOX_GROUP_H
+#include "SMESH_SMESHGUI.hxx"
+
#include "LightApp_SelectionMgr.h"
//#include "SMESH_TypeFilter.hxx"
#include "SUIT_SelectionFilter.h"
#include "LightApp_SelectionMgr.h"
//#include "SMESH_TypeFilter.hxx"
#include "SUIT_SelectionFilter.h"
@@
-45,13
+47,17
@@
class QLineEdit;
class QButtonGroup;
class QGroupBox;
class QListBox;
class QButtonGroup;
class QGroupBox;
class QListBox;
+class QPopupMenu;
class QPushButton;
class QPushButton;
+class QToolButton;
class QCheckBox;
class QWidgetStack;
class QtxIntSpinBox;
class SMESHGUI;
class SMESH_Actor;
class SMESHGUI_FilterDlg;
class QCheckBox;
class QWidgetStack;
class QtxIntSpinBox;
class SMESHGUI;
class SMESH_Actor;
class SMESHGUI_FilterDlg;
+class SMESHGUI_ShapeByMeshOp;
+class SUIT_Operation;
class SVTK_Selector;
class SVTK_ViewWindow;
class SVTK_Selector;
class SVTK_ViewWindow;
@@
-59,7
+65,7
@@
class SVTK_ViewWindow;
// class : SMESHGUI_GroupDlg
// purpose :
//=================================================================================
// class : SMESHGUI_GroupDlg
// purpose :
//=================================================================================
-class SMESHGUI_GroupDlg : public QDialog
+class SMESHGUI_
EXPORT SMESHGUI_
GroupDlg : public QDialog
{
Q_OBJECT
{
Q_OBJECT
@@
-107,6
+113,12
@@
private slots:
void onNbColorsChanged(const QString& text);
void onFilterAccepted();
void onNbColorsChanged(const QString& text);
void onFilterAccepted();
+ void onGeomPopup( int );
+ void onGeomSelectionButton( bool );
+
+ void onPublishShapeByMeshDlg(SUIT_Operation*);
+ void onCloseShapeByMeshDlg(SUIT_Operation*);
+
private:
void initDialog(bool create);
void init(SMESH::SMESH_Mesh_ptr theMesh);
private:
void initDialog(bool create);
void init(SMESH::SMESH_Mesh_ptr theMesh);
@@
-114,8
+126,10
@@
private:
void closeEvent(QCloseEvent* e);
void enterEvent (QEvent*);
void hideEvent (QHideEvent*); /* ESC key */
void closeEvent(QCloseEvent* e);
void enterEvent (QEvent*);
void hideEvent (QHideEvent*); /* ESC key */
+ void keyPressEvent(QKeyEvent*);
void setSelectionMode(int theMode);
void updateButtons();
void setSelectionMode(int theMode);
void updateButtons();
+ void updateGeomPopup();
SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */
LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */
SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */
LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */
@@
-149,14
+163,17
@@
private:
QtxIntSpinBox* myColorSpinBox;
QCheckBox* mySelectGeomGroup;
QtxIntSpinBox* myColorSpinBox;
QCheckBox* mySelectGeomGroup;
- Q
Push
Button* myGeomGroupBtn;
+ Q
Tool
Button* myGeomGroupBtn;
QLineEdit* myGeomGroupLine;
QLineEdit* myGeomGroupLine;
+ QPopupMenu* myGeomPopup;
+
+ SMESHGUI_ShapeByMeshOp* myShapeByMeshOp;
SMESH::SMESH_Mesh_var myMesh;
SMESH::SMESH_Group_var myGroup;
SMESH::SMESH_GroupOnGeom_var myGroupOnGeom;
QValueList<int> myIdList;
SMESH::SMESH_Mesh_var myMesh;
SMESH::SMESH_Group_var myGroup;
SMESH::SMESH_GroupOnGeom_var myGroupOnGeom;
QValueList<int> myIdList;
- GEOM::
GEOM_Object_var myGeomGroup
;
+ GEOM::
ListOfGO_var myGeomObjects
;
int mySelectionMode;
//Handle(SMESH_TypeFilter) myMeshFilter;
int mySelectionMode;
//Handle(SMESH_TypeFilter) myMeshFilter;
@@
-165,6
+182,7
@@
private:
SUIT_SelectionFilter* myMeshFilter;
SUIT_SelectionFilter* mySubMeshFilter;
SUIT_SelectionFilter* myGroupFilter;
SUIT_SelectionFilter* myMeshFilter;
SUIT_SelectionFilter* mySubMeshFilter;
SUIT_SelectionFilter* myGroupFilter;
+ SUIT_SelectionFilter* myGeomFilter;
SMESHGUI_FilterDlg* myFilterDlg;
SMESHGUI_FilterDlg* myFilterDlg;