Code shuffle

qgis · Aug 5, 2020 · 8300856 · 8300856
1 parent ef58029
commit 8300856
Show file tree

Hide file tree

Showing 15 changed files with 850 additions and 490 deletions.
diff --git a/python/core/auto_generated/annotations/qgsannotationitem.sip.in b/python/core/auto_generated/annotations/qgsannotationitem.sip.in
@@ -20,6 +20,24 @@ Abstract base class for annotation items which are drawn with QgsAnnotationLayer
 
 %TypeHeaderCode
 #include "qgsannotationitem.h"
+%End
+%ConvertToSubClassCode
+    if ( sipCpp->type() == "marker" )
+    {
+      sipType = sipType_QgsAnnotationMarkerItem;
+    }
+    else if ( sipCpp->type() == "linestring" )
+    {
+      sipType = sipType_QgsAnnotationLineStringItem;
+    }
+    else if ( sipCpp->type() == "polygon" )
+    {
+      sipType = sipType_QgsAnnotationPolygonItem;
+    }
+    else
+    {
+      sipType = 0;
+    }
 %End
   public:
 
@@ -84,100 +102,6 @@ are rendered in the layer.
     QgsAnnotationItem( const QgsAnnotationItem &other );
 };
 
-class QgsMarkerItem : QgsAnnotationItem
-{
-
-%TypeHeaderCode
-#include "qgsannotationitem.h"
-%End
-  public:
-
-    QgsMarkerItem( QgsPointXY point, const QgsCoordinateReferenceSystem &crs );
-    ~QgsMarkerItem();
-
-    virtual QString type() const;
-
-    virtual void render( QgsRenderContext &context, QgsFeedback *feedback );
-
-    virtual bool writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const;
-
-    static QgsMarkerItem *create() /Factory/;
-    virtual bool readXml( const QDomElement &element, const QgsReadWriteContext &context );
-
-
-    virtual QgsMarkerItem *clone() /Factory/;
-
-
-    const QgsMarkerSymbol *symbol() const;
-    void setSymbol( QgsMarkerSymbol *symbol /Transfer/ );
-
-  private:
-    QgsMarkerItem( const QgsMarkerItem &other );
-};
-
-
-class QgsLineStringItem : QgsAnnotationItem
-{
-
-%TypeHeaderCode
-#include "qgsannotationitem.h"
-%End
-  public:
-
-    QgsLineStringItem( const QgsLineString &linestring, const QgsCoordinateReferenceSystem &crs );
-    ~QgsLineStringItem();
-
-    virtual QString type() const;
-
-    virtual void render( QgsRenderContext &context, QgsFeedback *feedback );
-
-    virtual bool writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const;
-
-    static QgsLineStringItem *create() /Factory/;
-    virtual bool readXml( const QDomElement &element, const QgsReadWriteContext &context );
-
-
-    virtual QgsLineStringItem *clone() /Factory/;
-
-
-    const QgsLineSymbol *symbol() const;
-    void setSymbol( QgsLineSymbol *symbol /Transfer/ );
-
-  private:
-    QgsLineStringItem( const QgsLineStringItem &other );
-};
-
-
-class QgsPolygonItem : QgsAnnotationItem
-{
-
-%TypeHeaderCode
-#include "qgsannotationitem.h"
-%End
-  public:
-
-    QgsPolygonItem( const QgsPolygon &polygon, const QgsCoordinateReferenceSystem &crs );
-    ~QgsPolygonItem();
-
-    virtual QString type() const;
-
-    virtual void render( QgsRenderContext &context, QgsFeedback *feedback );
-
-    virtual bool writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const;
-
-    static QgsPolygonItem *create() /Factory/;
-    virtual bool readXml( const QDomElement &element, const QgsReadWriteContext &context );
-
-
-    virtual QgsPolygonItem *clone() /Factory/;
-
-
-    const QgsFillSymbol *symbol() const;
-    void setSymbol( QgsFillSymbol *symbol /Transfer/ );
-
-  private:
-    QgsPolygonItem( const QgsPolygonItem &other );
-};
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/auto_generated/annotations/qgsannotationlinestringitem.sip.in b/python/core/auto_generated/annotations/qgsannotationlinestringitem.sip.in
@@ -0,0 +1,71 @@
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/core/annotations/qgsannotationlinestringitem.h                   *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
+
+
+
+
+
+class QgsAnnotationLineStringItem : QgsAnnotationItem
+{
+%Docstring
+An annotation item which renders a line symbol along a linestring geometry.
+
+.. versionadded:: 3.16
+%End
+
+%TypeHeaderCode
+#include "qgsannotationlinestringitem.h"
+%End
+  public:
+
+    QgsAnnotationLineStringItem( const QgsLineString &linestring, const QgsCoordinateReferenceSystem &crs );
+%Docstring
+Constructor for QgsAnnotationLineStringItem, with the specified ``linestring`` in the given ``crs``.
+%End
+    ~QgsAnnotationLineStringItem();
+
+    virtual QString type() const;
+
+    virtual void render( QgsRenderContext &context, QgsFeedback *feedback );
+
+    virtual bool writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const;
+
+    static QgsAnnotationLineStringItem *create() /Factory/;
+    virtual bool readXml( const QDomElement &element, const QgsReadWriteContext &context );
+
+
+    virtual QgsAnnotationLineStringItem *clone() /Factory/;
+
+
+    const QgsLineSymbol *symbol() const;
+%Docstring
+Returns the symbol used to render the item.
+
+.. seealso:: :py:func:`setSymbol`
+%End
+
+    void setSymbol( QgsLineSymbol *symbol /Transfer/ );
+%Docstring
+Sets the ``symbol`` used to render the marker item.
+
+The item takes ownership of the symbol.
+
+.. seealso:: :py:func:`symbol`
+%End
+
+  private:
+    QgsAnnotationLineStringItem( const QgsAnnotationLineStringItem &other );
+};
+
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/core/annotations/qgsannotationlinestringitem.h                   *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
diff --git a/python/core/auto_generated/annotations/qgsannotationmarkeritem.sip.in b/python/core/auto_generated/annotations/qgsannotationmarkeritem.sip.in
@@ -0,0 +1,70 @@
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/core/annotations/qgsannotationmarkeritem.h                       *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
+
+
+
+
+
+class QgsAnnotationMarkerItem : QgsAnnotationItem
+{
+%Docstring
+An annotation item which renders a marker symbol at a point location.
+
+.. versionadded:: 3.16
+%End
+
+%TypeHeaderCode
+#include "qgsannotationmarkeritem.h"
+%End
+  public:
+
+    QgsAnnotationMarkerItem( QgsPointXY point, const QgsCoordinateReferenceSystem &crs );
+%Docstring
+Constructor for QgsAnnotationMarkerItem, at the specified ``point`` in the given ``crs``.
+%End
+    ~QgsAnnotationMarkerItem();
+
+    virtual QString type() const;
+
+    virtual void render( QgsRenderContext &context, QgsFeedback *feedback );
+
+    virtual bool writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const;
+
+    static QgsAnnotationMarkerItem *create() /Factory/;
+    virtual bool readXml( const QDomElement &element, const QgsReadWriteContext &context );
+
+    virtual QgsAnnotationMarkerItem *clone() /Factory/;
+
+
+    const QgsMarkerSymbol *symbol() const;
+%Docstring
+Returns the symbol used to render the marker item.
+
+.. seealso:: :py:func:`setSymbol`
+%End
+
+    void setSymbol( QgsMarkerSymbol *symbol /Transfer/ );
+%Docstring
+Sets the ``symbol`` used to render the marker item.
+
+The item takes ownership of the symbol.
+
+.. seealso:: :py:func:`symbol`
+%End
+
+  private:
+    QgsAnnotationMarkerItem( const QgsAnnotationMarkerItem &other );
+};
+
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/core/annotations/qgsannotationmarkeritem.h                       *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
diff --git a/python/core/auto_generated/annotations/qgsannotationpolygonitem.sip.in b/python/core/auto_generated/annotations/qgsannotationpolygonitem.sip.in
@@ -0,0 +1,69 @@
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/core/annotations/qgsannotationpolygonitem.h                      *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
+
+
+
+
+
+class QgsAnnotationPolygonItem : QgsAnnotationItem
+{
+%Docstring
+An annotation item which renders a fill symbol for a polygon geometry.
+
+.. versionadded:: 3.16
+%End
+
+%TypeHeaderCode
+#include "qgsannotationpolygonitem.h"
+%End
+  public:
+
+    QgsAnnotationPolygonItem( const QgsPolygon &polygon, const QgsCoordinateReferenceSystem &crs );
+%Docstring
+Constructor for QgsAnnotationPolygonItem, with the specified ``polygon`` in the given ``crs``.
+%End
+    ~QgsAnnotationPolygonItem();
+
+    virtual QString type() const;
+
+    virtual void render( QgsRenderContext &context, QgsFeedback *feedback );
+
+    virtual bool writeXml( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const;
+
+    static QgsAnnotationPolygonItem *create() /Factory/;
+    virtual bool readXml( const QDomElement &element, const QgsReadWriteContext &context );
+
+    virtual QgsAnnotationPolygonItem *clone() /Factory/;
+
+
+    const QgsFillSymbol *symbol() const;
+%Docstring
+Returns the symbol used to render the item.
+
+.. seealso:: :py:func:`setSymbol`
+%End
+
+    void setSymbol( QgsFillSymbol *symbol /Transfer/ );
+%Docstring
+Sets the ``symbol`` used to render the marker item.
+
+The item takes ownership of the symbol.
+
+.. seealso:: :py:func:`symbol`
+%End
+
+  private:
+    QgsAnnotationPolygonItem( const QgsAnnotationPolygonItem &other );
+};
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/core/annotations/qgsannotationpolygonitem.h                      *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
diff --git a/python/core/core_auto.sip b/python/core/core_auto.sip
@@ -258,7 +258,10 @@
 %Include auto_generated/annotations/qgsannotationitem.sip
 %Include auto_generated/annotations/qgsannotationitemregistry.sip
 %Include auto_generated/annotations/qgsannotationlayer.sip
+%Include auto_generated/annotations/qgsannotationlinestringitem.sip
+%Include auto_generated/annotations/qgsannotationmarkeritem.sip
 %Include auto_generated/annotations/qgsannotationmanager.sip
+%Include auto_generated/annotations/qgsannotationpolygonitem.sip
 %Include auto_generated/annotations/qgshtmlannotation.sip
 %Include auto_generated/annotations/qgssvgannotation.sip
 %Include auto_generated/annotations/qgstextannotation.sip

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -129,7 +129,10 @@ SET(QGIS_CORE_SRCS
   annotations/qgsannotationitemregistry.cpp
   annotations/qgsannotationlayer.cpp
   annotations/qgsannotationlayerrenderer.cpp
+  annotations/qgsannotationlinestringitem.cpp
+  annotations/qgsannotationmarkeritem.cpp
   annotations/qgsannotationmanager.cpp
+  annotations/qgsannotationpolygonitem.cpp
   annotations/qgshtmlannotation.cpp
   annotations/qgssvgannotation.cpp
   annotations/qgstextannotation.cpp
@@ -1053,7 +1056,10 @@ SET(QGIS_CORE_HDRS
   annotations/qgsannotationitemregistry.h
   annotations/qgsannotationlayer.h
   annotations/qgsannotationlayerrenderer.h
+  annotations/qgsannotationlinestringitem.h
+  annotations/qgsannotationmarkeritem.h
   annotations/qgsannotationmanager.h
+  annotations/qgsannotationpolygonitem.h
   annotations/qgsannotationregistry.h
   annotations/qgshtmlannotation.h
   annotations/qgssvgannotation.h