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
#16459 EDF 14133 - Complete Merge Nodes / Merge Elements operations
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_Selection.h
diff --git
a/src/SMESHGUI/SMESHGUI_Selection.h
b/src/SMESHGUI/SMESHGUI_Selection.h
index c62f14a5d22d5f5d118d5b84f0b6d84f61ce638f..115b0e46f60ef1e6845ab64a81d6cca4afaa15f3 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Selection.h
+++ b/
src/SMESHGUI/SMESHGUI_Selection.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-71,8
+71,8
@@
public:
virtual int nbChildren( int ) const;
virtual bool isContainer( int ) const;
virtual int nbChildren( int ) const;
virtual bool isContainer( int ) const;
- // parameters got from actor return nothing if an actor is not visible
- virtual QList<QVariant> elemTypes( int
) const;
+ // parameters got from actor
,
return nothing if an actor is not visible
+ virtual QList<QVariant> elemTypes( int
, bool ) const; // == objElemTypes w/o actor
virtual QList<QVariant> labeledTypes( int ) const;
virtual QString displayMode( int ) const;
virtual QString shrinkMode( int ) const;
virtual QList<QVariant> labeledTypes( int ) const;
virtual QString displayMode( int ) const;
virtual QString shrinkMode( int ) const;
@@
-85,9
+85,10
@@
public:
SMESH_Actor* getActor( int ) const;
SMESH_Actor* getActor( int ) const;
- static int type( const QString&
, _PTR(Study)
);
+ static int type( const QString& );
static QString typeName( const int );
static QString typeName( const int );
-
+ static int guiState();
+
bool isImported( const int ) const;
private:
bool isImported( const int ) const;
private: