X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_CalculationCase.h;h=ca0fd81cb7440fd67c66a972ae83b618904bd734;hb=39b1848f103d89cfb544a1651b3fbf221fc2c401;hp=88f2c901abb59b7245b4ecd5f824ed30c6ef8308;hpb=21456a609299f2ab340ea325a17c508c0748e45b;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_CalculationCase.h b/src/HYDROData/HYDROData_CalculationCase.h
index 88f2c901..ca0fd81c 100644
--- a/src/HYDROData/HYDROData_CalculationCase.h
+++ b/src/HYDROData/HYDROData_CalculationCase.h
@@ -24,6 +24,7 @@
 #include <HYDROData_PriorityQueue.h>
 #include <HYDROData_Zone.h>
 #include <HYDROData_Warning.h>
+#include <vector>
 
 #ifdef WIN32
   #pragma warning ( disable: 4251 )
@@ -59,7 +60,7 @@ DEFINE_STANDARD_HANDLE(HYDROData_CalculationCase, HYDROData_Entity)
 
 
 /**\class HYDROData_CalculationCase
- * \brief Calculation case is defined by selection of Geometry objects with or without “Zone of water”.
+ * \brief Calculation case is defined by selection of Geometry objects with or without �Zone of water�.
  *
  */
 class HYDROData_CalculationCase : public HYDROData_Entity
@@ -96,6 +97,7 @@ public:
     DataTag_CustomRules,               ///< custom rules
     DataTag_AssignmentMode,            ///< assignment mode
     DataTag_StricklerTable,            ///< reference Strickler table
+    DataTag_InterPoly,                 ///< intersection polyline
 
     DataTag_LandCover_Obsolete,                 ///< reference land covers
     DataTag_CustomLandCoverRules_Obsolete,      ///< custom rules for land covers priority
@@ -274,6 +276,12 @@ public:
    */
   HYDRODATA_EXPORT virtual void RemoveSplitGroups();
 
+  HYDRODATA_EXPORT virtual bool AddInterPoly( const Handle(HYDROData_PolylineXY)& theInterPolyline );
+
+  HYDRODATA_EXPORT virtual void RemoveInterPolyObject( const Handle(HYDROData_PolylineXY)& theInterPolyline );
+
+  HYDRODATA_EXPORT virtual HYDROData_SequenceOfObjects GetInterPolyObjects() const;
+
   /**
    * Exports the calculation case data (shell and groups) to GEOM module.
    * \param theStudyId the id of the study where the GEOM module should be used for export
@@ -313,7 +321,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 +331,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.
@@ -331,6 +341,10 @@ public:
    */
   HYDRODATA_EXPORT double GetStricklerCoefficientForPoint( const gp_XY& thePoint ) const;
 
+  HYDRODATA_EXPORT std::vector<double> GetStricklerCoefficientForPoints(const std::vector<gp_XY>& thePoints,
+                                                                        double DefValue,
+                                                                        bool UseMax ) const;
+
   /**
    * Returns altitudes for given points on given region.
    * \param thePoints the points to examine
@@ -339,7 +353,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 +364,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.