Bump julianwachholz/flake8-action from 2.0.0 to 2.0.2

.github/workflows/flake8.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Run flake8
-        uses: julianwachholz/flake8-action@v2.0.0
+        uses: julianwachholz/flake8-action@v2.0.2
         with:
           checkName: 'Python Lint'
         env:

python/core/auto_additions/qgis.py

@@ -656,3 +656,8 @@
 Qgis.AnnotationItemFlag.__doc__ = 'Flags for annotation items.\n\n.. versionadded:: 3.22\n\n' + '* ``ScaleDependentBoundingBox``: ' + Qgis.AnnotationItemFlag.ScaleDependentBoundingBox.__doc__
 # --
 Qgis.AnnotationItemFlag.baseClass = Qgis
+# monkey patching scoped based enum
+Qgis.AnnotationItemNodeType.VertexHandle.__doc__ = "Node is a handle for manipulating vertices"
+Qgis.AnnotationItemNodeType.__doc__ = 'Annotation item node types.\n\n.. versionadded:: 3.22\n\n' + '* ``VertexHandle``: ' + Qgis.AnnotationItemNodeType.VertexHandle.__doc__
+# --
+Qgis.AnnotationItemNodeType.baseClass = Qgis

python/core/auto_generated/annotations/qgsannotationitem.sip.in

@@ -112,6 +112,13 @@ Sets the item's z ``index``, which controls the order in which annotation items
 are rendered in the layer.
 
 .. seealso:: :py:func:`zIndex`
+%End
+
+    virtual QList< QgsAnnotationItemNode > nodes() const;
+%Docstring
+Returns the nodes for the item, used for editing the item.
+
+.. versionadded:: 3.22
 %End
 
   private:

python/core/auto_generated/annotations/qgsannotationitemnode.sip.in

@@ -0,0 +1,75 @@
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/core/annotations/qgsannotationitemnode.h                         *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
+
+
+
+
+class QgsAnnotationItemNode
+{
+%Docstring(signature="appended")
+Contains information about a node used for editing an annotation item.
+
+.. versionadded:: 3.22
+%End
+
+%TypeHeaderCode
+#include "qgsannotationitemnode.h"
+%End
+  public:
+
+    QgsAnnotationItemNode();
+%Docstring
+Default constructor
+%End
+
+    QgsAnnotationItemNode( const QgsPointXY &point, Qgis::AnnotationItemNodeType type );
+%Docstring
+Constructor for QgsAnnotationItemNode, with the specified ``point`` and ``type``.
+%End
+
+    QgsPointXY point() const;
+%Docstring
+Returns the node's position, in geographic coordinates.
+
+The coordinates will match the annotation item's CRS.
+
+.. seealso:: :py:func:`setPoint`
+%End
+
+    void setPoint( QgsPointXY point );
+%Docstring
+Sets the node's position, in geographic coordinates.
+
+The coordinates will match the annotation item's CRS.
+
+.. seealso:: :py:func:`point`
+%End
+
+    Qgis::AnnotationItemNodeType type() const;
+%Docstring
+Returns the node type.
+
+.. seealso:: :py:func:`setType`
+%End
+
+    void setType( Qgis::AnnotationItemNodeType type );
+%Docstring
+Sets the node type.
+
+.. seealso:: :py:func:`type`
+%End
+
+};
+
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/core/annotations/qgsannotationitemnode.h                         *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/

python/core/auto_generated/annotations/qgsannotationlineitem.sip.in

@@ -35,6 +35,8 @@ Constructor for QgsAnnotationLineItem, with the specified ``linestring``.
 
     virtual bool writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const;
 
+    virtual QList< QgsAnnotationItemNode > nodes() const;
+
 
     static QgsAnnotationLineItem *create() /Factory/;
 %Docstring

python/core/auto_generated/annotations/qgsannotationpointtextitem.sip.in

@@ -51,6 +51,8 @@ Creates a new text at point annotation item.
 
     virtual QgsRectangle boundingBox( const QgsRenderContext &context ) const;
 
+    virtual QList< QgsAnnotationItemNode > nodes() const;
+
 
     QgsPointXY point() const;
 %Docstring

python/core/auto_generated/annotations/qgsannotationpolygonitem.sip.in

@@ -35,6 +35,8 @@ Constructor for QgsAnnotationPolygonItem, with the specified ``polygon`` geometr
 
     virtual bool writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const;
 
+    virtual QList< QgsAnnotationItemNode > nodes() const;
+
 
     static QgsAnnotationPolygonItem *create() /Factory/;
 %Docstring

python/core/auto_generated/qgis.sip.in

@@ -474,6 +474,11 @@ The development version
     typedef QFlags<Qgis::AnnotationItemFlag> AnnotationItemFlags;
 
 
+    enum class AnnotationItemNodeType
+    {
+      VertexHandle,
+    };
+
     static const double DEFAULT_SEARCH_RADIUS_MM;
 
     static const float DEFAULT_MAPTOPIXEL_THRESHOLD;

python/core/core_auto.sip

@@ -205,6 +205,7 @@
 %Include auto_generated/./3d/qgsabstract3drenderer.sip
 %Include auto_generated/annotations/qgsannotation.sip
 %Include auto_generated/annotations/qgsannotationitem.sip
+%Include auto_generated/annotations/qgsannotationitemnode.sip
 %Include auto_generated/annotations/qgsannotationitemregistry.sip
 %Include auto_generated/annotations/qgsannotationlayer.sip
 %Include auto_generated/annotations/qgsannotationlineitem.sip

src/core/CMakeLists.txt

@@ -1153,6 +1153,7 @@ set(QGIS_CORE_HDRS
 
   annotations/qgsannotation.h
   annotations/qgsannotationitem.h
+  annotations/qgsannotationitemnode.h
   annotations/qgsannotationitemregistry.h
   annotations/qgsannotationlayer.h
   annotations/qgsannotationlayerrenderer.h

src/core/annotations/qgsannotationitem.cpp

@@ -16,8 +16,14 @@
  ***************************************************************************/
 
 #include "qgsannotationitem.h"
+#include "qgsannotationitemnode.h"
 
 Qgis::AnnotationItemFlags QgsAnnotationItem::flags() const
 {
   return Qgis::AnnotationItemFlags();
 }
+
+QList<QgsAnnotationItemNode> QgsAnnotationItem::nodes() const
+{
+  return {};
+}

src/core/annotations/qgsannotationitem.h

@@ -28,6 +28,7 @@ class QgsFeedback;
 class QgsMarkerSymbol;
 class QgsLineSymbol;
 class QgsFillSymbol;
+class QgsAnnotationItemNode;
 
 /**
  * \ingroup core
@@ -140,6 +141,13 @@ class CORE_EXPORT QgsAnnotationItem
      */
     void setZIndex( int index ) { mZIndex = index; }
 
+    /**
+     * Returns the nodes for the item, used for editing the item.
+     *
+     * \since QGIS 3.22
+     */
+    virtual QList< QgsAnnotationItemNode > nodes() const;
+
   private:
 
     int mZIndex = 0;

src/core/annotations/qgsannotationitemnode.h

@@ -0,0 +1,86 @@
+/***************************************************************************
+    qgsannotationitemnode.h
+    ----------------
+    copyright            : (C) 2021 by Nyall Dawson
+    email                : nyall dot dawson at gmail dot com
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef QGSANNOTATIONITEMEDITNODE_H
+#define QGSANNOTATIONITEMEDITNODE_H
+
+#include "qgis_core.h"
+#include "qgis_sip.h"
+#include "qgspointxy.h"
+#include "qgis.h"
+
+/**
+ * \ingroup core
+ * \brief Contains information about a node used for editing an annotation item.
+ * \since QGIS 3.22
+ */
+class CORE_EXPORT QgsAnnotationItemNode
+{
+  public:
+
+    /**
+     * Default constructor
+     */
+    QgsAnnotationItemNode() = default;
+
+    /**
+     * Constructor for QgsAnnotationItemNode, with the specified \a point and \a type.
+     */
+    QgsAnnotationItemNode( const QgsPointXY &point, Qgis::AnnotationItemNodeType type )
+      : mPoint( point )
+      , mType( type )
+    {}
+
+    /**
+     * Returns the node's position, in geographic coordinates.
+     *
+     * The coordinates will match the annotation item's CRS.
+     *
+     * \see setPoint()
+     */
+    QgsPointXY point() const { return mPoint; }
+
+    /**
+     * Sets the node's position, in geographic coordinates.
+     *
+     * The coordinates will match the annotation item's CRS.
+     *
+     * \see point()
+     */
+    void setPoint( QgsPointXY point ) { mPoint = point; }
+
+    /**
+     * Returns the node type.
+     *
+     * \see setType()
+     */
+    Qgis::AnnotationItemNodeType type() const { return mType; }
+
+    /**
+     * Sets the node type.
+     *
+     * \see type()
+     */
+    void setType( Qgis::AnnotationItemNodeType type ) { mType = type; }
+
+  private:
+
+    QgsPointXY mPoint;
+    Qgis::AnnotationItemNodeType mType = Qgis::AnnotationItemNodeType::VertexHandle;
+
+};
+
+#endif // QGSANNOTATIONITEMEDITNODE_H

src/core/annotations/qgsannotationlineitem.cpp

@@ -19,6 +19,7 @@
 #include "qgssymbol.h"
 #include "qgssymbollayerutils.h"
 #include "qgslinesymbol.h"
+#include "qgsannotationitemnode.h"
 
 QgsAnnotationLineItem::QgsAnnotationLineItem( QgsCurve *curve )
   : QgsAnnotationItem()
@@ -80,6 +81,16 @@ bool QgsAnnotationLineItem::writeXml( QDomElement &element, QDomDocument &docume
   return true;
 }
 
+QList<QgsAnnotationItemNode> QgsAnnotationLineItem::nodes() const
+{
+  QList< QgsAnnotationItemNode > res;
+  for ( auto it = mCurve->vertices_begin(); it != mCurve->vertices_end(); ++it )
+  {
+    res.append( QgsAnnotationItemNode( QgsPointXY( ( *it ).x(), ( *it ).y() ), Qgis::AnnotationItemNodeType::VertexHandle ) );
+  }
+  return res;
+}
+
 QgsAnnotationLineItem *QgsAnnotationLineItem::create()
 {
   return new QgsAnnotationLineItem( new QgsLineString() );

src/core/annotations/qgsannotationlineitem.h

@@ -43,6 +43,7 @@ class CORE_EXPORT QgsAnnotationLineItem : public QgsAnnotationItem
     QString type() const override;
     void render( QgsRenderContext &context, QgsFeedback *feedback ) override;
     bool writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const override;
+    QList< QgsAnnotationItemNode > nodes() const override;
 
     /**
      * Creates a new linestring annotation item.

src/core/annotations/qgsannotationmarkeritem.cpp

@@ -19,6 +19,7 @@
 #include "qgssymbol.h"
 #include "qgssymbollayerutils.h"
 #include "qgsmarkersymbol.h"
+#include "qgsannotationitemnode.h"
 
 QgsAnnotationMarkerItem::QgsAnnotationMarkerItem( const QgsPoint &point )
   : QgsAnnotationItem()
@@ -67,6 +68,11 @@ bool QgsAnnotationMarkerItem::writeXml( QDomElement &element, QDomDocument &docu
   return true;
 }
 
+QList<QgsAnnotationItemNode> QgsAnnotationMarkerItem::nodes() const
+{
+  return { QgsAnnotationItemNode( mPoint, Qgis::AnnotationItemNodeType::VertexHandle )};
+}
+
 QgsAnnotationMarkerItem *QgsAnnotationMarkerItem::create()
 {
   return new QgsAnnotationMarkerItem( QgsPoint() );

src/core/annotations/qgsannotationmarkeritem.h

@@ -42,6 +42,7 @@ class CORE_EXPORT QgsAnnotationMarkerItem : public QgsAnnotationItem
     QString type() const override;
     void render( QgsRenderContext &context, QgsFeedback *feedback ) override;
     bool writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const override;
+    QList< QgsAnnotationItemNode > nodes() const override;
 
     /**
      * Creates a new marker annotation item.

src/core/annotations/qgsannotationpointtextitem.cpp

@@ -17,6 +17,7 @@
 
 #include "qgsannotationpointtextitem.h"
 #include "qgstextrenderer.h"
+#include "qgsannotationitemnode.h"
 
 QgsAnnotationPointTextItem::QgsAnnotationPointTextItem( const QString &text, QgsPointXY point )
   : QgsAnnotationItem()
@@ -128,6 +129,11 @@ QgsRectangle QgsAnnotationPointTextItem::boundingBox( const QgsRenderContext &co
   return QgsRectangle( mPoint.x(), mPoint.y(), mPoint.x() + widthInMapUnits, mPoint.y() + heightInMapUnits );
 }
 
+QList<QgsAnnotationItemNode> QgsAnnotationPointTextItem::nodes() const
+{
+  return { QgsAnnotationItemNode( mPoint, Qgis::AnnotationItemNodeType::VertexHandle )};
+}
+
 QgsTextFormat QgsAnnotationPointTextItem::format() const
 {
   return mTextFormat;

src/core/annotations/qgsannotationpointtextitem.h

@@ -54,6 +54,7 @@ class CORE_EXPORT QgsAnnotationPointTextItem : public QgsAnnotationItem
     QgsAnnotationPointTextItem *clone() override SIP_FACTORY;
     QgsRectangle boundingBox() const override;
     QgsRectangle boundingBox( const QgsRenderContext &context ) const override;
+    QList< QgsAnnotationItemNode > nodes() const override;
 
     /**
      * Returns the point location of the text.