From: adv <adv@opencascade.com>
Date: Fri, 24 Jan 2014 09:50:15 +0000 (+0000)
Subject: Get altitude for sequence of points has been implemented by customer request.
X-Git-Tag: BR_hydro_v_1_0~46
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b2c8c65866a6132584b866808d41777142430ada;p=modules%2Fhydro.git

Get altitude for sequence of points has been implemented by customer request.
---

diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx
index 97fa637d..5fbcba77 100644
--- a/src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/src/HYDROData/HYDROData_CalculationCase.cxx
@@ -589,6 +589,23 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
   return aResAltitude;
 }
 
+NCollection_Sequence<double> HYDROData_CalculationCase::GetAltitudesForPoints( 
+  const NCollection_Sequence<gp_XY>& thePoints,
+  const Handle(HYDROData_Zone)&      theZone ) const
+{
+  NCollection_Sequence<double> aResSeq;
+
+  for ( int i = 1, n = thePoints.Length(); i <= n; ++i )
+  {
+    const gp_XY& thePnt = thePoints.Value( i );
+    
+    double anAltitude = GetAltitudeForPoint( thePnt, theZone );
+    aResSeq.Append( anAltitude );
+  }
+
+  return aResSeq;
+}
+
 Handle(HYDROData_Zone) HYDROData_CalculationCase::GetZoneFromPoint( const gp_XY& thePoint ) const
 {
   Handle(HYDROData_Zone) aResZone;
diff --git a/src/HYDROData/HYDROData_CalculationCase.h b/src/HYDROData/HYDROData_CalculationCase.h
index af84f44b..435a98c1 100644
--- a/src/HYDROData/HYDROData_CalculationCase.h
+++ b/src/HYDROData/HYDROData_CalculationCase.h
@@ -223,6 +223,16 @@ public:
   HYDRODATA_EXPORT virtual double GetAltitudeForPoint( const gp_XY&                  thePoint,
                                                        const Handle(HYDROData_Zone)& theZone ) const;
 
+  /**
+   * Returns altitudes for given points on given zone.
+   * \param thePoints the points to examine
+   * \param theZone reference zone to check
+   * \return result altitude value
+   */
+  HYDRODATA_EXPORT virtual NCollection_Sequence<double> GetAltitudesForPoints( 
+    const NCollection_Sequence<gp_XY>& thePoints,
+    const Handle(HYDROData_Zone)&      theZone ) const;
+
   /**
    * Returns zone to which the point is belongs.
    * \param thePoint the point to examine
diff --git a/src/HYDROPy/HYDROData_CalculationCase.sip b/src/HYDROPy/HYDROData_CalculationCase.sip
index f282d5a9..9557333f 100644
--- a/src/HYDROPy/HYDROData_CalculationCase.sip
+++ b/src/HYDROPy/HYDROData_CalculationCase.sip
@@ -309,18 +309,51 @@ public:
   double GetAltitudeForPoint( const double theCoordX,
                               const double theCoordY,
                               HYDROData_Zone theZone ) const
-  [double ( const Handle_HYDROData_Zone&, const gp_XY& )];
+  [double ( const gp_XY&, const Handle_HYDROData_Zone& )];
   %MethodCode
     gp_XY aPnt( a0, a1 );
-    Handle(HYDROData_Zone) aRef =
+    Handle(HYDROData_Zone) aRefZone =
       Handle(HYDROData_Zone)::DownCast( createHandle( a2 ) );
 
     Py_BEGIN_ALLOW_THREADS
-    sipRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetAltitudeForPoint( aPnt, aRef ) : 
-                             sipCpp->GetAltitudeForPoint( aPnt, aRef );
+    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