X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Image.cxx;h=287541b1c3131095202b12021f50b2c7b3c0085b;hb=cde2ec476486fcd7c9b7b38ce814c648d73e7fd3;hp=0874417f028bbf0601f19c6cea68655c29b81bd7;hpb=30c0cab7fa5364508f087fdf73b62235e587f888;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Image.cxx b/src/HYDROData/HYDROData_Image.cxx index 0874417f..287541b1 100644 --- a/src/HYDROData/HYDROData_Image.cxx +++ b/src/HYDROData/HYDROData_Image.cxx @@ -21,6 +21,7 @@ #include "HYDROData_Document.h" #include "HYDROData_Lambert93.h" #include "HYDROData_OperationsFactory.h" +#include "HYDROData_Tool.h" #include #include @@ -44,9 +45,7 @@ #pragma warning ( default: 4251 ) #endif -#include - -static const Standard_GUID GUID_SELF_SPLITTED("997995aa-5c19-40bf-9a60-ab4b70ad04d8"); +static const Standard_GUID GUID_SELF_SPLIT("997995aa-5c19-40bf-9a60-ab4b70ad04d8"); static const Standard_GUID GUID_HAS_LOCAL_POINTS("FD8841AA-FC44-42fa-B6A7-0F682CCC6F27"); static const Standard_GUID GUID_HAS_GLOBAL_POINTS("330D0E81-742D-4ea3-92D4-484877CFA7C1"); @@ -508,7 +507,7 @@ void HYDROData_Image::RemoveAllReferences() ClearReferences(); SetOperatorName( "" ); SetArgs( "" ); - SetIsSelfSplitted( false ); + SetIsSelfSplit( false ); } bool anIsByTwoPoints = IsByTwoPoints(); @@ -672,8 +671,8 @@ bool HYDROData_Image::SetGlobalPointsFromFile( const QString& theFileName ) // Check the result if ( !isDoubleOk || - boost::math::isnan( aDoubleValue ) || - boost::math::isinf( aDoubleValue ) ) { + HYDROData_Tool::IsNan( aDoubleValue ) || + HYDROData_Tool::IsInf( aDoubleValue ) ) { continue; } @@ -875,19 +874,19 @@ QByteArray HYDROData_Image::Args() const return QByteArray(aData, aLen); } -void HYDROData_Image::SetIsSelfSplitted(bool theFlag) +void HYDROData_Image::SetIsSelfSplit(bool theFlag) { if (theFlag) { - TDataStd_UAttribute::Set(myLab, GUID_SELF_SPLITTED); + TDataStd_UAttribute::Set(myLab, GUID_SELF_SPLIT); } else { - myLab.ForgetAttribute(GUID_SELF_SPLITTED); + myLab.ForgetAttribute(GUID_SELF_SPLIT); } Changed( Geom_2d ); } -bool HYDROData_Image::IsSelfSplitted() const +bool HYDROData_Image::IsSelfSplit() const { - return myLab.IsAttribute(GUID_SELF_SPLITTED); + return myLab.IsAttribute(GUID_SELF_SPLIT); } QPointF HYDROData_Image::generateThirdPoint( const QPointF& thePointA,