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
0021339: EDF 1928 SMESH: Create group of 0D elements
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_GroupDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_GroupDlg.h
b/src/SMESHGUI/SMESHGUI_GroupDlg.h
index da356287d8dd689e0408811d3d54e6fd672caaed..f3cb58f0fe5e90730c2bec23c4228438a8bc3773 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_GroupDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_GroupDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
1
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
2
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
@@
-39,6
+39,7
@@
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Mesh)
#include CORBA_SERVER_HEADER(SMESH_Group)
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Mesh)
#include CORBA_SERVER_HEADER(SMESH_Group)
+#include CORBA_SERVER_HEADER(SMESH_Filter)
class QGroupBox;
class QLabel;
class QGroupBox;
class QLabel;
@@
-60,6
+61,7
@@
class SUIT_Operation;
class SVTK_Selector;
class SUIT_SelectionFilter;
class LightApp_SelectionMgr;
class SVTK_Selector;
class SUIT_SelectionFilter;
class LightApp_SelectionMgr;
+class SMESH_LogicalFilter;
//=================================================================================
// class : SMESHGUI_GroupDlg
//=================================================================================
// class : SMESHGUI_GroupDlg
@@
-139,12
+141,14
@@
private:
void setGroupQColor( const QColor& );
QColor getGroupQColor() const;
void setGroupQColor( const QColor& );
QColor getGroupQColor() const;
-
+ void setDefaultName() const;
void setDefaultGroupColor();
void setIsApplyAndClose( const bool theFlag );
bool isApplyAndClose() const;
void setDefaultGroupColor();
void setIsApplyAndClose( const bool theFlag );
bool isApplyAndClose() const;
-
+
+ private:
+
SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */
LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */
int myGrpTypeId; /* Current group type id : standalone or group on geometry */
SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */
LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */
int myGrpTypeId; /* Current group type id : standalone or group on geometry */
@@
-164,9
+168,10
@@
private:
QStackedWidget* myWGStack;
QCheckBox* mySelectAll;
QStackedWidget* myWGStack;
QCheckBox* mySelectAll;
+ QCheckBox* myAllowElemsModif;
QLabel* myElementsLab;
QListWidget* myElements;
QLabel* myElementsLab;
QListWidget* myElements;
- QPushButton* myFilter;
+ QPushButton* myFilter
Btn
;
QPushButton* myAddBtn;
QPushButton* myRemoveBtn;
QPushButton* mySortBtn;
QPushButton* myAddBtn;
QPushButton* myRemoveBtn;
QPushButton* mySortBtn;
@@
-197,6
+202,8
@@
private:
QList<SMESH_Actor*> myActorsList;
SMESH::SMESH_Group_var myGroup;
SMESH::SMESH_GroupOnGeom_var myGroupOnGeom;
QList<SMESH_Actor*> myActorsList;
SMESH::SMESH_Group_var myGroup;
SMESH::SMESH_GroupOnGeom_var myGroupOnGeom;
+ SMESH::SMESH_GroupOnFilter_var myGroupOnFilter;
+ SMESH::Filter_var myFilter;
QList<int> myIdList;
GEOM::ListOfGO_var myGeomObjects;
QList<int> myIdList;
GEOM::ListOfGO_var myGeomObjects;
@@
-205,8
+212,8
@@
private:
//Handle(SMESH_TypeFilter) mySubMeshFilter;
//Handle(SMESH_TypeFilter) myGroupFilter;
SUIT_SelectionFilter* myMeshFilter;
//Handle(SMESH_TypeFilter) mySubMeshFilter;
//Handle(SMESH_TypeFilter) myGroupFilter;
SUIT_SelectionFilter* myMeshFilter;
- S
UIT_SelectionFilter*
mySubMeshFilter;
- S
UIT_SelectionFilter*
myGroupFilter;
+ S
MESH_LogicalFilter*
mySubMeshFilter;
+ S
MESH_LogicalFilter*
myGroupFilter;
SUIT_SelectionFilter* myGeomFilter;
SMESHGUI_FilterDlg* myFilterDlg;
SUIT_SelectionFilter* myGeomFilter;
SMESHGUI_FilterDlg* myFilterDlg;
@@
-218,6
+225,7
@@
private:
QMap<QAction*, int> myActions;
bool myNameChanged; //added by skl for IPAL19574
QMap<QAction*, int> myActions;
bool myNameChanged; //added by skl for IPAL19574
+ int myNbChangesOfContents; // nb add's and remove's
QString myObjectToSelect;
bool myIsApplyAndClose;
QString myObjectToSelect;
bool myIsApplyAndClose;