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
Copyrights update 2015.
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_FilterDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_FilterDlg.h
b/src/SMESHGUI/SMESHGUI_FilterDlg.h
index 4501a9d373272a881efcab610c8354b2c9381a04..0f14915ae3618b7119097d41a5508eddf7ad41fa 100755
(executable)
--- a/
src/SMESHGUI/SMESHGUI_FilterDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_FilterDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-141,6
+141,7
@@
signals:
void EntityTypeChanged( const int );
void NeedValidation();
void CriterionChanged( const int, const int );
void EntityTypeChanged( const int );
void NeedValidation();
void CriterionChanged( const int, const int );
+ void ThresholdChanged( const int, const int );
void CurrentChanged( int, int );
private slots:
void CurrentChanged( int, int );
private slots:
@@
-228,32
+229,36
@@
public:
void SetSelection();
void SetMesh (SMESH::SMESH_Mesh_var);
void SetSourceWg( QWidget*, const bool initOnApply = true );
void SetSelection();
void SetMesh (SMESH::SMESH_Mesh_var);
void SetSourceWg( QWidget*, const bool initOnApply = true );
+ void SetEnabled( bool setInViewer, bool diffSources );
static SMESH::Filter::Criterion createCriterion();
SMESH::Filter_var GetFilter() const;
void SetFilter(SMESH::Filter_var filter, int type);
static SMESH::Filter::Criterion createCriterion();
SMESH::Filter_var GetFilter() const;
void SetFilter(SMESH::Filter_var filter, int type);
+ void UnRegisterFilters();
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 onCriterionChanged( const int, const int );
void onHelp();
void onDeactivate();
void onSelectionDone();
void onCriterionChanged( const int, const int );
+ void onThresholdChanged( const int, const int );
void onCurrentChanged( int, int );
private:
void construct( const QList<int>& );
void onCurrentChanged( int, int );
private:
void construct( const QList<int>& );
- void closeEvent( QCloseEvent* );
void enterEvent( QEvent* );
void keyPressEvent( QKeyEvent* );
void enterEvent( QEvent* );
void keyPressEvent( QKeyEvent* );
@@
-293,6
+298,8
@@
private:
SVTK_Selector* mySelector;
SMESH::SMESH_Mesh_var myMesh;
bool myInitSourceWgOnApply;
SVTK_Selector* mySelector;
SMESH::SMESH_Mesh_var myMesh;
bool myInitSourceWgOnApply;
+ bool myInsertEnabled;
+ bool myDiffSourcesEnabled;
QWidget* mySourceWg;
SALOME_DataMapOfIOMapOfInteger myIObjects;
QWidget* mySourceWg;
SALOME_DataMapOfIOMapOfInteger myIObjects;
@@
-302,6
+309,10
@@
private:
QMap< int, int > myApplyToState;
QString myHelpFileName;
QMap< int, int > myApplyToState;
QString myHelpFileName;
+
+ bool myToRestoreSelMode;
+ int mySelModeToRestore;
+ void restoreSelMode();
};
#endif // SMESHGUI_FILTERDLG_H
};
#endif // SMESHGUI_FILTERDLG_H