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
Merge branch 'master' into gni/adaptation
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_BuildCompoundDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
index a4fd91a49e55bb148bd166a41060b69b98849f2d..ea2bf86e700845432987b71485a9e4a9002a6b1a 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-38,16
+38,17
@@
#include CORBA_SERVER_HEADER(SMESH_Gen)
#include CORBA_SERVER_HEADER(SMESH_Mesh)
#include CORBA_SERVER_HEADER(SMESH_Gen)
#include CORBA_SERVER_HEADER(SMESH_Mesh)
+class LightApp_SelectionMgr;
+class QButtonGroup;
+class QCheckBox;
+class QComboBox;
class QGroupBox;
class QLabel;
class QLineEdit;
class QPushButton;
class QRadioButton;
class QGroupBox;
class QLabel;
class QLineEdit;
class QPushButton;
class QRadioButton;
-class QCheckBox;
-class QComboBox;
class SMESHGUI;
class SMESHGUI_SpinBox;
class SMESHGUI;
class SMESHGUI_SpinBox;
-class LightApp_SelectionMgr;
class SUIT_SelectionFilter;
//=================================================================================
class SUIT_SelectionFilter;
//=================================================================================
@@
-56,7
+57,7
@@
class SUIT_SelectionFilter;
//=================================================================================
class SMESHGUI_EXPORT SMESHGUI_BuildCompoundDlg : public QDialog
{
//=================================================================================
class SMESHGUI_EXPORT SMESHGUI_BuildCompoundDlg : public QDialog
{
- Q_OBJECT
;
+ Q_OBJECT
public:
public:
@@
-80,9
+81,10
@@
private:
SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */
LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */
SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */
LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */
- SMESH::SMESH_Mesh_var myMesh;
- SUIT_SelectionFilter* myMeshFilter;
- SMESH::mesh_array_var myMeshArray;
+ SMESH::SMESH_Mesh_var myMeshToAppendTo;
+ SMESH::ListOfIDSources_var myMeshArray;
+ SUIT_SelectionFilter* myMeshFilter;
+ SUIT_SelectionFilter* myAppendToFilter;
// Widgets
QGroupBox* GroupConstructors;
// Widgets
QGroupBox* GroupConstructors;
@@
-94,9
+96,11
@@
private:
QPushButton* buttonApply;
QPushButton* buttonHelp;
QPushButton* buttonApply;
QPushButton* buttonHelp;
- QGroupBox* GroupName;
- QLabel* TextLabelName;
- QLineEdit* LineEditName;
+ QGroupBox* GroupResult;
+ QButtonGroup* ResultButtonGroup;
+ QLineEdit* LineEditNewName;
+ QPushButton* SelectButtonAppendTo;
+ QLineEdit* LineEditAppendTo;
QGroupBox* GroupArgs;
QLabel* TextLabelMeshes;
QGroupBox* GroupArgs;
QLabel* TextLabelMeshes;
@@
-109,6
+113,8
@@
private:
QLabel* TextLabelTol;
SMESHGUI_SpinBox* SpinBoxTol;
QLabel* TextLabelTol;
SMESHGUI_SpinBox* SpinBoxTol;
+ QLineEdit* CurrentLineEdit;
+
QString myHelpFileName;
bool myIsApplyAndClose;
QString myHelpFileName;
bool myIsApplyAndClose;
@@
-124,6
+130,8
@@
private slots:
void DeactivateActiveDialog();
void ActivateThisDialog();
void onSelectMerge( bool );
void DeactivateActiveDialog();
void ActivateThisDialog();
void onSelectMerge( bool );
+ void onResultTypeChange( int );
+ void onSelectionButton();
};
#endif // SMESHGUI_BUILDCOMPOUNDDLG_H
};
#endif // SMESHGUI_BUILDCOMPOUNDDLG_H