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
bos #24228 [CEA 24217][Windows] cannot compile SMESH: additional fix.
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_BuildCompoundDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
index 6230022e82f42e9be2a1cbaa1b75854225942a03..df3813f2d04c460a4770311e1022c6723bea1a00 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
12
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
@@
-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
// 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
//
// 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)
#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:
@@
-68,9
+69,7
@@
public:
private:
void Init();
private:
void Init();
- void closeEvent( QCloseEvent* );
void enterEvent( QEvent* ); /* mouse enter the QWidget */
void enterEvent( QEvent* ); /* mouse enter the QWidget */
- void hideEvent( QHideEvent* ); /* ESC key */
void keyPressEvent( QKeyEvent* );
bool isValid();
void keyPressEvent( QKeyEvent* );
bool isValid();
@@
-82,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;
@@
-96,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;
@@
-111,19
+113,25
@@
private:
QLabel* TextLabelTol;
SMESHGUI_SpinBox* SpinBoxTol;
QLabel* TextLabelTol;
SMESHGUI_SpinBox* SpinBoxTol;
+ QLineEdit* CurrentLineEdit;
+
QString myHelpFileName;
bool myIsApplyAndClose;
QString myHelpFileName;
bool myIsApplyAndClose;
+protected slots:
+ virtual void reject();
+
private slots:
void ClickOnOk();
private slots:
void ClickOnOk();
- void ClickOnCancel();
bool ClickOnApply();
void ClickOnHelp();
void SelectionIntoArgument();
void DeactivateActiveDialog();
void ActivateThisDialog();
void onSelectMerge( bool );
bool ClickOnApply();
void ClickOnHelp();
void SelectionIntoArgument();
void DeactivateActiveDialog();
void ActivateThisDialog();
void onSelectMerge( bool );
+ void onResultTypeChange( int );
+ void onSelectionButton();
};
#endif // SMESHGUI_BUILDCOMPOUNDDLG_H
};
#endif // SMESHGUI_BUILDCOMPOUNDDLG_H