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
Merge from BR_V5_IMP_P8
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_RevolutionDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_RevolutionDlg.h
b/src/SMESHGUI/SMESHGUI_RevolutionDlg.h
index ecd9a3bfd40327c770a90358b8399dc60b186106..3502596f17b8318a14d0fc530bb1a79c2522ffc2 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_RevolutionDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_RevolutionDlg.h
@@
-31,6
+31,7
@@
// Qt includes
#include <QDialog>
// Qt includes
#include <QDialog>
+#include <QMap>
// IDL includes
#include <SALOMEconfig.h>
// IDL includes
#include <SALOMEconfig.h>
@@
-47,12
+48,15
@@
class QSpinBox;
class SMESHGUI_IdValidator;
class SMESHGUI_SpinBox;
class SMESHGUI;
class SMESHGUI_IdValidator;
class SMESHGUI_SpinBox;
class SMESHGUI;
+class SMESHGUI_FilterDlg;
class SMESH_Actor;
class SVTK_Selector;
class LightApp_SelectionMgr;
class SMESH_LogicalFilter;
class SALOME_Actor;
class SMESHGUI_MeshEditPreview;
class SMESH_Actor;
class SVTK_Selector;
class LightApp_SelectionMgr;
class SMESH_LogicalFilter;
class SALOME_Actor;
class SMESHGUI_MeshEditPreview;
+class QMenu;
+class QAction;
//=================================================================================
// class : SMESHGUI_RevolutionDlg
//=================================================================================
// class : SMESHGUI_RevolutionDlg
@@
-67,6
+71,8
@@
public:
~SMESHGUI_RevolutionDlg();
private:
~SMESHGUI_RevolutionDlg();
private:
+ enum {NONE_SELECT, POINT_SELECT, FACE_SELECT};
+
void Init( bool = true);
void closeEvent( QCloseEvent* );
void enterEvent( QEvent* ); /* mouse enter the QWidget */
void Init( bool = true);
void closeEvent( QCloseEvent* );
void enterEvent( QEvent* ); /* mouse enter the QWidget */
@@
-135,9
+141,16
@@
private:
QSpinBox* SpinBox_NbSteps;
QLabel* TextLabelTolerance;
SMESHGUI_SpinBox* SpinBox_Tolerance;
QSpinBox* SpinBox_NbSteps;
QLabel* TextLabelTolerance;
SMESHGUI_SpinBox* SpinBox_Tolerance;
+
+ QMenu* SelectVectorMenu;
+ QMap<QAction*,int> myMenuActions;
+ int myVectorDefinition;
+
QString myHelpFileName;
QString myHelpFileName;
+ SMESHGUI_FilterDlg* myFilterDlg;
+
private slots:
void ConstructorsClicked( int );
void ClickOnOk();
private slots:
void ConstructorsClicked( int );
void ClickOnOk();
@@
-153,6
+166,9
@@
private slots:
void onVectorChanged();
void toDisplaySimulation();
void onDisplaySimulation( bool );
void onVectorChanged();
void toDisplaySimulation();
void onDisplaySimulation( bool );
+ void onSelectVectorMenu( QAction* );
+ void onSelectVectorButton();
+ void setFilters();
};
#endif // SMESHGUI_REVOLUTIONDLG_H
};
#endif // SMESHGUI_REVOLUTIONDLG_H