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
PR: synchro V7_main tag mergefrom_V6_main_28Feb13
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_FilterDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_FilterDlg.h
b/src/SMESHGUI/SMESHGUI_FilterDlg.h
index 477a17b313ef35615a49166e7beea6ae5147388d..8081aec6994a7fc7434a3bc348862eb79a556db0 100755
(executable)
--- a/
src/SMESHGUI/SMESHGUI_FilterDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_FilterDlg.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
@@
-222,8
+222,8
@@
public:
SMESHGUI_FilterDlg( SMESHGUI*, const int );
virtual ~SMESHGUI_FilterDlg();
SMESHGUI_FilterDlg( SMESHGUI*, const int );
virtual ~SMESHGUI_FilterDlg();
- void Init( const QList<int>& );
- void Init( const int );
+ void Init( const QList<int>&
, const bool setInViewer=true
);
+ void Init( const int
, const bool setInViewer=true
);
void SetSelection();
void SetMesh (SMESH::SMESH_Mesh_var);
void SetSelection();
void SetMesh (SMESH::SMESH_Mesh_var);
@@
-231,15
+231,20
@@
public:
static SMESH::Filter::Criterion createCriterion();
static SMESH::Filter::Criterion createCriterion();
+ SMESH::Filter_var GetFilter() const;
+ void SetFilter(SMESH::Filter_var filter, int type);
+
signals:
void Accepted();
signals:
void Accepted();
+protected slots:
+ virtual void reject();
+
private slots:
void onOk();
bool onApply();
private slots:
void onOk();
bool onApply();
- void onClose();
void onHelp();
void onDeactivate();
void onSelectionDone();
void onHelp();
void onDeactivate();
void onSelectionDone();
@@
-250,7
+255,6
@@
private:
void construct( const QList<int>& );
void construct( const QList<int>& );
- void closeEvent( QCloseEvent* );
void enterEvent( QEvent* );
void keyPressEvent( QKeyEvent* );
void enterEvent( QEvent* );
void keyPressEvent( QKeyEvent* );