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 V5_1_main 14/05/2010
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_ActorUtils.cxx
diff --git
a/src/OBJECT/SMESH_ActorUtils.cxx
b/src/OBJECT/SMESH_ActorUtils.cxx
index c8fcbfe2489d97497adda170b64a6455c4a5cdf0..6808e145e1c668b6aecff46a237e1835cf05fd7b 100644
(file)
--- a/
src/OBJECT/SMESH_ActorUtils.cxx
+++ b/
src/OBJECT/SMESH_ActorUtils.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
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
@@
-19,6
+19,7
@@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
#include "SMESH_ActorUtils.h"
#include "SUIT_Tools.h"
#include "SMESH_ActorUtils.h"
#include "SUIT_Tools.h"
@@
-41,7
+42,7
@@
namespace SMESH
vtkFloatingPointType
GetFloat( const QString& theValue,
vtkFloatingPointType
GetFloat( const QString& theValue,
- vtkFloatingPointType theDefault )
+
vtkFloatingPointType theDefault )
{
int pos = theValue.indexOf( ":" );
vtkFloatingPointType val = theDefault;
{
int pos = theValue.indexOf( ":" );
vtkFloatingPointType val = theDefault;
@@
-50,15
+51,15
@@
namespace SMESH
QString name = theValue.right( theValue.length()-pos-1 ),
sect = theValue.left( pos );
if( !name.isEmpty() && !sect.isEmpty() )
QString name = theValue.right( theValue.length()-pos-1 ),
sect = theValue.left( pos );
if( !name.isEmpty() && !sect.isEmpty() )
- val = GetFloat( name, sect, theDefault );
+
val = GetFloat( name, sect, theDefault );
}
return val;
}
vtkFloatingPointType
GetFloat( const QString& theValue,
}
return val;
}
vtkFloatingPointType
GetFloat( const QString& theValue,
- const QString& theSection,
- vtkFloatingPointType theDefault )
+
const QString& theSection,
+
vtkFloatingPointType theDefault )
{
vtkFloatingPointType val = theDefault;
SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
{
vtkFloatingPointType val = theDefault;
SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
@@
-70,7
+71,7
@@
namespace SMESH
void
WriteUnstructuredGrid(vtkUnstructuredGrid* theGrid,
void
WriteUnstructuredGrid(vtkUnstructuredGrid* theGrid,
- const char* theFileName)
+
const char* theFileName)
{
vtkUnstructuredGridWriter* aWriter = vtkUnstructuredGridWriter::New();
aWriter->SetFileName(theFileName);
{
vtkUnstructuredGridWriter* aWriter = vtkUnstructuredGridWriter::New();
aWriter->SetFileName(theFileName);
@@
-83,8
+84,8
@@
namespace SMESH
QColor
GetColor( const QString& theSect,
QColor
GetColor( const QString& theSect,
- const QString& theName,
- const QColor& def )
+
const QString& theName,
+
const QColor& def )
{
QColor c = def;
SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
{
QColor c = def;
SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
@@
-95,11
+96,11
@@
namespace SMESH
void
GetColor( const QString& theSect,
void
GetColor( const QString& theSect,
- const QString& theName,
- int& r,
- int& g,
- int& b,
- const QColor& def )
+
const QString& theName,
+
int& r,
+
int& g,
+
int& b,
+
const QColor& def )
{
QColor c = def;
SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
{
QColor c = def;
SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
@@
-111,11
+112,11
@@
namespace SMESH
void
GetColor( const QString& theSect,
void
GetColor( const QString& theSect,
- const QString& theName,
- vtkFloatingPointType& r,
- vtkFloatingPointType& g,
- vtkFloatingPointType& b,
- const QColor& def )
+
const QString& theName,
+
vtkFloatingPointType& r,
+
vtkFloatingPointType& g,
+
vtkFloatingPointType& b,
+
const QColor& def )
{
int ir( 0 ), ig( 0 ), ib( 0 );
GetColor( theSect, theName, ir, ig, ib, def );
{
int ir( 0 ), ig( 0 ), ib( 0 );
GetColor( theSect, theName, ir, ig, ib, def );