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 'V8_4_BR'
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_ActorUtils.h
diff --git
a/src/OBJECT/SMESH_ActorUtils.h
b/src/OBJECT/SMESH_ActorUtils.h
index ce189fbe8dcb88a6304e514733ced33702a8294d..d6bf74ac7cb4477462be6748eefa0cd24e7f43ef 100644
(file)
--- a/
src/OBJECT/SMESH_ActorUtils.h
+++ b/
src/OBJECT/SMESH_ActorUtils.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
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
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-37,19
+37,19
@@
namespace SMESH
enum LabelFont {
FntArial, //!< arial font family
FntCourier, //!< courier font family
enum LabelFont {
FntArial, //!< arial font family
FntCourier, //!< courier font family
- FntTimes
,
//!< times 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
@@
-70,9
+70,9
@@
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
const QColor& = QColor() );
SMESHOBJECT_EXPORT