Nerge with PAL/SALOME 2.1.0d

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_RevolutionDlg.h

diff --git a/src/SMESHGUI/SMESHGUI_RevolutionDlg.h b/src/SMESHGUI/SMESHGUI_RevolutionDlg.h
index 1771d83c9d657c153b849701815b514ed0b38f42..6b55513e33ced31f2ed52f8d5e98292953cd058c 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_RevolutionDlg.h
+++ b/src/SMESHGUI/SMESHGUI_RevolutionDlg.h
@@ -30,7 +30,7 @@
 #define DIALOGBOX_REVOLUTION_H
 
 #include "SALOME_Selection.h"
-#include "SMESH_TypeFilter.hxx"
+#include "SMESH_LogicalFilter.hxx"
 // QT Includes
 #include <qdialog.h>
 
@@ -41,6 +41,7 @@ class QLabel;
 class QLineEdit;
 class QPushButton;
 class QRadioButton;
+class QCheckBox;
 class QSpinBox;
 class SMESHGUI_SpinBox;
 class SMESHGUI;
@@ -66,7 +67,7 @@ public:
 
 private:
 
-    void Init() ;
+    void Init( bool ResetControls = true ) ;
     void closeEvent( QCloseEvent* e ) ;
     void enterEvent ( QEvent * ) ;                          /* mouse enter the QWidget */
     void hideEvent ( QHideEvent * );                        /* ESC key */
@@ -76,12 +77,14 @@ private:
     SMESHGUI*                     mySMESHGUI ;              /* Current SMESHGUI object */
     SALOME_Selection*             mySelection ;             /* User shape selection */
     int                           myNbOkElements ;          /* to check when elements are defined */
+    QString                       myElementsId;
     QWidget*                      myEditCurrentArgument;    /* Current  argument */
 
     bool                          myBusy;
     SMESH::SMESH_Mesh_var         myMesh;
     SMESH_Actor*                  myActor;
-    
+    Handle(SMESH_LogicalFilter)   myMeshOrSubMeshOrGroupFilter;
+
     QButtonGroup* GroupConstructors;
     QRadioButton* RadioButton1;
     QRadioButton* RadioButton2;
@@ -94,7 +97,8 @@ private:
     QLabel* TextLabelElements;
     QPushButton* SelectElementsButton;
     QLineEdit* LineEditElements;
-
+    QCheckBox* CheckBoxMesh;
+    
     QLabel* TextLabelPoint;
     QPushButton* SelectPointButton;
     QLabel* TextLabelX;
@@ -131,7 +135,8 @@ private:
     void ActivateThisDialog() ;
     void onTextChange(const QString&);
     void onVectorChanged();
-    
+    void onSelectMesh(bool toSelectMesh);
+
 protected:
     QGridLayout* SMESHGUI_RevolutionDlgLayout;
     QGridLayout* GroupConstructorsLayout;