From: adv Date: Fri, 24 Jan 2014 08:12:21 +0000 (+0000) Subject: Python lists changed to values. X-Git-Tag: BR_hydro_v_1_0~48 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0c1af0edfc8153b4572e8758825ec21cc20be1a8;p=modules%2Fhydro.git Python lists changed to values. --- diff --git a/src/HYDROPy/HYDROData_CalculationCase.sip b/src/HYDROPy/HYDROData_CalculationCase.sip index c3f78b0c..f282d5a9 100644 --- a/src/HYDROPy/HYDROData_CalculationCase.sip +++ b/src/HYDROPy/HYDROData_CalculationCase.sip @@ -289,50 +289,36 @@ 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 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& )]; %MethodCode - double aRes = 0.0; - - double x = 0.0, y = 0.0; - if ( PyArg_ParseTuple( a0, "dd", &x, &y ) ) - { - gp_XY aPnt( x, y ); - - Handle(HYDROData_Zone) aRef = - Handle(HYDROData_Zone)::DownCast( createHandle( a1 ) ); + gp_XY aPnt( a0, a1 ); + Handle(HYDROData_Zone) aRef = + Handle(HYDROData_Zone)::DownCast( createHandle( a2 ) ); - Py_BEGIN_ALLOW_THREADS - aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetAltitudeForPoint( aPnt, aRef ) : + Py_BEGIN_ALLOW_THREADS + sipRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetAltitudeForPoint( aPnt, aRef ) : sipCpp->GetAltitudeForPoint( aPnt, aRef ); - Py_END_ALLOW_THREADS - } - - sipRes = aRes; + Py_END_ALLOW_THREADS %End /** @@ -340,20 +326,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 +348,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: