Parameters annotation corrected.

[modules/hydro.git] / src / HYDROPy / HYDROData_CalculationCase.sip

diff --git a/src/HYDROPy/HYDROData_CalculationCase.sip b/src/HYDROPy/HYDROData_CalculationCase.sip
index b6c119eb556932fc20d5cb735153f1e2ba70f90e..9557333f7d6a1142c7557e9ebdf1a47bdb15ea4c 100644 (file)
--- a/src/HYDROPy/HYDROData_CalculationCase.sip
+++ b/src/HYDROPy/HYDROData_CalculationCase.sip
@@ -24,7 +24,7 @@
 #include <HYDROData_CalculationCase.h>
 %End
 
-class HYDROData_CalculationCase : HYDROData_Entity
+class HYDROData_CalculationCase : public HYDROData_Entity
 {
 
 %TypeHeaderCode
@@ -289,20 +289,87 @@ 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( const gp_XY& thePoint ) 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;
     
+    gp_XY aPnt( a0, a1 );
+  
     Py_BEGIN_ALLOW_THREADS
-    aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetZoneFromPoint( *a0 ) : 
-                           sipCpp->GetZoneFromPoint( *a0 );
+    aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetZoneFromPoint( aPnt ) : 
+                           sipCpp->GetZoneFromPoint( aPnt );
     Py_END_ALLOW_THREADS
     
     sipRes = (HYDROData_Zone*)createPointer( aRes );
@@ -314,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: