From: adv Date: Fri, 25 Oct 2013 04:29:33 +0000 (+0000) Subject: Functions declaration corrected. X-Git-Tag: BR_hydro_v_0_3~86 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7d5b68c02696c7d07ea7e87b67728fae4cf692e0;p=modules%2Fhydro.git Functions declaration corrected. --- diff --git a/src/HYDROPy/HYDROData_Calculation.sip b/src/HYDROPy/HYDROData_Calculation.sip index 2ca69234..f03984b4 100644 --- a/src/HYDROPy/HYDROData_Calculation.sip +++ b/src/HYDROPy/HYDROData_Calculation.sip @@ -225,7 +225,7 @@ public: Handle(HYDROData_Region) aRefRegion; Py_BEGIN_ALLOW_THREADS - aRefRegion = sipSelfWasArg ? sipCpp->HYDROData_Region::GetRegion( a0 ) : + aRefRegion = sipSelfWasArg ? sipCpp->HYDROData_Calculation::GetRegion( a0 ) : sipCpp->GetRegion( a0 ); Py_END_ALLOW_THREADS @@ -241,7 +241,7 @@ public: /** * Removes reference region from calculation case. */ - void RemoveRegion( HYDROData_Region theRegion ) const [void (const Handle_HYDROData_Region&)]; + void RemoveRegion( HYDROData_Region theRegion ) [void (const Handle_HYDROData_Region&)]; %MethodCode Handle(HYDROData_Region) aRegion = diff --git a/src/HYDROPy/HYDROData_Image.sip b/src/HYDROPy/HYDROData_Image.sip index 860fcc75..ca4ded28 100644 --- a/src/HYDROPy/HYDROData_Image.sip +++ b/src/HYDROPy/HYDROData_Image.sip @@ -76,35 +76,63 @@ public: /** * Stores the image transformation points (3 input + 3 output) - * \param thePointAIn input point A - * \param thePointBIn input point B - * \param thePointCIn input point C - * \param thePointAOut output point A - * \param thePointBOut output point B - * \param thePointCOut output point C + * \param thePointA input point A + * \param thePointB input point B + * \param thePointC input point C + * \param theLambertPointA output point A in Lambert93 coordinates + * \param theLambertPointB output point B in Lambert93 coordinates + * \param theLambertPointC output point C in Lambert93 coordinates + * \param theCartesianPointA output point A in Cartesian coordinates + * \param theCartesianPointB output point B in Cartesian coordinates + * \param theCartesianPointC output point C in Cartesian coordinates */ - void SetTrsfPoints( const QPoint& thePointAIn, - const QPoint& thePointBIn, - const QPoint& thePointCIn, - const QPointF& thePointAOut, - const QPointF& thePointBOut, - const QPointF& thePointCOut ); + void SetTrsfPoints( const QPoint& thePointA, + const QPoint& thePointB, + const QPoint& thePointC, + const QPointF& theLambertPointA, + const QPointF& theLambertPointB, + const QPointF& theLambertPointC, + const QPointF& theCartesianPointA, + const QPointF& theCartesianPointB, + const QPointF& theCartesianPointC ); /** * Returns the image transformation points (3 input + 3 output) - * \param thePointAIn input point A - * \param thePointBIn input point B - * \param thePointCIn input point C - * \param thePointAOut output point A - * \param thePointBOut output point B - * \param thePointCOut output point C - */ - void TrsfPoints( QPoint& thePointAIn, - QPoint& thePointBIn, - QPoint& thePointCIn, - QPointF& thePointAOut, - QPointF& thePointBOut, - QPointF& thePointCOut ); + * \param thePointA input point A + * \param thePointB input point B + * \param thePointC input point C + * \param theLambertPointA output point A in Lambert93 coordinates + * \param theLambertPointB output point B in Lambert93 coordinates + * \param theLambertPointC output point C in Lambert93 coordinates + * \param theCartesianPointA output point A in Cartesian coordinates + * \param theCartesianPointB output point B in Cartesian coordinates + * \param theCartesianPointC output point C in Cartesian coordinates + */ + void TrsfPoints( QPoint& thePointA, + QPoint& thePointB, + QPoint& thePointC, + QPointF& theLambertPointA, + QPointF& theLambertPointB, + QPointF& theLambertPointC, + QPointF& theCartesianPointA, + QPointF& theCartesianPointB, + QPointF& theCartesianPointC ) const; + + /** + * Returns true if the image has stored transformation points + */ + bool HasTrsfPoints() const; + + /** + * Stores the transformation mode (0 - Lambert93, 1 - Cartesian) + */ + void SetTrsfMode(const int theMode); + + /** + * Returns the transformation mode (0 - Lambert93, 1 - Cartesian) + */ + int TrsfMode() const; + /** * Returns the number of referenced images diff --git a/src/HYDROPy/HYDROData_Region.sip b/src/HYDROPy/HYDROData_Region.sip index 8c2017cb..44be2e0b 100644 --- a/src/HYDROPy/HYDROData_Region.sip +++ b/src/HYDROPy/HYDROData_Region.sip @@ -161,7 +161,7 @@ public: /** * Removes reference zone from region. */ - void RemoveZone( HYDROData_Zone theZone ) const [void (const Handle_HYDROData_Zone&)]; + void RemoveZone( HYDROData_Zone theZone ) [void (const Handle_HYDROData_Zone&)]; %MethodCode Handle(HYDROData_Zone) aZone =