X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_BuildCompoundDlg.h;h=df3813f2d04c460a4770311e1022c6723bea1a00;hb=8f903d5ee57f0e646cf05d68d85418c68d497053;hp=3236114b4b17b1889107088a4a5b4d38106ed622;hpb=bd8f1aee7c78f7d2eb82bd4fec5e08c9e3d280ce;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
index 3236114b4..df3813f2d 100644
--- a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
+++ b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021  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
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -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_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;
@@ -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