X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROPy%2FHYDROData_CalculationCase.sip;h=48a257f9c9a568a55d9a52c999fb98d4a72d4d75;hb=19a3b00b657cd97859502f8bf693f0d1caf800d7;hp=9557333f7d6a1142c7557e9ebdf1a47bdb15ea4c;hpb=b2c8c65866a6132584b866808d41777142430ada;p=modules%2Fhydro.git

diff --git a/src/HYDROPy/HYDROData_CalculationCase.sip b/src/HYDROPy/HYDROData_CalculationCase.sip
index 9557333f..48a257f9 100644
--- a/src/HYDROPy/HYDROData_CalculationCase.sip
+++ b/src/HYDROPy/HYDROData_CalculationCase.sip
@@ -300,6 +300,27 @@ public:
     Py_END_ALLOW_THREADS
   %End
 
+  /**
+   * Returns altitude for given point on given region.
+   * \param thePoint the point to examine
+   * \param theRegion reference region to check
+   * \return result altitude value
+   */
+  double GetAltitudeForPoint( const double     theCoordX,
+                              const double     theCoordY,
+                              HYDROData_Region theRegion ) const
+  [double ( const gp_XY&, const Handle_HYDROData_Region& )];
+  %MethodCode
+    gp_XY aPnt( a0, a1 );
+    Handle(HYDROData_Region) aRefRegion =
+      Handle(HYDROData_Region)::DownCast( createHandle( a2 ) );
+
+    Py_BEGIN_ALLOW_THREADS
+    sipRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetAltitudeForPoint( aPnt, aRefRegion ) : 
+                             sipCpp->GetAltitudeForPoint( aPnt, aRefRegion );
+    Py_END_ALLOW_THREADS
+  %End
+
   /**
    * Returns altitude for given point on given zone.
    * \param thePoint the point to examine
@@ -321,6 +342,39 @@ public:
     Py_END_ALLOW_THREADS
   %End
 
+  /**
+   * Returns altitudes for given points on given region.
+   * \param thePoints the points to examine
+   * \param theZone reference region to check
+   * \return result altitude value
+   */
+  NCollection_Sequence<double> GetAltitudesForPoints( const NCollection_Sequence<double>& theCoordsX,
+                                                      const NCollection_Sequence<double>& theCoordsY,
+                                                      HYDROData_Region                    theRegion ) const
+  [NCollection_Sequence<double> ( const NCollection_Sequence<gp_XY>&, const Handle_HYDROData_Region& )];
+  %MethodCode
+
+    NCollection_Sequence<gp_XY> aPnts;
+
+    int aLen = qMin( a0->Length(), a1->Length() );
+    for ( int i = 1; i <= aLen; ++i )
+    {
+      gp_XY aPnt( a0->Value( i ), a1->Value( i ) );
+      aPnts.Append( aPnt );
+    }
+
+    Handle(HYDROData_Region) aRefRegion =
+      Handle(HYDROData_Region)::DownCast( createHandle( a2 ) );
+
+    NCollection_Sequence<double> aRes;
+    Py_BEGIN_ALLOW_THREADS
+    aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetAltitudesForPoints( aPnts, aRefRegion ) : 
+                           sipCpp->GetAltitudesForPoints( aPnts, aRefRegion );
+    Py_END_ALLOW_THREADS
+    
+    sipRes = new NCollection_Sequence<double>( aRes );
+  %End
+
   /**
    * Returns altitudes for given points on given zone.
    * \param thePoints the points to examine
@@ -354,6 +408,27 @@ public:
     sipRes = new NCollection_Sequence<double>( aRes );
   %End
   
+  /**
+   * Returns region to which the point is belongs.
+   * \param thePoint the point to examine
+   * \return result region
+   */
+  HYDROData_Region GetRegionFromPoint( const double theCoordX,
+                                       const double theCoordY ) const
+  [Handle_HYDROData_Region ( const gp_XY& )];
+  %MethodCode
+    Handle(HYDROData_Region) aRes;
+    
+    gp_XY aPnt( a0, a1 );
+  
+    Py_BEGIN_ALLOW_THREADS
+    aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetRegionFromPoint( aPnt ) : 
+                           sipCpp->GetRegionFromPoint( aPnt );
+    Py_END_ALLOW_THREADS
+    
+    sipRes = (HYDROData_Region*)createPointer( aRes );
+  %End
+
   /**
    * Returns zone to which the point is belongs.
    * \param thePoint the point to examine