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
23514: EDF 16031 - SMESH freezes
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_GroupOpDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_GroupOpDlg.h
b/src/SMESHGUI/SMESHGUI_GroupOpDlg.h
index 3386c53ca7d427007658b016069512c0a0a6f323..371ca482c0fcd414a48a81a9fc5622344d2c1d32 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_GroupOpDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_GroupOpDlg.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
@@
-37,14
+37,15
@@
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Group)
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Group)
-class
QPushButton
;
-class Q
txColorButton
;
+class
LightApp_SelectionMgr
;
+class Q
CheckBox
;
class QComboBox;
class QComboBox;
-class QListWidget;
class QGroupBox;
class QLineEdit;
class QGroupBox;
class QLineEdit;
+class QListWidget;
+class QPushButton;
+class QtxColorButton;
class SMESHGUI;
class SMESHGUI;
-class LightApp_SelectionMgr;
class SVTK_Selector;
/*
class SVTK_Selector;
/*
@@
-87,6
+88,7
@@
protected:
SMESH::ListOfGroups* convert( const QList<SMESH::SMESH_GroupBase_var>& );
SALOMEDS::Color getColor() const;
SMESH::ListOfGroups* convert( const QList<SMESH::SMESH_GroupBase_var>& );
SALOMEDS::Color getColor() const;
+ void setDefaultGroupColor();
void setIsApplyAndClose( const bool theFlag );
bool isApplyAndClose() const;
void setIsApplyAndClose( const bool theFlag );
bool isApplyAndClose() const;
@@
-104,6
+106,9
@@
private slots:
void onDeactivate();
void onDeactivate();
+ void onOpenView();
+ void onCloseView();
+
private:
QWidget* createButtonFrame( QWidget* );
QWidget* createMainFrame ( QWidget* );
private:
QWidget* createButtonFrame( QWidget* );
QWidget* createMainFrame ( QWidget* );
@@
-235,8
+240,11
@@
protected slots:
virtual void onSelectionDone();
private:
virtual void onSelectionDone();
private:
- QComboBox* myCombo;
+ QComboBox* myTypeCombo;
+ QComboBox* myNbNoCombo;
QListWidget* myListWg;
QListWidget* myListWg;
+ QCheckBox* myUnderlOnlyChk;
+
QList<SMESH::SMESH_GroupBase_var> myGroups;
};
QList<SMESH::SMESH_GroupBase_var> myGroups;
};