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_MultiEditDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_MultiEditDlg.h
b/src/SMESHGUI/SMESHGUI_MultiEditDlg.h
old mode 100755
(executable)
new mode 100644
(file)
index
2f92d6b
..
ba7ae89
--- a/
src/SMESHGUI/SMESHGUI_MultiEditDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_MultiEditDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 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
@@
-41,6
+41,8
@@
#include CORBA_SERVER_HEADER(SMESH_Mesh)
#include CORBA_SERVER_HEADER(SMESH_MeshEditor)
#include CORBA_SERVER_HEADER(SMESH_Mesh)
#include CORBA_SERVER_HEADER(SMESH_MeshEditor)
+#include <smIdType.hxx>
+
class SMESHGUI;
class SMESHGUI_FilterDlg;
class SMESHGUI_SpinBox;
class SMESHGUI;
class SMESHGUI_FilterDlg;
class SMESHGUI_SpinBox;
@@
-113,14
+115,14
@@
protected:
QWidget* createButtonFrame( QWidget* );
QWidget* createMainFrame( QWidget*, const bool );
virtual bool isValid( const bool );
QWidget* createButtonFrame( QWidget* );
QWidget* createMainFrame( QWidget*, const bool );
virtual bool isValid( const bool );
- SMESH::
long_array_var
getIds(SMESH::SMESH_IDSource_var& obj);
+ SMESH::
smIdType_array_var
getIds(SMESH::SMESH_IDSource_var& obj);
void updateButtons();
virtual void setSelectionMode();
virtual bool isIdValid( const int ) const;
virtual bool process( SMESH::SMESH_MeshEditor_ptr,
void updateButtons();
virtual void setSelectionMode();
virtual bool isIdValid( const int ) const;
virtual bool process( SMESH::SMESH_MeshEditor_ptr,
- const SMESH::
long
_array& ,
+ const SMESH::
smIdType
_array& ,
SMESH::SMESH_IDSource_ptr obj) = 0;
SMESH::SMESH_IDSource_ptr obj) = 0;
- virtual
int
nbElemsInMesh() = 0;
+ virtual
smIdType
nbElemsInMesh() = 0;
int entityType();
protected:
int entityType();
protected:
@@
-182,9
+184,9
@@
public:
protected:
virtual bool process( SMESH::SMESH_MeshEditor_ptr,
protected:
virtual bool process( SMESH::SMESH_MeshEditor_ptr,
- const SMESH::
long
_array& ,
+ const SMESH::
smIdType
_array& ,
SMESH::SMESH_IDSource_ptr obj);
SMESH::SMESH_IDSource_ptr obj);
- virtual
int
nbElemsInMesh();
+ virtual
smIdType
nbElemsInMesh();
};
/*!
};
/*!
@@
-202,9
+204,9
@@
public:
protected:
virtual bool isValid( const bool );
virtual bool process( SMESH::SMESH_MeshEditor_ptr,
protected:
virtual bool isValid( const bool );
virtual bool process( SMESH::SMESH_MeshEditor_ptr,
- const SMESH::
long
_array&,
+ const SMESH::
smIdType
_array&,
SMESH::SMESH_IDSource_ptr obj );
SMESH::SMESH_IDSource_ptr obj );
- virtual
int
nbElemsInMesh();
+ virtual
smIdType
nbElemsInMesh();
protected slots:
virtual void onDisplaySimulation( bool );
protected slots:
virtual void onDisplaySimulation( bool );
@@
-227,9
+229,9
@@
public:
protected:
virtual bool process( SMESH::SMESH_MeshEditor_ptr,
protected:
virtual bool process( SMESH::SMESH_MeshEditor_ptr,
- const SMESH::
long
_array& ,
+ const SMESH::
smIdType
_array& ,
SMESH::SMESH_IDSource_ptr obj);
SMESH::SMESH_IDSource_ptr obj);
- virtual
int
nbElemsInMesh();
+ virtual
smIdType
nbElemsInMesh();
protected slots:
virtual void reject();
protected slots:
virtual void reject();
@@
-269,9
+271,9
@@
protected slots:
protected:
virtual bool process( SMESH::SMESH_MeshEditor_ptr,
protected:
virtual bool process( SMESH::SMESH_MeshEditor_ptr,
- const SMESH::
long
_array&,
+ const SMESH::
smIdType
_array&,
SMESH::SMESH_IDSource_ptr obj );
SMESH::SMESH_IDSource_ptr obj );
- virtual
int
nbElemsInMesh();
+ virtual
smIdType
nbElemsInMesh();
virtual void setSelectionMode();
void showFacetByElement( int id );
virtual void setSelectionMode();
void showFacetByElement( int id );