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
PR: synchro V7_main tag mergefrom_V6_main_06Mar13
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_ActorUtils.h
diff --git
a/src/OBJECT/SMESH_ActorUtils.h
b/src/OBJECT/SMESH_ActorUtils.h
index e98d0f5deeb3bc1eebe6a82a5107705813c1c768..9a6200906f35e60d75ca19b8aacefa132d4cbde2 100644
(file)
--- a/
src/OBJECT/SMESH_ActorUtils.h
+++ b/
src/OBJECT/SMESH_ActorUtils.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
1
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
2
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
@@
-24,6
+24,7
@@
#define SMESH_ACTORUTILS_H
#include "SMESH_Object.h"
#define SMESH_ACTORUTILS_H
#include "SMESH_Object.h"
+#include <map>
#include <QColor>
#include <QColor>
@@
-32,16
+33,23
@@
class SMESH_Actor;
namespace SMESH
{
namespace SMESH
{
+ //! Label font family
+ enum LabelFont {
+ FntArial, //!< arial font family
+ FntCourier, //!< courier font family
+ FntTimes, //!< times font family
+ };
+
SMESHOBJECT_EXPORT
SMESHOBJECT_EXPORT
-
vtkFloatingPointTyp
e
+
doubl
e
GetFloat( const QString& theValue,
GetFloat( const QString& theValue,
-
vtkFloatingPointTyp
e theDefault = 0 );
+
doubl
e theDefault = 0 );
SMESHOBJECT_EXPORT
SMESHOBJECT_EXPORT
-
vtkFloatingPointTyp
e
+
doubl
e
GetFloat( const QString& theName,
const QString& theSection,
GetFloat( const QString& theName,
const QString& theSection,
-
vtkFloatingPointTyp
e theDefault = 0 );
+
doubl
e theDefault = 0 );
SMESHOBJECT_EXPORT
QColor
SMESHOBJECT_EXPORT
QColor
@@
-62,18
+70,22
@@
SMESHOBJECT_EXPORT
void
GetColor( const QString& theSect,
const QString& theName,
void
GetColor( const QString& theSect,
const QString& theName,
-
vtkFloatingPointTyp
e&,
-
vtkFloatingPointTyp
e&,
-
vtkFloatingPointTyp
e&,
+
doubl
e&,
+
doubl
e&,
+
doubl
e&,
const QColor& = QColor() );
SMESHOBJECT_EXPORT
void
GetColor( const QString& theSect,
const QColor& = QColor() );
SMESHOBJECT_EXPORT
void
GetColor( const QString& theSect,
- const QString& theName,
- QColor& color,
- int& delta,
- QString def);
+ const QString& theName,
+ QColor& color,
+ int& delta,
+ QString def);
+
+ SMESHOBJECT_EXPORT
+ std::map<SMDSAbs_ElementType,int>
+ GetEntitiesFromObject(SMESH_VisualObj *theObject);
SMESHOBJECT_EXPORT
void
SMESHOBJECT_EXPORT
void