Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/smesh.git] / src / OBJECT / SMESH_ActorUtils.cxx

diff --git a/src/OBJECT/SMESH_ActorUtils.cxx b/src/OBJECT/SMESH_ActorUtils.cxx
index feee143db948dd0510aa8ec57b3d4ee291f974a1..e498c2f722bd26300b24d1c3c5d5976873b23417 100644 (file)
--- a/src/OBJECT/SMESH_ActorUtils.cxx
+++ b/src/OBJECT/SMESH_ActorUtils.cxx
@@ -15,7 +15,7 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 
 
 #include "SMESH_ActorUtils.h"
@@ -35,12 +35,15 @@ static int MYDEBUG = 1;
 static int MYDEBUG = 0;
 #endif
 
-namespace SMESH{
+namespace SMESH
+{
 
-  float GetFloat( const QString& theValue, float theDefault )
+  vtkFloatingPointType
+  GetFloat( const QString& theValue, 
+           vtkFloatingPointType theDefault )
   {
     int pos = theValue.find( ":" );
-    float val = theDefault;
+    vtkFloatingPointType val = theDefault;
     if( pos>=0 ) 
     {
       QString name = theValue.right( theValue.length()-pos-1 ),
@@ -51,17 +54,23 @@ namespace SMESH{
     return val;
   }
 
-  float GetFloat( const QString& theValue, const QString& theSection, float theDefault )
+  vtkFloatingPointType
+  GetFloat( const QString& theValue, 
+           const QString& theSection, 
+           vtkFloatingPointType theDefault )
   {
-    float val = theDefault;
+    vtkFloatingPointType val = theDefault;
     SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
     if( mgr )
-      val = (float) mgr->doubleValue( theValue, theSection, theDefault );
+      val = (vtkFloatingPointType) mgr->doubleValue( theValue, theSection, theDefault );
 
     return val;
   }
 
-  void WriteUnstructuredGrid(vtkUnstructuredGrid* theGrid, const char* theFileName){
+  void
+  WriteUnstructuredGrid(vtkUnstructuredGrid* theGrid, 
+                       const char* theFileName)
+  {
     vtkUnstructuredGridWriter* aWriter = vtkUnstructuredGridWriter::New();
     aWriter->SetFileName(theFileName);
     aWriter->SetInput(theGrid);
@@ -71,7 +80,10 @@ namespace SMESH{
     aWriter->Delete();
   }
 
-  QColor GetColor( const QString& theSect, const QString& theName, const QColor& def )
+  QColor
+  GetColor( const QString& theSect, 
+           const QString& theName, 
+           const QColor& def )
   {
     QColor c = def;
     SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
@@ -80,7 +92,13 @@ namespace SMESH{
     return c;
   }
 
-  void GetColor( const QString& theSect, const QString& theName, int& r, int& g, int& b, const QColor& def )
+  void
+  GetColor( const QString& theSect, 
+           const QString& theName, 
+           int& r, 
+           int& g, 
+           int& b, 
+           const QColor& def )
   {
     QColor c = def;
     SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
@@ -90,7 +108,13 @@ namespace SMESH{
     SUIT_Tools::rgbSet( SUIT_Tools::rgbSet( c ), r, g, b );
   }
 
-  void GetColor( const QString& theSect, const QString& theName, float& r, float& g, float& b, const QColor& def )
+  void
+  GetColor( const QString& theSect, 
+           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 );