Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7

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

diff --git a/src/HYDROData/HYDROData_ObstacleAltitude.h b/src/HYDROData/HYDROData_ObstacleAltitude.h
index 376ba5f03fff83600b534ce968d6384a7d382c97..3fd489d153001399ac3087f856dc567498b3b6b8 100644 (file)
--- a/src/HYDROData/HYDROData_ObstacleAltitude.h
+++ b/src/HYDROData/HYDROData_ObstacleAltitude.h
@@ -1,3 +1,20 @@
+// 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
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef HYDROData_ObstacleAltitude_HeaderFile
 #define HYDROData_ObstacleAltitude_HeaderFile
@@ -6,8 +23,6 @@
 #include "HYDROData_IAltitudeObject.h"
 
 
-DEFINE_STANDARD_HANDLE(HYDROData_ObstacleAltitude, HYDROData_IAltitudeObject)
-
 
 /**\class HYDROData_ObstacleAltitude
  * \brief Class that stores/retreives information about the obstacle altitude.
@@ -27,7 +42,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(HYDROData_ObstacleAltitude);
+  DEFINE_STANDARD_RTTIEXT(HYDROData_ObstacleAltitude, HYDROData_IAltitudeObject);
 
   /**
    * Returns the kind of this object. 
@@ -43,7 +58,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: