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 V9_3_BR
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MergeDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_MergeDlg.h
b/src/SMESHGUI/SMESHGUI_MergeDlg.h
index 86595b82a1295d217d3c22220855feaff6966215..52db5bbc219e280f9a3fa4e9b82a3d9e9f4be6e7 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MergeDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_MergeDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
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
@@
-35,6
+35,7
@@
// OCCT includes
#include <gp_XYZ.hxx>
// OCCT includes
#include <gp_XYZ.hxx>
+#include <TColStd_MapOfInteger.hxx>
// STL includes
#include <list>
// STL includes
#include <list>
@@
-59,7
+60,6
@@
class SMESHGUI_SpinBox;
class SMESH_Actor;
class SUIT_SelectionFilter;
class SVTK_Selector;
class SMESH_Actor;
class SUIT_SelectionFilter;
class SVTK_Selector;
-class TColStd_MapOfInteger;
namespace SMESH
{
namespace SMESH
{
@@
-85,8
+85,8
@@
private:
void enterEvent( QEvent* ); /* mouse enter the QWidget */
void keyPressEvent( QKeyEvent* );
void onEditGroup();
void enterEvent( QEvent* ); /* mouse enter the QWidget */
void keyPressEvent( QKeyEvent* );
void onEditGroup();
- bool isKeep
Nodes
IDsSelection();
- bool isNewKeep
Nodes
Group( const char* entry );
+ bool isKeepIDsSelection();
+ bool isNewKeepGroup( const char* entry );
void FindGravityCenter( TColStd_MapOfInteger&,
std::vector<int>& ,
void FindGravityCenter( TColStd_MapOfInteger&,
std::vector<int>& ,
@@
-96,23
+96,29
@@
private:
private:
typedef QList<SMESH::SMESH_GroupBase_var> GrpList;
private:
typedef QList<SMESH::SMESH_GroupBase_var> GrpList;
- SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */
- LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */
- SVTK_Selector* mySelector;
+ SMESHGUI*
mySMESHGUI; /* Current SMESHGUI object */
+ LightApp_SelectionMgr*
mySelectionMgr; /* User shape selection */
+ SVTK_Selector*
mySelector;
- QWidget* myEditCurrentArgument;
+ QWidget*
myEditCurrentArgument;
- SMESH::SMESH_Mesh_var myMesh;
- SMESH::SMESH_IDSource_var mySubMeshOrGroup;
- SMESH_Actor* myActor;
- SUIT_SelectionFilter* myMeshOrSubMeshOrGroupFilter;
- SUIT_SelectionFilter* mySubMeshOrGroupFilter;
+ SMESH::SMESH_Mesh_var myMesh;
+ SMESH::ListOfIDSources_var mySubMeshOrGroups;
+ GrpList myGroups;
+ QString myEntry;
- SMESHGUI_IdPreview* myIdPreview;
+ SMESH_Actor* myActor;
+ SUIT_SelectionFilter* myMeshOrSubMeshOrGroupFilter;
+ SUIT_SelectionFilter* mySubMeshOrGroupFilter;
+
+ SMESHGUI_IdPreview* myIdPreview;
+ QString myHelpFileName;
+
+ int myAction;
+ bool myIsBusy;
+ int myTypeId; // manual(1) or automatic(0)
+
- int myAction;
- bool myIsBusy;
- int myTypeId; // manual(1) or automatic(0)
// Widgets
// Widgets
@@
-130,6
+136,7
@@
private:
QWidget* NodeSpecWidget;
SMESHGUI_SpinBox* SpinBoxTolerance;
QCheckBox* SeparateCornersAndMedium;
QWidget* NodeSpecWidget;
SMESHGUI_SpinBox* SpinBoxTolerance;
QCheckBox* SeparateCornersAndMedium;
+ QCheckBox* AvoidMakingHoles;
QGroupBox* GroupCoincident;
//QWidget* GroupCoincidentWidget;
QGroupBox* GroupCoincident;
//QWidget* GroupCoincidentWidget;
@@
-151,18
+158,13
@@
private:
QGroupBox* GroupKeep;
QButtonGroup* KeepFromButGroup;
QGroupBox* GroupKeep;
QButtonGroup* KeepFromButGroup;
- QPushButton* SelectKeep
Nodes
Button;
- QPushButton* AddKeep
Nodes
Button;
- QPushButton* RemoveKeep
Nodes
Button;
+ QPushButton* SelectKeepButton;
+ QPushButton* AddKeepButton;
+ QPushButton* RemoveKeepButton;
QListWidget* KeepList;
QGroupBox* TypeBox;
QButtonGroup* GroupType;
QListWidget* KeepList;
QGroupBox* TypeBox;
QButtonGroup* GroupType;
-
- QString myHelpFileName;
-
- QString myEntry;
- GrpList myGroups;
protected slots:
virtual void reject();
protected slots:
virtual void reject();
@@
-173,10
+175,10
@@
protected slots:
void ClickOnHelp();
void updateControls();
void onDetect();
void ClickOnHelp();
void updateControls();
void onDetect();
- void onAddKeep
Node
();
- void onRemoveKeep
Node
();
- void onSelectKeep
Node
();
- void onKeep
Node
SourceChanged(int);
+ void onAddKeep();
+ void onRemoveKeep();
+ void onSelectKeep();
+ void onKeepSourceChanged(int);
void onAddGroup();
void onRemoveGroup();
void onSelectGroup();
void onAddGroup();
void onRemoveGroup();
void onSelectGroup();