X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROPy%2FHYDROData_CalculationCase.sip;h=48a257f9c9a568a55d9a52c999fb98d4a72d4d75;hb=19a3b00b657cd97859502f8bf693f0d1caf800d7;hp=c3f78b0c3116ec95afbb0551a86aa07aaaf0e0c0;hpb=edbef848d8f2ddf7508dcfbc45024a2bf7a4e0a9;p=modules%2Fhydro.git diff --git a/src/HYDROPy/HYDROData_CalculationCase.sip b/src/HYDROPy/HYDROData_CalculationCase.sip index c3f78b0c..48a257f9 100644 --- a/src/HYDROPy/HYDROData_CalculationCase.sip +++ b/src/HYDROPy/HYDROData_CalculationCase.sip @@ -289,50 +289,144 @@ public: * \param thePoint the point to examine * \return result altitude value */ - double GetAltitudeForPoint( SIP_PYTUPLE thePoint ) const [double ( const gp_XY& )]; + double GetAltitudeForPoint( const double theCoordX, + const double theCoordY ) const [double ( const gp_XY& )]; %MethodCode - double aRes = 0.0; - - 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::GetAltitudeForPoint( aPnt ) : + Py_BEGIN_ALLOW_THREADS + sipRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetAltitudeForPoint( aPnt ) : sipCpp->GetAltitudeForPoint( aPnt ); - Py_END_ALLOW_THREADS - } - - sipRes = aRes; + Py_END_ALLOW_THREADS %End /** - * Returns altitude for given point. + * 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 + * \param theZone reference zone to check * \return result altitude value */ - double GetAltitudeForPoint( SIP_PYTUPLE thePoint, + 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 - double aRes = 0.0; - - double x = 0.0, y = 0.0; - if ( PyArg_ParseTuple( a0, "dd", &x, &y ) ) + 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 region. + * \param thePoints the points to examine + * \param theZone reference region to check + * \return result altitude value + */ + NCollection_Sequence GetAltitudesForPoints( const NCollection_Sequence& theCoordsX, + const NCollection_Sequence& theCoordsY, + HYDROData_Region theRegion ) const + [NCollection_Sequence ( const NCollection_Sequence&, const Handle_HYDROData_Region& )]; + %MethodCode + + NCollection_Sequence aPnts; + + int aLen = qMin( a0->Length(), a1->Length() ); + for ( int i = 1; i <= aLen; ++i ) { - gp_XY aPnt( x, y ); - - Handle(HYDROData_Zone) aRef = - Handle(HYDROData_Zone)::DownCast( createHandle( a1 ) ); + gp_XY aPnt( a0->Value( i ), a1->Value( i ) ); + aPnts.Append( aPnt ); + } - Py_BEGIN_ALLOW_THREADS - aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetAltitudeForPoint( aPnt, aRef ) : - sipCpp->GetAltitudeForPoint( aPnt, aRef ); - Py_END_ALLOW_THREADS + Handle(HYDROData_Region) aRefRegion = + Handle(HYDROData_Region)::DownCast( createHandle( a2 ) ); + + NCollection_Sequence 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( aRes ); + %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 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; - sipRes = 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 /** @@ -340,20 +434,18 @@ public: * \param thePoint the point to examine * \return result zone */ - HYDROData_Zone GetZoneFromPoint( SIP_PYTUPLE 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; - 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 @@ -364,27 +456,20 @@ public: * \param theZone the zone to examine * \return result classification */ - PointClassification GetPointClassification( SIP_PYTUPLE thePoint, + PointClassification GetPointClassification( const double theCoordX, + const double theCoordY, HYDROData_Zone theZone ) const [PointClassification ( const gp_XY&, const Handle_HYDROData_Zone& )]; %MethodCode - HYDROData_CalculationCase::PointClassification aRes = HYDROData_CalculationCase::POINT_OUT; - - double x = 0.0, y = 0.0; - if ( PyArg_ParseTuple( a0, "dd", &x, &y ) ) - { - gp_XY aPnt( x, y ); + gp_XY aPnt( a0, a1 ); - Handle(HYDROData_Zone) aRef = - Handle(HYDROData_Zone)::DownCast( createHandle( a1 ) ); + Handle(HYDROData_Zone) aRef = + Handle(HYDROData_Zone)::DownCast( createHandle( a2 ) ); - Py_BEGIN_ALLOW_THREADS - aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetPointClassification( aPnt, aRef ) : + Py_BEGIN_ALLOW_THREADS + sipRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetPointClassification( aPnt, aRef ) : sipCpp->GetPointClassification( aPnt, aRef ); - Py_END_ALLOW_THREADS - } - - sipRes = aRes; + Py_END_ALLOW_THREADS %End protected: