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 'OCCT780'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MergeDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_MergeDlg.h
b/src/SMESHGUI/SMESHGUI_MergeDlg.h
index 684629c341c62d87aa257eb357905af3b0fc1aae..89c9275ae250ca03bb96aeeeb20ef147a5c7a6af 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MergeDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_MergeDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
0 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-202
4 CEA, EDF
, 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
@@
-30,8
+30,9
@@
// SMESH includes
#include "SMESH_SMESHGUI.hxx"
// SMESH includes
#include "SMESH_SMESHGUI.hxx"
-// Qt includes
+//
GUI and
Qt includes
#include <QDialog>
#include <QDialog>
+#include <SVTK_Hash.h>
// OCCT includes
#include <gp_XYZ.hxx>
// OCCT includes
#include <gp_XYZ.hxx>
@@
-72,7
+73,7
@@
namespace SMESH
//=================================================================================
class SMESHGUI_EXPORT SMESHGUI_MergeDlg : public QDialog
{
//=================================================================================
class SMESHGUI_EXPORT SMESHGUI_MergeDlg : public QDialog
{
- Q_OBJECT
;
+ Q_OBJECT
public:
SMESHGUI_MergeDlg( SMESHGUI*, int );
public:
SMESHGUI_MergeDlg( SMESHGUI*, int );
@@
-88,7
+89,7
@@
private:
bool isKeepIDsSelection();
bool isNewKeepGroup( const char* entry );
bool isKeepIDsSelection();
bool isNewKeepGroup( const char* entry );
- void FindGravityCenter(
TColStd_MapOfInteger
&,
+ void FindGravityCenter(
SVTK_TVtkIDsMap
&,
std::vector<int>& ,
std::list<gp_XYZ>& );
// add the centers of gravity of ElemsIdMap elements to the GrCentersXYZ list
std::vector<int>& ,
std::list<gp_XYZ>& );
// add the centers of gravity of ElemsIdMap elements to the GrCentersXYZ list