Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/BR_DEMO' into BR_2017
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_AltitudeObject.h
diff --git
a/src/HYDROData/HYDROData_AltitudeObject.h
b/src/HYDROData/HYDROData_AltitudeObject.h
index 3d5423371b673ac4180d86337f535c8f7bda3880..554b982c880a437e18b49e5f6dfa0aeafd34d1f2 100644
(file)
--- a/
src/HYDROData/HYDROData_AltitudeObject.h
+++ b/
src/HYDROData/HYDROData_AltitudeObject.h
@@
-23,8
+23,6
@@
#include "HYDROData_IAltitudeObject.h"
#include "HYDROData_IAltitudeObject.h"
-DEFINE_STANDARD_HANDLE(HYDROData_AltitudeObject, HYDROData_IAltitudeObject)
-
/**\class HYDROData_AltitudeObject
* \brief Class that stores/retreives information about the Altitude.
/**\class HYDROData_AltitudeObject
* \brief Class that stores/retreives information about the Altitude.
@@
-33,7
+31,6
@@
DEFINE_STANDARD_HANDLE(HYDROData_AltitudeObject, HYDROData_IAltitudeObject)
class HYDROData_AltitudeObject : public HYDROData_IAltitudeObject
{
protected:
class HYDROData_AltitudeObject : public HYDROData_IAltitudeObject
{
protected:
-
/**
* Enumeration of tags corresponding to the persistent object parameters.
*/
/**
* Enumeration of tags corresponding to the persistent object parameters.
*/
@@
-43,8
+40,7
@@
protected:
};
public:
};
public:
-
- DEFINE_STANDARD_RTTI(HYDROData_AltitudeObject);
+ DEFINE_STANDARD_RTTIEXT(HYDROData_AltitudeObject, HYDROData_IAltitudeObject);
/**
* Returns the kind of this object.
/**
* Returns the kind of this object.
@@
-55,7
+51,8
@@
public:
/**
* Dump Altitude object to Python script representation.
*/
/**
* 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:
public:
@@
-66,7
+63,8
@@
public:
* \param thePoint the point to examine
* \return altitude value
*/
* \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:
protected: