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 branch BR_DEBUG_3_2_0b1
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_FilterDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_FilterDlg.h
b/src/SMESHGUI/SMESHGUI_FilterDlg.h
index 7427fe7be1ed296af42b299e150602fac76e2424..635b372428bafeab1ca39f84aa6cde3ac8ac560c 100755
(executable)
--- a/
src/SMESHGUI/SMESHGUI_FilterDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_FilterDlg.h
@@
-17,7
+17,7
@@
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-//
See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+//
See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
//
//
//
@@
-34,7
+34,7
@@
#include <qmap.h>
#include <qvaluelist.h>
#include <qmap.h>
#include <qvaluelist.h>
-#include "
Salome
App_SelectionMgr.h"
+#include "
Light
App_SelectionMgr.h"
#include "SALOME_InteractiveObject.hxx"
#include "SALOME_DataMapOfIOMapOfInteger.hxx"
#include "SVTK_Selection.h"
#include "SALOME_InteractiveObject.hxx"
#include "SALOME_DataMapOfIOMapOfInteger.hxx"
#include "SVTK_Selection.h"
@@
-56,7
+56,7
@@
class QStringList;
class QTable;
class QTableItem;
class QWidgetStack;
class QTable;
class QTableItem;
class QWidgetStack;
-class
Salome
App_SelectionMgr;
+class
Light
App_SelectionMgr;
class SMESHGUI;
class SMESHGUI_FilterLibraryDlg;
class SVTK_Selector;
class SMESHGUI;
class SMESHGUI_FilterLibraryDlg;
class SVTK_Selector;
@@
-130,6
+130,14
@@
public:
QString& theText,
const int theEntityType = -1);
QString& theText,
const int theEntityType = -1);
+ void SetID( const int theRow,
+ const QString& theText,
+ const int theEntityType = -1 );
+
+ bool GetID( const int theRow,
+ QString& theText,
+ const int theEntityType = -1 );
+
void Update();
signals:
void Update();
signals:
@@
-213,7
+221,7
@@
class SMESHGUI_FilterDlg : public QDialog
enum { Mesh, Selection, Dialog, None };
// Buttons
enum { Mesh, Selection, Dialog, None };
// Buttons
- enum { BTN_OK, BTN_Cancel, BTN_Apply, BTN_Close };
+ enum { BTN_OK, BTN_Cancel, BTN_Apply, BTN_Close
, BTN_Help
};
public:
SMESHGUI_FilterDlg( SMESHGUI*,
public:
SMESHGUI_FilterDlg( SMESHGUI*,
@@
-243,6
+251,7
@@
private slots:
void onOk();
bool onApply();
void onClose();
void onOk();
bool onApply();
void onClose();
+ void onHelp();
void onDeactivate();
void onSelectionDone();
void onCriterionChanged (const int, const int);
void onDeactivate();
void onSelectionDone();
void onCriterionChanged (const int, const int);
@@
-291,7
+300,7
@@
private:
// initial fields
QValueList<int> myTypes;
SMESHGUI* mySMESHGUI;
// initial fields
QValueList<int> myTypes;
SMESHGUI* mySMESHGUI;
-
SalomeApp_SelectionMgr*
mySelectionMgr;
+
LightApp_SelectionMgr*
mySelectionMgr;
SVTK_Selector* mySelector;
SMESH::SMESH_Mesh_ptr myMesh;
QWidget* mySourceWg;
SVTK_Selector* mySelector;
SMESH::SMESH_Mesh_ptr myMesh;
QWidget* mySourceWg;
@@
-301,6
+310,8
@@
private:
QMap< int, SMESH::Filter_var > myFilter;
QMap< int, bool > myInsertState;
QMap< int, int > myApplyToState;
QMap< int, SMESH::Filter_var > myFilter;
QMap< int, bool > myInsertState;
QMap< int, int > myApplyToState;
+
+ QString myHelpFileName;
};
#endif
};
#endif