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
ClikOnClose() inexistant slot name corrected; onApply() return value corrected
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_AddSubMeshDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_AddSubMeshDlg.h
b/src/SMESHGUI/SMESHGUI_AddSubMeshDlg.h
index 4d26275e03956424c8717559f5ee47235110de73..3ede5c043f05a8f63698e490c358b0a095014510 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_AddSubMeshDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_AddSubMeshDlg.h
@@
-34,27
+34,20
@@
#include "SMESH_TypeFilter.hxx"
// QT Includes
#include "SMESH_TypeFilter.hxx"
// QT Includes
-#include <qvariant.h>
#include <qdialog.h>
#include <qdialog.h>
+#include <qstringlist.h>
// IDL Headers
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(GEOM_Gen)
// IDL Headers
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(GEOM_Gen)
-#include CORBA_SERVER_HEADER(GEOM_Shape)
#include CORBA_SERVER_HEADER(SMESH_Mesh)
#include CORBA_SERVER_HEADER(SMESH_Mesh)
-class QVBoxLayout;
-class QHBoxLayout;
-class QGridLayout;
-class QButtonGroup;
class QGroupBox;
class QLabel;
class QLineEdit;
class QPushButton;
class QGroupBox;
class QLabel;
class QLineEdit;
class QPushButton;
-class QRadioButton;
class SMESHGUI;
class SMESHGUI;
-
//=================================================================================
// class : SMESHGUI_AddSubMeshDlg
// purpose :
//=================================================================================
// class : SMESHGUI_AddSubMeshDlg
// purpose :
@@
-67,44
+60,36
@@
public:
SMESHGUI_AddSubMeshDlg( QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0 );
~SMESHGUI_AddSubMeshDlg();
SMESHGUI_AddSubMeshDlg( QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0 );
~SMESHGUI_AddSubMeshDlg();
-private:
-
- void Init( SALOME_Selection* Sel ) ;
+protected:
void closeEvent( QCloseEvent* e ) ;
void enterEvent ( QEvent * ) ;
void closeEvent( QCloseEvent* e ) ;
void enterEvent ( QEvent * ) ;
+private:
+ void Init( SALOME_Selection* Sel ) ;
+
+ void UpdateControlState();
+
+private:
SMESHGUI* mySMESHGUI ;
SALOME_Selection* mySelection ;
SMESHGUI* mySMESHGUI ;
SALOME_Selection* mySelection ;
- GEOM::GEOM_Shape_var myGeomShape ;
- int myConstructorId ;
- QLineEdit* myEditCurrentArgument;
-
SMESH::SMESH_Mesh_var myMesh;
SMESH::SMESH_Mesh_var myMesh;
- SMESH::SMESH_subMesh_var mySubMesh;
-
- QString myNameSubMesh ;
+ GEOM::GEOM_Object_var myGeomShape ;
+ QLineEdit* myEditCurrentArgument;
Handle(SALOME_TypeFilter) myGeomFilter;
Handle(SMESH_TypeFilter) myMeshFilter;
Handle(SMESH_TypeFilter) myHypothesisFilter;
Handle(SMESH_TypeFilter) myAlgorithmFilter;
Handle(SALOME_TypeFilter) myGeomFilter;
Handle(SMESH_TypeFilter) myMeshFilter;
Handle(SMESH_TypeFilter) myHypothesisFilter;
Handle(SMESH_TypeFilter) myAlgorithmFilter;
-
SALOME_ListIO
HypoList;
-
SALOME_ListIO
AlgoList;
+
QStringList
HypoList;
+
QStringList
AlgoList;
- bool myOkHypothesis;
- bool myOkAlgorithm;
-
- SMESH::SMESH_Hypothesis_var myHypothesis;
- SMESH::SMESH_Hypothesis_var myAlgorithm;
-
- QButtonGroup* GroupConstructors;
- QRadioButton* Constructor1;
QGroupBox* GroupButtons;
QPushButton* buttonOk;
QGroupBox* GroupButtons;
QPushButton* buttonOk;
- QPushButton* buttonCancel;
QPushButton* buttonApply;
QPushButton* buttonApply;
+ QPushButton* buttonCancel;
+
QGroupBox* GroupC1;
QLabel* TextLabel_NameMesh ;
QLineEdit* LineEdit_NameMesh ;
QGroupBox* GroupC1;
QLabel* TextLabel_NameMesh ;
QLineEdit* LineEdit_NameMesh ;
@@
-124,22
+109,13
@@
private:
QLineEdit* LineEditC1A1Algo;
private slots:
QLineEdit* LineEditC1A1Algo;
private slots:
-
- void ConstructorsClicked(int constructorId);
void ClickOnOk();
void ClickOnOk();
+ bool ClickOnApply();
void ClickOnCancel();
void ClickOnCancel();
- void ClickOnApply();
void SetEditCurrentArgument() ;
void SelectionIntoArgument() ;
void DeactivateActiveDialog() ;
void ActivateThisDialog() ;
void SetEditCurrentArgument() ;
void SelectionIntoArgument() ;
void DeactivateActiveDialog() ;
void ActivateThisDialog() ;
- void TextChangedInLineEdit(const QString& newText) ;
-
-protected:
- QGridLayout* SMESHGUI_AddSubMeshDlgLayout;
- QGridLayout* GroupConstructorsLayout;
- QGridLayout* GroupButtonsLayout;
- QGridLayout* GroupC1Layout;
};
#endif // DIALOGBOX_ADD_SUBMESH_H
};
#endif // DIALOGBOX_ADD_SUBMESH_H