Merge remote-tracking branch 'origin/BR_DEMO' into BR_2017

[modules/hydro.git] / src / HYDROData / HYDROData_IAltitudeObject.h

diff --git a/src/HYDROData/HYDROData_IAltitudeObject.h b/src/HYDROData/HYDROData_IAltitudeObject.h
index 50d65d9532070e494e75ba17dc5411977ffba5e7..638a1b783e67ea1650ac2fa64a5f974a3a6ba453 100644 (file)
--- a/src/HYDROData/HYDROData_IAltitudeObject.h
+++ b/src/HYDROData/HYDROData_IAltitudeObject.h
@@ -23,8 +23,6 @@
 
 class gp_XY;
 
-DEFINE_STANDARD_HANDLE(HYDROData_IAltitudeObject, HYDROData_Entity)
-
 
 /**\class HYDROData_IAltitudeObject
  * \briefThe base class for all altitude objects in the HYDRO module.
@@ -43,15 +41,14 @@ protected:
   };
 
 public:
-
-  DEFINE_STANDARD_RTTI(HYDROData_IAltitudeObject);
+  DEFINE_STANDARD_RTTIEXT(HYDROData_IAltitudeObject, HYDROData_Entity);
 
   /**
    * Returns the kind of this object. Must be redefined in all objects of known type.
    */
   HYDRODATA_EXPORT virtual const ObjectKind GetKind() const = 0;
 
-public:      
+public:
   // Public methods to work with altitudes.
 
   /**
@@ -65,7 +62,7 @@ public:
    * \param thePoint the point to examine
    * \return altitude value
    */
-  HYDRODATA_EXPORT virtual double           GetAltitudeForPoint( const gp_XY& thePoint ) const = 0;
+  HYDRODATA_EXPORT virtual double           GetAltitudeForPoint( const gp_XY& thePoint, int theMethod=0 ) const = 0;
 
 
 protected: