PR: synchro V7_main tag mergefrom_V6_main_06Mar13

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

diff --git a/src/OBJECT/SMESH_ActorUtils.cxx b/src/OBJECT/SMESH_ActorUtils.cxx
index c756156e01e9f23f8170508e89770b7439085b1f..9ce8b05672ae932002c0182a3d2da8b77a264c17 100644 (file)
--- a/src/OBJECT/SMESH_ActorUtils.cxx
+++ b/src/OBJECT/SMESH_ActorUtils.cxx
@@ -55,12 +55,12 @@
 namespace SMESH
 {
 
 namespace SMESH
 {
 

-  vtkFloatingPointType
+  double

   GetFloat( const QString& theValue, 
   GetFloat( const QString& theValue, 

-            vtkFloatingPointType theDefault )
+            double theDefault )

   {
     int pos = theValue.indexOf( ":" );
   {
     int pos = theValue.indexOf( ":" );

-    vtkFloatingPointType val = theDefault;
+    double val = theDefault;

     if( pos>=0 ) 
     {
       QString name = theValue.right( theValue.length()-pos-1 ),
     if( pos>=0 ) 
     {
       QString name = theValue.right( theValue.length()-pos-1 ),


@@ -71,15 +71,15 @@ namespace SMESH
     return val;
   }
 
     return val;
   }
 

-  vtkFloatingPointType
+  double

   GetFloat( const QString& theValue, 
             const QString& theSection, 
   GetFloat( const QString& theValue, 
             const QString& theSection, 

-            vtkFloatingPointType theDefault )
+            double theDefault )

   {
   {

-    vtkFloatingPointType val = theDefault;
+    double val = theDefault;

     SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
     if( mgr )
     SUIT_ResourceMgr* mgr = SUIT_Session::session()->resourceMgr();
     if( mgr )

-      val = (vtkFloatingPointType) mgr->doubleValue( theSection, theValue, theDefault );
+      val = (double) mgr->doubleValue( theSection, theValue, theDefault );

 
     return val;
   }
 
     return val;
   }


@@ -90,7 +90,7 @@ namespace SMESH
   {
     vtkXMLUnstructuredGridWriter* aWriter = vtkXMLUnstructuredGridWriter::New();
     aWriter->SetFileName(theFileName);
   {
     vtkXMLUnstructuredGridWriter* aWriter = vtkXMLUnstructuredGridWriter::New();
     aWriter->SetFileName(theFileName);

-    aWriter->SetInput(theGrid);
+    aWriter->SetInputData(theGrid);

     aWriter->SetDataModeToAscii();
     if(theGrid->GetNumberOfCells()){
       aWriter->Write();
     aWriter->SetDataModeToAscii();
     if(theGrid->GetNumberOfCells()){
       aWriter->Write();


@@ -129,9 +129,9 @@ namespace SMESH
   void
   GetColor( const QString& theSect, 
             const QString& theName, 
   void
   GetColor( const QString& theSect, 
             const QString& theName, 

-            vtkFloatingPointType& r, 
-            vtkFloatingPointType& g, 
-            vtkFloatingPointType& b, 
+            double& r, 
+            double& g, 
+            double& b, 

             const QColor& def )
   {
     int ir( 0 ), ig( 0 ), ib( 0 );
             const QColor& def )
   {
     int ir( 0 ), ig( 0 ), ib( 0 );