X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_AltitudeObject.h;h=554b982c880a437e18b49e5f6dfa0aeafd34d1f2;hb=f86cf7ecf17dbae2a1d84e0ebbab07c732208c2f;hp=610caae03142aafbcdcdda6ea3846c5c26498e41;hpb=474c2cd65280d793f1c81ca528bc92e1cff988e6;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_AltitudeObject.h b/src/HYDROData/HYDROData_AltitudeObject.h index 610caae0..554b982c 100644 --- a/src/HYDROData/HYDROData_AltitudeObject.h +++ b/src/HYDROData/HYDROData_AltitudeObject.h @@ -1,8 +1,4 @@ -// Copyright (C) 2007-2015 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) 2014-2015 EDF-R&D // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either @@ -27,8 +23,6 @@ #include "HYDROData_IAltitudeObject.h" -DEFINE_STANDARD_HANDLE(HYDROData_AltitudeObject, HYDROData_IAltitudeObject) - /**\class HYDROData_AltitudeObject * \brief Class that stores/retreives information about the Altitude. @@ -37,7 +31,6 @@ DEFINE_STANDARD_HANDLE(HYDROData_AltitudeObject, HYDROData_IAltitudeObject) class HYDROData_AltitudeObject : public HYDROData_IAltitudeObject { protected: - /** * Enumeration of tags corresponding to the persistent object parameters. */ @@ -47,8 +40,7 @@ protected: }; public: - - DEFINE_STANDARD_RTTI(HYDROData_AltitudeObject); + DEFINE_STANDARD_RTTIEXT(HYDROData_AltitudeObject, HYDROData_IAltitudeObject); /** * Returns the kind of this object. @@ -59,7 +51,8 @@ public: /** * Dump Altitude object to Python script representation. */ - HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const; + HYDRODATA_EXPORT virtual QStringList DumpToPython( const QString& thePyScriptPath, + MapOfTreatedObjects& theTreatedObjects ) const; public: @@ -70,7 +63,8 @@ public: * \param thePoint the point to examine * \return altitude value */ - HYDRODATA_EXPORT virtual double GetAltitudeForPoint( const gp_XY& thePoint ) const; + HYDRODATA_EXPORT virtual double GetAltitudeForPoint( const gp_XY& thePoint, + int theMethod = 0) const; protected: