merge BR_PORTING_OCCT_7

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

diff --git a/src/HYDROData/HYDROData_StreamAltitude.h b/src/HYDROData/HYDROData_StreamAltitude.h
index 55028e8ef8429cee4840d3a3dbdf01f60374c6e6..25bd528e3429abd63cd6ec31883a16dea0317db1 100644 (file)
--- a/src/HYDROData/HYDROData_StreamAltitude.h
+++ b/src/HYDROData/HYDROData_StreamAltitude.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
@@ -26,10 +22,8 @@
 
 #include "HYDROData_IAltitudeObject.h"
 
-class Handle(HYDROData_Profile);
-
-DEFINE_STANDARD_HANDLE(HYDROData_StreamAltitude, HYDROData_IAltitudeObject)
 
+class TopoDS_Wire;
 
 /**\class HYDROData_StreamAltitude
  * \brief Class that stores/retreives information about the stream altitude.
@@ -49,7 +43,7 @@ protected:
 
 public:
 
-  DEFINE_STANDARD_RTTI(HYDROData_StreamAltitude);
+  DEFINE_STANDARD_RTTIEXT(HYDROData_StreamAltitude, HYDROData_IAltitudeObject);
 
   /**
    * Returns the kind of this object. 
@@ -65,13 +59,14 @@ 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:
 
-  bool getBoundaryProfilesForPoint( const gp_XY&               thePoint,
-                                    Handle(HYDROData_Profile)& theLeftProfile,
-                                    Handle(HYDROData_Profile)& theRightProfile ) const;
+  bool getBoundaryWiresForPoint( const gp_XY&               thePoint,
+                                 TopoDS_Wire& theLeftWire,
+                                 TopoDS_Wire& theRightWire ) const;
 
 protected: