X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_BuildCompoundDlg.h;h=ea2bf86e700845432987b71485a9e4a9002a6b1a;hb=b54385ddd41b61114e7d1088048f2f1131c30f1d;hp=161d2183fd7191cc11d06abcb65b5f9c31714754;hpb=bb40f7c1d3542da1ff59b6c3bface0574789dded;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
index 161d2183f..ea2bf86e7 100644
--- a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
+++ b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020  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
@@ -38,16 +38,17 @@
 #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 QCheckBox;
-class QComboBox;
 class SMESHGUI;
 class SMESHGUI_SpinBox;
-class LightApp_SelectionMgr;
 class SUIT_SelectionFilter;
 
 //=================================================================================
@@ -56,7 +57,7 @@ class SUIT_SelectionFilter;
 //=================================================================================
 class SMESHGUI_EXPORT SMESHGUI_BuildCompoundDlg : public QDialog
 {
-  Q_OBJECT;
+  Q_OBJECT
 
 public:
 
@@ -80,9 +81,10 @@ private:
   SMESHGUI*               mySMESHGUI;     /* Current SMESHGUI object */
   LightApp_SelectionMgr*  mySelectionMgr; /* User shape selection */
 
-  SMESH::SMESH_IDSource_var  myMesh;
-  SUIT_SelectionFilter*      myMeshFilter;
+  SMESH::SMESH_Mesh_var      myMeshToAppendTo;
   SMESH::ListOfIDSources_var myMeshArray;
+  SUIT_SelectionFilter*      myMeshFilter;
+  SUIT_SelectionFilter*      myAppendToFilter;
 
   // Widgets
   QGroupBox*              GroupConstructors;
@@ -94,9 +96,11 @@ private:
   QPushButton*            buttonApply;
   QPushButton*            buttonHelp;
 
-  QGroupBox*              GroupName;
-  QLabel*                 TextLabelName;
-  QLineEdit*              LineEditName;
+  QGroupBox*              GroupResult;
+  QButtonGroup*           ResultButtonGroup;
+  QLineEdit*              LineEditNewName;
+  QPushButton*            SelectButtonAppendTo;
+  QLineEdit*              LineEditAppendTo;
 
   QGroupBox*              GroupArgs;
   QLabel*                 TextLabelMeshes;
@@ -109,6 +113,8 @@ private:
   QLabel*                 TextLabelTol;
   SMESHGUI_SpinBox*       SpinBoxTol;
 
+  QLineEdit*              CurrentLineEdit;
+
   QString                 myHelpFileName;
 
   bool                    myIsApplyAndClose;
@@ -124,6 +130,8 @@ private slots:
   void                    DeactivateActiveDialog();
   void                    ActivateThisDialog();
   void                    onSelectMerge( bool );
+  void                    onResultTypeChange( int );
+  void                    onSelectionButton();
 };
 
 #endif // SMESHGUI_BUILDCOMPOUNDDLG_H