X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROPy%2FHYDROData_CalculationCase.sip;h=9557333f7d6a1142c7557e9ebdf1a47bdb15ea4c;hb=6450e251d00e2beaa02e0de026b0f1af2b948a0e;hp=bf1cb020352d625c44b7a473532bd4ca19bcb986;hpb=5a8d8e4352ca50e2b12a2ddf25f0fd8f6f842418;p=modules%2Fhydro.git

diff --git a/src/HYDROPy/HYDROData_CalculationCase.sip b/src/HYDROPy/HYDROData_CalculationCase.sip
index bf1cb020..9557333f 100644
--- a/src/HYDROPy/HYDROData_CalculationCase.sip
+++ b/src/HYDROPy/HYDROData_CalculationCase.sip
@@ -289,27 +289,88 @@ public:
    * \param thePoint the point to examine
    * \return result altitude value
    */
-  double GetAltitudeForPoint( const gp_XY& thePoint ) const;
+  double GetAltitudeForPoint( const double theCoordX,
+                              const double theCoordY ) const [double ( const gp_XY& )];
+  %MethodCode
+    gp_XY aPnt( a0, a1 );
+  
+    Py_BEGIN_ALLOW_THREADS
+    sipRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetAltitudeForPoint( aPnt ) : 
+                             sipCpp->GetAltitudeForPoint( aPnt );
+    Py_END_ALLOW_THREADS
+  %End
+
+  /**
+   * Returns altitude for given point on given zone.
+   * \param thePoint the point to examine
+   * \param theZone reference zone to check
+   * \return result altitude value
+   */
+  double GetAltitudeForPoint( const double theCoordX,
+                              const double theCoordY,
+                              HYDROData_Zone theZone ) const
+  [double ( const gp_XY&, const Handle_HYDROData_Zone& )];
+  %MethodCode
+    gp_XY aPnt( a0, a1 );
+    Handle(HYDROData_Zone) aRefZone =
+      Handle(HYDROData_Zone)::DownCast( createHandle( a2 ) );
+
+    Py_BEGIN_ALLOW_THREADS
+    sipRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetAltitudeForPoint( aPnt, aRefZone ) : 
+                             sipCpp->GetAltitudeForPoint( aPnt, aRefZone );
+    Py_END_ALLOW_THREADS
+  %End
+
+  /**
+   * Returns altitudes for given points on given zone.
+   * \param thePoints the points to examine
+   * \param theZone reference zone to check
+   * \return result altitude value
+   */
+  NCollection_Sequence<double> GetAltitudesForPoints( const NCollection_Sequence<double>& theCoordsX,
+                                                      const NCollection_Sequence<double>& theCoordsY,
+                                                      HYDROData_Zone                      theZone ) const
+  [NCollection_Sequence<double> ( const NCollection_Sequence<gp_XY>&, const Handle_HYDROData_Zone& )];
+  %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_Zone) aRefZone =
+      Handle(HYDROData_Zone)::DownCast( createHandle( a2 ) );
 
+    NCollection_Sequence<double> aRes;
+    Py_BEGIN_ALLOW_THREADS
+    aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetAltitudesForPoints( aPnts, aRefZone ) : 
+                           sipCpp->GetAltitudesForPoints( aPnts, aRefZone );
+    Py_END_ALLOW_THREADS
+    
+    sipRes = new NCollection_Sequence<double>( aRes );
+  %End
+  
   /**
    * Returns zone to which the point is belongs.
    * \param thePoint the point to examine
    * \return result zone
    */
-  HYDROData_Zone GetZoneFromPoint( SIP_PYTUPLE ) const [Handle_HYDROData_Zone ( const gp_XY& )];
+  HYDROData_Zone GetZoneFromPoint( const double theCoordX,
+                                   const double theCoordY ) const
+  [Handle_HYDROData_Zone ( const gp_XY& )];
   %MethodCode
     Handle(HYDROData_Zone) aRes;
     
-    double x = 0.0, y = 0.0;
-    if ( PyArg_ParseTuple( a0, "dd", &x, &y ) )
-    {
-      gp_XY aPnt( x, y );
+    gp_XY aPnt( a0, a1 );
   
-      Py_BEGIN_ALLOW_THREADS
-      aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetZoneFromPoint( aPnt ) : 
-                             sipCpp->GetZoneFromPoint( aPnt );
-      Py_END_ALLOW_THREADS
-    }
+    Py_BEGIN_ALLOW_THREADS
+    aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetZoneFromPoint( aPnt ) : 
+                           sipCpp->GetZoneFromPoint( aPnt );
+    Py_END_ALLOW_THREADS
     
     sipRes = (HYDROData_Zone*)createPointer( aRes );
   %End
@@ -320,22 +381,20 @@ public:
    * \param theZone the zone to examine
    * \return result classification
    */
-  PointClassification GetPointClassification(
-    const gp_XY&   thePoint,
-    HYDROData_Zone theZone ) const 
-    [PointClassification ( const gp_XY&, const Handle_HYDROData_Zone& )];
-    
+  PointClassification GetPointClassification( const double theCoordX,
+                                              const double theCoordY,
+                                              HYDROData_Zone theZone ) const 
+  [PointClassification ( const gp_XY&, const Handle_HYDROData_Zone& )];    
   %MethodCode
+    gp_XY aPnt( a0, a1 );
+
     Handle(HYDROData_Zone) aRef =
-      Handle(HYDROData_Zone)::DownCast( createHandle( a1 ) );
-   
-    if ( !aRef.IsNull() )
-    {
-      Py_BEGIN_ALLOW_THREADS
-      sipRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetPointClassification( *a0, aRef ) : 
-                               sipCpp->GetPointClassification( *a0, aRef );
-      Py_END_ALLOW_THREADS
-    }
+      Handle(HYDROData_Zone)::DownCast( createHandle( a2 ) );
+
+    Py_BEGIN_ALLOW_THREADS
+    sipRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetPointClassification( aPnt, aRef ) : 
+                             sipCpp->GetPointClassification( aPnt, aRef );
+    Py_END_ALLOW_THREADS
   %End
 
 protected: