X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROPy%2FHYDROData_CalculationCase.sip;h=9557333f7d6a1142c7557e9ebdf1a47bdb15ea4c;hb=6450e251d00e2beaa02e0de026b0f1af2b948a0e;hp=f282d5a9569f0c3027ffeb41c171ab510c5901c6;hpb=0c1af0edfc8153b4572e8758825ec21cc20be1a8;p=modules%2Fhydro.git 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 GetAltitudesForPoints( const NCollection_Sequence& theCoordsX, + const NCollection_Sequence& theCoordsY, + HYDROData_Zone theZone ) const + [NCollection_Sequence ( const NCollection_Sequence&, const Handle_HYDROData_Zone& )]; + %MethodCode + + NCollection_Sequence 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 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( aRes ); + %End + /** * Returns zone to which the point is belongs. * \param thePoint the point to examine