X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_InitMeshDlg.h;h=1a6f4ed5780017b8830421bb011e64e46b0a2063;hp=9d934183a79717365810c74d6f2ed9287c31c689;hb=c9c6669fab21f2a0d544d79e60ceb119800b4cb5;hpb=4791f5b30ea7a9c1247aa551750dc71cb83b99aa

diff --git a/src/SMESHGUI/SMESHGUI_InitMeshDlg.h b/src/SMESHGUI/SMESHGUI_InitMeshDlg.h
index 9d934183a..1a6f4ed57 100644
--- a/src/SMESHGUI/SMESHGUI_InitMeshDlg.h
+++ b/src/SMESHGUI/SMESHGUI_InitMeshDlg.h
@@ -29,32 +29,26 @@
 #ifndef DIALOGBOX_INIT_MESH_H
 #define DIALOGBOX_INIT_MESH_H
 
-#include "SALOME_Selection.h"
-#include "SALOME_TypeFilter.hxx"
-#include "SMESH_TypeFilter.hxx"
+//#include "SMESH_TypeFilter.hxx"
+
+#include "SUIT_SelectionFilter.h"
+#include "SalomeApp_SelectionMgr.h"
 
 // QT Includes
-#include <qvariant.h>
 #include <qdialog.h>
+#include <qstringlist.h>
 
 // IDL Headers
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(GEOM_Gen)
-#include CORBA_SERVER_HEADER(GEOM_Shape)
 #include CORBA_SERVER_HEADER(SMESH_Gen)
 
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QButtonGroup;
 class QGroupBox;
 class QLabel;
 class QLineEdit;
 class QPushButton;
-class QRadioButton;
 class SMESHGUI;
 
-
 //=================================================================================
 // class    : SMESHGUI_InitMeshDlg
 // purpose  :
@@ -64,48 +58,47 @@ class SMESHGUI_InitMeshDlg : public QDialog
     Q_OBJECT
 
 public:
-    SMESHGUI_InitMeshDlg( QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0 );
+    SMESHGUI_InitMeshDlg ( SMESHGUI*,
+			  const char* = 0,
+			  bool modal = FALSE,
+			  WFlags fl = 0 );
     ~SMESHGUI_InitMeshDlg();
 
-private:
-
-    void Init( SALOME_Selection* Sel ) ;
+protected:
     void closeEvent( QCloseEvent* e ) ;
-    void enterEvent ( QEvent * ) ;
-
-    SMESHGUI*                     mySMESHGUI ;
-    SALOME_Selection*             mySelection ;
-             
-    GEOM::GEOM_Shape_var                myGeomShape ;
-    int                           myConstructorId ; 
-    QLineEdit*                    myEditCurrentArgument; 
+    void enterEvent( QEvent * ) ;
 
-    QString                       myNameMesh ;
+private:
+    void Init();
 
-    Handle(SALOME_TypeFilter)     myGeomFilter;
-    Handle(SMESH_TypeFilter)      myHypothesisFilter;
-    Handle(SMESH_TypeFilter)      myAlgorithmFilter;
+    void UpdateControlState();
+    QString SMESHGUI_InitMeshDlg::GetDefaultMeshName();
 
-    SALOME_ListIO                 HypoList;
-    SALOME_ListIO                 AlgoList;
+private:
+    SMESHGUI*                  mySMESHGUI;
+    SalomeApp_SelectionMgr*    mySelectionMgr;
 
-    bool                          myOkHypothesis;
-    bool                          myOkAlgorithm;
+    GEOM::GEOM_Object_var      myGeomShape;
+    QLineEdit*                 myEditCurrentArgument; 
 
-    SMESH::SMESH_Hypothesis_var   myHypothesis;
-    SMESH::SMESH_Hypothesis_var   myAlgorithm;
+    //Handle(SALOME_TypeFilter)  myGeomFilter;
+    SUIT_SelectionFilter*      myGeomFilter;
+    //SMESH_TypeFilter*          myHypothesisFilter;
+    //SMESH_TypeFilter*          myAlgorithmFilter;
+    SUIT_SelectionFilter*      myHypothesisFilter;
+    SUIT_SelectionFilter*      myAlgorithmFilter;
 
-    SMESH::SMESH_Mesh_var         myMesh;
+    QStringList                HypoList;
+    QStringList                AlgoList;
 
-    QButtonGroup* GroupConstructors;
-    QRadioButton* Constructor1;
     QGroupBox*    GroupButtons;
     QPushButton*  buttonOk;
     QPushButton*  buttonCancel;
     QPushButton*  buttonApply;
+
     QGroupBox*    GroupC1;
-    QLabel*       TextLabel_NameMesh ;
-    QLineEdit*    LineEdit_NameMesh ;
+    QLabel*       TextLabel_NameMesh;
+    QLineEdit*    LineEdit_NameMesh;
     QLabel*       TextLabelC1A1;
     QPushButton*  SelectButtonC1A1;
     QLineEdit*    LineEditC1A1;
@@ -119,22 +112,13 @@ private:
     QLineEdit*    LineEditC1A1Algo;
 
 private slots:
-
-    void ConstructorsClicked(int constructorId);
     void ClickOnOk();
+    bool ClickOnApply();
     void ClickOnCancel();
-    void ClickOnApply();
-    void SetEditCurrentArgument() ;
-    void SelectionIntoArgument() ;
-    void DeactivateActiveDialog() ;
-    void ActivateThisDialog() ;
-    void TextChangedInLineEdit(const QString& newText) ;
-
-protected:
-    QGridLayout* SMESHGUI_InitMeshDlgLayout;
-    QGridLayout* GroupConstructorsLayout;
-    QGridLayout* GroupButtonsLayout;
-    QGridLayout* GroupC1Layout;
+    void SetEditCurrentArgument();
+    void SelectionIntoArgument();
+    void DeactivateActiveDialog();
+    void ActivateThisDialog();
 };
 
 #endif // DIALOGBOX_INIT_MESH_H