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
Fix pb., appeared after wrong integration of 1.5 version: criteria are not saved
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_SewingDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_SewingDlg.h
b/src/SMESHGUI/SMESHGUI_SewingDlg.h
index b5433bb2d33a22f58702a2c91286edbc6e7919ac..6a800d6acb1562c6f3c23813df06a4ac93df7c63 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_SewingDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_SewingDlg.h
@@
-29,7
+29,7
@@
#ifndef DIALOGBOX_SEWING_H
#define DIALOGBOX_SEWING_H
#ifndef DIALOGBOX_SEWING_H
#define DIALOGBOX_SEWING_H
-#include "S
ALOME_Selection
.h"
+#include "S
alomeApp_SelectionMgr
.h"
// QT Includes
#include <qdialog.h>
// QT Includes
#include <qdialog.h>
@@
-44,6
+44,8
@@
class QRadioButton;
class QCheckBox;
class SMESHGUI;
class SMESH_Actor;
class QCheckBox;
class SMESHGUI;
class SMESH_Actor;
+class SVTK_ViewWindow;
+class SVTK_Selector;
// IDL Headers
#include <SALOMEconfig.h>
// IDL Headers
#include <SALOMEconfig.h>
@@
-59,22
+61,25
@@
class SMESHGUI_SewingDlg : public QDialog
Q_OBJECT
public:
Q_OBJECT
public:
- SMESHGUI_SewingDlg( QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0 );
+ SMESHGUI_SewingDlg( SMESHGUI*,
+ const char* name = 0,
+ bool modal = FALSE,
+ WFlags fl = 0);
~SMESHGUI_SewingDlg();
private:
~SMESHGUI_SewingDlg();
private:
-
void Init() ;
void closeEvent( QCloseEvent* e ) ;
void Init() ;
void closeEvent( QCloseEvent* e ) ;
- void enterEvent ( QEvent * )
; /* mouse enter the QWidget */
- void hideEvent ( QHideEvent * );
/* ESC key */
+ void enterEvent ( QEvent * ); /* mouse enter the QWidget */
+ void hideEvent ( QHideEvent * ); /* ESC key */
int GetConstructorId();
bool IsValid();
int GetConstructorId();
bool IsValid();
- SMESHGUI* mySMESHGUI
; /* Current SMESHGUI object */
- S
ALOME_Selection* mySelection ;
/* User shape selection */
+ SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */
+ S
alomeApp_SelectionMgr* mySelectionMgr;
/* User shape selection */
int myOk1, myOk2, myOk3, myOk4, myOk5, myOk6;
int myOk1, myOk2, myOk3, myOk4, myOk5, myOk6;
- QLineEdit* myEditCurrentArgument; /* Current LineEdit */
+ QLineEdit* myEditCurrentArgument; /* Current LineEdit */
+ SVTK_Selector* mySelector;
bool myBusy;
SMESH::SMESH_Mesh_var myMesh;
bool myBusy;
SMESH::SMESH_Mesh_var myMesh;
@@
-111,7
+116,9
@@
private:
QLineEdit* LineEdit5;
QLineEdit* LineEdit6;
QCheckBox* CheckBoxMerge;
QLineEdit* LineEdit5;
QLineEdit* LineEdit6;
QCheckBox* CheckBoxMerge;
-
+ QCheckBox* CheckBoxPolygons;
+ QCheckBox* CheckBoxPolyedrs;
+
private slots:
void ConstructorsClicked(int constructorId);
private slots:
void ConstructorsClicked(int constructorId);