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 from V6_main 11/02/2013
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_ActorUtils.h
diff --git
a/src/OBJECT/SMESH_ActorUtils.h
b/src/OBJECT/SMESH_ActorUtils.h
index 3a15c40adcb9c97ec7f4524c8b7a754478a8573a..ce189fbe8dcb88a6304e514733ced33702a8294d 100644
(file)
--- a/
src/OBJECT/SMESH_ActorUtils.h
+++ b/
src/OBJECT/SMESH_ActorUtils.h
@@
-33,6
+33,13
@@
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
vtkFloatingPointType
GetFloat( const QString& theValue,
SMESHOBJECT_EXPORT
vtkFloatingPointType
GetFloat( const QString& theValue,
@@
-71,10
+78,10
@@
SMESHOBJECT_EXPORT
SMESHOBJECT_EXPORT
void
GetColor( const QString& theSect,
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>
SMESHOBJECT_EXPORT
std::map<SMDSAbs_ElementType,int>