Add missing python bindings

nyalldawson · nyalldawson · commit 41fe33551c90 · 2017-01-30T17:40:41.000+10:00
diff --git a/python/core/annotations/qgsannotation.sip b/python/core/annotations/qgsannotation.sip
@@ -70,6 +70,7 @@ class QgsAnnotation : QObject
 
     void appearanceChanged();
     void moved();
+    void mapLayerChanged();
 
   protected:
 
diff --git a/python/gui/gui.sip b/python/gui/gui.sip
@@ -80,6 +80,7 @@
 %Include qgsfilterlineedit.sip
 %Include qgsfloatingwidget.sip
 %Include qgsfocuswatcher.sip
+%Include qgsformannotation.sip
 %Include qgsgenericprojectionselector.sip
 %Include qgsgeometryrubberband.sip
 %Include qgsgradientcolorrampdialog.sip
diff --git a/python/gui/qgsformannotation.sip b/python/gui/qgsformannotation.sip
@@ -0,0 +1,27 @@
+class QgsFormAnnotation : QgsAnnotation
+{
+%TypeHeaderCode
+#include <qgsformannotation.h>
+%End
+  public:
+
+    QgsFormAnnotation( QObject* parent /TransferThis/ = nullptr );
+
+    QSizeF minimumFrameSize() const;
+    QSizeF preferredFrameSize() const;
+
+    void setDesignerForm( const QString& uiFile );
+    QString designerForm() const;
+
+    virtual void writeXml( QDomElement& elem, QDomDocument & doc ) const;
+    virtual void readXml( const QDomElement& itemElem, const QDomDocument& doc );
+
+    void setAssociatedFeature( const QgsFeature& feature );
+
+    static QgsFormAnnotation* create() /Factory/;
+
+  protected:
+
+    void renderAnnotation( QgsRenderContext& context, QSizeF size ) const;
+
+};
diff --git a/src/core/annotations/qgssvgannotation.cpp b/src/core/annotations/qgssvgannotation.cpp
@@ -22,7 +22,7 @@
 
 
 QgsSvgAnnotation::QgsSvgAnnotation( QObject* parent )
-  : QgsAnnotation( parent )
+    : QgsAnnotation( parent )
 {
 
 }
diff --git a/src/core/annotations/qgstextannotation.cpp b/src/core/annotations/qgstextannotation.cpp
@@ -19,7 +19,7 @@
 #include <QDomDocument>
 #include <QPainter>
 
-QgsTextAnnotation::QgsTextAnnotation(QObject* parent)
+QgsTextAnnotation::QgsTextAnnotation( QObject* parent )
     : QgsAnnotation( parent )
     , mDocument( new QTextDocument( QString() ) )
 {

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`
`23`	`23`
`24`	`24`	`QgsSvgAnnotation::QgsSvgAnnotation( QObject* parent )`
`25`		`- : QgsAnnotation( parent )`
	`25`	`+ : QgsAnnotation( parent )`
`26`	`26`	`{`
`27`	`27`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`#include <QDomDocument>`
`20`	`20`	`#include <QPainter>`
`21`	`21`
`22`		`-QgsTextAnnotation::QgsTextAnnotation(QObject* parent)`
	`22`	`+QgsTextAnnotation::QgsTextAnnotation( QObject* parent )`
`23`	`23`	`: QgsAnnotation( parent )`
`24`	`24`	`, mDocument( new QTextDocument( QString() ) )`
`25`	`25`	`{`