From f9c48bf0cec2dd1a346f6724675ee6977493fe8d Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 30 May 2017 15:31:45 +1000 Subject: [PATCH] Allow transform effect rotation from -360 to 360 --- python/core/effects/qgstransformeffect.sip | 10 ++++------ src/core/effects/qgstransformeffect.h | 12 ++++++------ src/gui/effects/qgspainteffectwidget.cpp | 1 + src/ui/effects/widget_transform.ui | 3 +++ 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/python/core/effects/qgstransformeffect.sip b/python/core/effects/qgstransformeffect.sip index dcd30259512..136afd35b9d 100644 --- a/python/core/effects/qgstransformeffect.sip +++ b/python/core/effects/qgstransformeffect.sip @@ -157,16 +157,14 @@ class QgsTransformEffect : QgsPaintEffect void setRotation( const double rotation ); %Docstring - Sets the transform rotation. - \param rotation degrees to rotate, clockwise -.. seealso:: rotation + Sets the transform ``rotation``, in degrees clockwise. +.. seealso:: rotation() %End double rotation() const; %Docstring - Returns the transform rotation. - :return: rotation in degrees clockwise -.. seealso:: setRotation + Returns the transform rotation, in degrees clockwise. +.. seealso:: setRotation() :rtype: float %End diff --git a/src/core/effects/qgstransformeffect.h b/src/core/effects/qgstransformeffect.h index 4179fc5aa42..2d50811fffb 100644 --- a/src/core/effects/qgstransformeffect.h +++ b/src/core/effects/qgstransformeffect.h @@ -149,15 +149,15 @@ class CORE_EXPORT QgsTransformEffect : public QgsPaintEffect */ double scaleY() const { return mScaleY; } - /** Sets the transform rotation. - * \param rotation degrees to rotate, clockwise - * \see rotation + /** + * Sets the transform \a rotation, in degrees clockwise. + * \see rotation() */ void setRotation( const double rotation ) { mRotation = rotation; } - /** Returns the transform rotation. - * \returns rotation in degrees clockwise - * \see setRotation + /** + * Returns the transform rotation, in degrees clockwise. + * \see setRotation() */ double rotation() const { return mRotation; } diff --git a/src/gui/effects/qgspainteffectwidget.cpp b/src/gui/effects/qgspainteffectwidget.cpp index a15c7232372..74039f9267e 100644 --- a/src/gui/effects/qgspainteffectwidget.cpp +++ b/src/gui/effects/qgspainteffectwidget.cpp @@ -577,6 +577,7 @@ QgsTransformWidget::QgsTransformWidget( QWidget *parent ) << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches ); mSpinTranslateX->setClearValue( 0 ); mSpinTranslateY->setClearValue( 0 ); + mRotationSpinBox->setClearValue( 0 ); mSpinShearX->setClearValue( 0 ); mSpinShearY->setClearValue( 0 ); mSpinScaleX->setClearValue( 100.0 ); diff --git a/src/ui/effects/widget_transform.ui b/src/ui/effects/widget_transform.ui index ed2b0a50ae1..268f9c56d95 100644 --- a/src/ui/effects/widget_transform.ui +++ b/src/ui/effects/widget_transform.ui @@ -117,6 +117,9 @@ ° + + -360.000000000000000 + 360.000000000000000