X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FOBJECT%2FSMESH_ActorUtils.cxx;h=79c1d7e31ff72a12b735a3ed4cb0494b4343f525;hb=a58d1281752d62ff40dac81af7076e1ab1fee824;hp=c756156e01e9f23f8170508e89770b7439085b1f;hpb=9a54694a0ab1e5cbc558a35c4606ceea4f7af2ef;p=modules%2Fsmesh.git diff --git a/src/OBJECT/SMESH_ActorUtils.cxx b/src/OBJECT/SMESH_ActorUtils.cxx index c756156e0..79c1d7e31 100644 --- a/src/OBJECT/SMESH_ActorUtils.cxx +++ b/src/OBJECT/SMESH_ActorUtils.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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 @@ -55,12 +55,12 @@ namespace SMESH { - vtkFloatingPointType + double GetFloat( const QString& theValue, - vtkFloatingPointType theDefault ) + double theDefault ) { int pos = theValue.indexOf( ":" ); - vtkFloatingPointType val = theDefault; + double val = theDefault; if( pos>=0 ) { QString name = theValue.right( theValue.length()-pos-1 ), @@ -71,15 +71,15 @@ namespace SMESH return val; } - vtkFloatingPointType + double 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 ) - val = (vtkFloatingPointType) mgr->doubleValue( theSection, theValue, theDefault ); + val = (double) mgr->doubleValue( theSection, theValue, theDefault ); return val; } @@ -90,7 +90,7 @@ namespace SMESH { vtkXMLUnstructuredGridWriter* aWriter = vtkXMLUnstructuredGridWriter::New(); aWriter->SetFileName(theFileName); - aWriter->SetInput(theGrid); + aWriter->SetInputData(theGrid); aWriter->SetDataModeToAscii(); if(theGrid->GetNumberOfCells()){ aWriter->Write(); @@ -129,9 +129,9 @@ namespace SMESH 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 );