first part of the porting on OCCT 7.0

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

diff --git a/src/HYDROData/HYDROData_CalculationCase.h b/src/HYDROData/HYDROData_CalculationCase.h
index 88f2c901abb59b7245b4ecd5f824ed30c6ef8308..af03f9518a787a415296d1f9b3f8bac641ba69a4 100644 (file)
--- a/src/HYDROData/HYDROData_CalculationCase.h
+++ b/src/HYDROData/HYDROData_CalculationCase.h
@@ -43,23 +43,19 @@ class gp_XY;
 
 class TopoDS_Shape;
 class TopoDS_Shell;
-class TopTools_ListOfShape;
-
-class Handle(HYDROData_Object);
-class Handle(HYDROData_Region);
-class Handle(HYDROData_Zone);
-class Handle(HYDROData_PolylineXY);
-class Handle(HYDROData_ShapesGroup);
-class Handle(HYDROData_SplitShapesGroup);
-class Handle(HYDROData_Document);
-class Handle(HYDROData_StricklerTable);
-class Handle(HYDROData_LandCoverMap);
-
-DEFINE_STANDARD_HANDLE(HYDROData_CalculationCase, HYDROData_Entity)
 
+class HYDROData_Object;
+class HYDROData_Region;
+class HYDROData_Zone;
+class HYDROData_PolylineXY;
+class HYDROData_ShapesGroup;
+class HYDROData_SplitShapesGroup;
+class HYDROData_Document;
+class HYDROData_StricklerTable;
+class HYDROData_LandCoverMap;
 
 /**\class HYDROData_CalculationCase
- * \brief Calculation case is defined by selection of Geometry objects with or without \93Zone of water\94.
+ * \brief Calculation case is defined by selection of Geometry objects with or without �Zone of water�.
  *
  */
 class HYDROData_CalculationCase : public HYDROData_Entity
@@ -107,8 +103,7 @@ public:
   };
 
 public:
-
-  DEFINE_STANDARD_RTTI(HYDROData_CalculationCase);
+  DEFINE_STANDARD_RTTIEXT(HYDROData_CalculationCase, HYDROData_Entity);
 
   /**
    * Returns the kind of this object. Must be redefined in all objects of known type.
@@ -313,7 +308,8 @@ public:
    * \return result altitude value
    */
   HYDRODATA_EXPORT virtual double GetAltitudeForPoint( const gp_XY&                    thePoint,
-                                                       const Handle(HYDROData_Region)& theRegion ) const;
+                                                       const Handle(HYDROData_Region)& theRegion,
+                                                       int theMethod = 0) const;
 
   /**
    * Returns altitude for given point on given zone.
@@ -322,7 +318,8 @@ public:
    * \return result altitude value
    */
   HYDRODATA_EXPORT virtual double GetAltitudeForPoint( const gp_XY&                  thePoint,
-                                                       const Handle(HYDROData_Zone)& theZone ) const;
+                                                       const Handle(HYDROData_Zone)& theZone,
+                                                       int theMethod = 0) const;
 
   /**
    * Returns strickler coefficient for given point.
@@ -339,7 +336,8 @@ public:
    */
   HYDRODATA_EXPORT virtual NCollection_Sequence<double> GetAltitudesForPoints( 
     const NCollection_Sequence<gp_XY>& thePoints,
-    const Handle(HYDROData_Region)&    theRegion ) const;
+    const Handle(HYDROData_Region)&    theRegion,
+    int theMethod = 0) const;
 
   /**
    * Returns altitudes for given points on given zone.
@@ -349,7 +347,8 @@ public:
    */
   HYDRODATA_EXPORT virtual NCollection_Sequence<double> GetAltitudesForPoints( 
     const NCollection_Sequence<gp_XY>& thePoints,
-    const Handle(HYDROData_Zone)&      theZone ) const;
+    const Handle(HYDROData_Zone)&      theZone,
+    int theMethod = 0) const;
 
   /**
    * Returns region to which the point is belongs.