X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_ExtrusionDlg.h;h=cebdaefb78232321cd01d818f8b733df4e35c146;hp=c6f80f0e25914923d15909e309a42513dfa60f50;hb=b33324fe602b1fe1158c14a866c3802df12370fa;hpb=e4737e85f0da6d3f90fd08f6be1c2825195fe16f

diff --git a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h
index c6f80f0e2..cebdaefb7 100644
--- a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h
+++ b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h
@@ -29,102 +29,100 @@
 #ifndef DIALOGBOX_EXTRUSION_H
 #define DIALOGBOX_EXTRUSION_H
 
-#include "SALOME_Selection.h"
-#include "SMESH_LogicalFilter.hxx"
+#include "SalomeApp_SelectionMgr.h"
+#include "SUIT_SelectionFilter.h"
 
 // QT Includes
 #include <qdialog.h>
 
 class QGridLayout; 
 class QButtonGroup;
+class QRadioButton;
 class QGroupBox;
 class QLabel;
 class QLineEdit;
-class QPushButton;
-class QRadioButton;
 class QCheckBox;
 class QSpinBox;
-class SMESHGUI_SpinBox;
+class QPushButton;
+
 class SMESHGUI;
 class SMESH_Actor;
+class SMESHGUI_SpinBox;
+class SVTK_ViewWindow;
+class SVTK_Selector;
 
 // IDL Headers
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_Mesh)
 
-
 //=================================================================================
 // class    : SMESHGUI_ExtrusionDlg
 // purpose  :
 //=================================================================================
 class SMESHGUI_ExtrusionDlg : public QDialog
-{ 
-    Q_OBJECT
+{
+  Q_OBJECT
 
 public:
-    SMESHGUI_ExtrusionDlg( QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0 );
-    ~SMESHGUI_ExtrusionDlg();
+  SMESHGUI_ExtrusionDlg (SMESHGUI*,
+			 bool modal = FALSE);
+  ~SMESHGUI_ExtrusionDlg();
 
 private:
+  void Init (bool ResetControls = true);
+  void enterEvent (QEvent*);                           /* mouse enter the QWidget */
+  int  GetConstructorId();
+  //void closeEvent (QCloseEvent*);
+  //void hideEvent (QHideEvent*);                        /* ESC key */
+
+  SMESHGUI*                     mySMESHGUI;            /* Current SMESHGUI object */
+  SalomeApp_SelectionMgr*       mySelectionMgr;        /* User shape selection */
+  QLineEdit*                    myEditCurrentArgument; /* Current  LineEdit */
+  QString                       myElementsId;
+  int                           myNbOkElements;        /* to check when elements are defined */
+  SVTK_Selector*                mySelector;
+
+  bool                          myBusy;
+  SMESH::SMESH_Mesh_var         myMesh;
+  SMESH_Actor*                  myActor;
+  SUIT_SelectionFilter*         myMeshOrSubMeshOrGroupFilter;
+
+  // widgets
+  QButtonGroup*     GroupConstructors;
+  QRadioButton*     RadioButton1;
+  QRadioButton*     RadioButton2;
+
+  QGroupBox*        GroupArguments;
+  QLabel*           TextLabelElements;
+  QPushButton*      SelectElementsButton;
+  QLineEdit*        LineEditElements;
+  QCheckBox*        CheckBoxMesh;
+  QLabel*           TextLabelVector;
+  QLabel*           TextLabelDx;
+  SMESHGUI_SpinBox* SpinBox_Dx;
+  QLabel*           TextLabelDy;
+  SMESHGUI_SpinBox* SpinBox_Dy;
+  QLabel*           TextLabelDz;
+  SMESHGUI_SpinBox* SpinBox_Dz;
+  QLabel*           TextLabelNbSteps;
+  QSpinBox*         SpinBox_NbSteps;
+
+  QGroupBox*        GroupButtons;
+  QPushButton*      buttonOk;
+  QPushButton*      buttonCancel;
+  QPushButton*      buttonApply;
 
-    void Init( bool ResetControls = true ) ;
-    void closeEvent( QCloseEvent* e ) ;
-    void enterEvent ( QEvent * ) ;                          /* mouse enter the QWidget */
-    void hideEvent ( QHideEvent * );                        /* ESC key */
-    int GetConstructorId();
-
-    SMESHGUI*                     mySMESHGUI ;              /* Current SMESHGUI object */
-    SALOME_Selection*             mySelection ;             /* User shape selection */
-    QString                       myElementsId;
-    int                           myNbOkElements ;          /* to check when elements are defined */
-    
-    QLineEdit*                    myEditCurrentArgument;    /* Current  LineEdit */
-
-    bool                          myBusy;
-    SMESH::SMESH_Mesh_var         myMesh;
-    SMESH_Actor*                  myActor;
-    Handle(SMESH_LogicalFilter)   myMeshOrSubMeshOrGroupFilter;
-
-    QButtonGroup* GroupConstructors;
-    QRadioButton* RadioButton1;
-    QRadioButton* RadioButton2;
-    QGroupBox* GroupButtons;
-    QPushButton* buttonOk;
-    QPushButton* buttonCancel;
-    QPushButton* buttonApply;
-    QGroupBox* GroupArguments;
-    QLabel* TextLabelElements;
-    QPushButton* SelectElementsButton;
-    QLineEdit* LineEditElements;
-    QCheckBox* CheckBoxMesh;
-    QLabel* TextLabelVector;
-    QLabel* TextLabelDx;
-    SMESHGUI_SpinBox* SpinBox_Dx;
-    QLabel* TextLabelDy;
-    SMESHGUI_SpinBox* SpinBox_Dy;
-    QLabel* TextLabelDz;
-    SMESHGUI_SpinBox* SpinBox_Dz;
-    QLabel* TextLabelNbSteps;
-    QSpinBox* SpinBox_NbSteps;
-    
-    private slots:
-
-    void ConstructorsClicked(int constructorId);
-    void ClickOnOk();
-    void ClickOnCancel();
-    void ClickOnApply();
-    void SetEditCurrentArgument() ;
-    void SelectionIntoArgument() ;
-    void DeactivateActiveDialog() ;
-    void ActivateThisDialog() ;
-    void onTextChange(const QString&);
-    void onSelectMesh(bool toSelectMesh);
-    
-protected:
-    QGridLayout* SMESHGUI_ExtrusionDlgLayout;
-    QGridLayout* GroupConstructorsLayout;
-    QGridLayout* GroupButtonsLayout;
-    QGridLayout* GroupArgumentsLayout;
+private slots:
+  void ConstructorsClicked (int);
+  void ClickOnOk();
+  bool ClickOnApply();
+  void ClickOnCancel();
+  void SetEditCurrentArgument();
+  void SelectionIntoArgument();
+  void DeactivateActiveDialog();
+  void ActivateThisDialog();
+  void onTextChange (const QString&);
+  void onSelectMesh (bool toSelectMesh);
 };
 
 #endif // DIALOGBOX_EXTRUSION_H