Merge pull request #8068 from m-kuhn/rubberbandProperties

m-kuhn · web-flow · commit cb7b44d4ebae · 2018-10-01T12:35:35.000+02:00
Rubberband properties
diff --git a/python/gui/auto_generated/qgsrubberband.sip.in b/python/gui/auto_generated/qgsrubberband.sip.in
@@ -8,7 +8,9 @@
 
 
 
-class QgsRubberBand: QgsMapCanvasItem
+
+
+class QgsRubberBand : QObject, QgsMapCanvasItem
 {
 %Docstring
 A class for drawing transient features (e.g. digitizing lines) on the map.
@@ -22,6 +24,7 @@ for tracking the mouse while drawing polylines or polygons.
 %End
   public:
 
+
     enum IconType
     {
 
diff --git a/python/gui/gui_auto.sip b/python/gui/gui_auto.sip
@@ -12,7 +12,6 @@
 %Include auto_generated/qgsmaplayerconfigwidgetfactory.sip
 %Include auto_generated/qgsmapmouseevent.sip
 %Include auto_generated/qgsmaptip.sip
-%Include auto_generated/qgsrubberband.sip
 %Include auto_generated/qgssnapindicator.sip
 %Include auto_generated/qgstablewidgetitem.sip
 %Include auto_generated/qgsuserinputwidget.sip
@@ -188,6 +187,7 @@
 %Include auto_generated/qgsrasterlayersaveasdialog.sip
 %Include auto_generated/qgsrasterpyramidsoptionswidget.sip
 %Include auto_generated/qgsrelationeditorwidget.sip
+%Include auto_generated/qgsrubberband.sip
 %Include auto_generated/qgsscalecombobox.sip
 %Include auto_generated/qgsscalerangewidget.sip
 %Include auto_generated/qgsscalevisibilitydialog.sip
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -522,6 +522,7 @@ SET(QGIS_GUI_MOC_HDRS
   qgsrasterlayersaveasdialog.h
   qgsrasterpyramidsoptionswidget.h
   qgsrelationeditorwidget.h
+  qgsrubberband.h
   qgsscalecombobox.h
   qgsscalerangewidget.h
   qgsscalevisibilitydialog.h
@@ -778,7 +779,6 @@ SET(QGIS_GUI_HDRS
   qgsmaplayerconfigwidgetfactory.h
   qgsmapmouseevent.h
   qgsmaptip.h
-  qgsrubberband.h
   qgssnapindicator.h
   qgssqlcomposerdialog.h
   qgstablewidgetitem.h
diff --git a/src/gui/qgsrubberband.cpp b/src/gui/qgsrubberband.cpp
@@ -23,7 +23,8 @@
 #include <QPainter>
 
 QgsRubberBand::QgsRubberBand( QgsMapCanvas *mapCanvas, QgsWkbTypes::GeometryType geometryType )
-  : QgsMapCanvasItem( mapCanvas )
+  : QObject( nullptr )
+  , QgsMapCanvasItem( mapCanvas )
   , mGeometryType( geometryType )
 {
   reset( geometryType );
@@ -37,7 +38,8 @@ QgsRubberBand::QgsRubberBand( QgsMapCanvas *mapCanvas, QgsWkbTypes::GeometryType
 }
 
 QgsRubberBand::QgsRubberBand()
-  : QgsMapCanvasItem( nullptr )
+  : QObject( nullptr )
+  , QgsMapCanvasItem( nullptr )
 {
 }
 
diff --git a/src/gui/qgsrubberband.h b/src/gui/qgsrubberband.h
@@ -18,10 +18,13 @@
 #include "qgsmapcanvasitem.h"
 #include "qgis.h"
 #include "qgsgeometry.h"
+
 #include <QBrush>
 #include <QList>
 #include <QPen>
 #include <QPolygon>
+#include <QObject>
+
 #include "qgis_gui.h"
 
 class QgsVectorLayer;
@@ -34,10 +37,17 @@ class QPaintEvent;
  * The QgsRubberBand class provides a transparent overlay widget
  * for tracking the mouse while drawing polylines or polygons.
  */
-class GUI_EXPORT QgsRubberBand: public QgsMapCanvasItem
+class GUI_EXPORT QgsRubberBand : public QObject, public QgsMapCanvasItem
 {
+    Q_OBJECT
   public:
 
+    Q_PROPERTY( QColor fillColor READ fillColor WRITE setFillColor )
+    Q_PROPERTY( QColor strokeColor READ strokeColor WRITE setStrokeColor )
+    Q_PROPERTY( int iconSize READ iconSize WRITE setIconSize )
+    Q_PROPERTY( QColor secondaryStrokeColor READ secondaryStrokeColor WRITE setSecondaryStrokeColor )
+    Q_PROPERTY( int width READ width WRITE setWidth )
+
     //! Icons
     enum IconType
     {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,9 @@`
`8`	`8`
`9`	`9`
`10`	`10`
`11`		`-class QgsRubberBand: QgsMapCanvasItem`
	`11`	`+`
	`12`	`+`
	`13`	`+class QgsRubberBand : QObject, QgsMapCanvasItem`
`12`	`14`	`{`
`13`	`15`	`%Docstring`
`14`	`16`	`A class for drawing transient features (e.g. digitizing lines) on the map.`
`@@ -22,6 +24,7 @@ for tracking the mouse while drawing polylines or polygons.`
`22`	`24`	`%End`
`23`	`25`	`public:`
`24`	`26`
	`27`	`+`
`25`	`28`	`enum IconType`
`26`	`29`	`{`
`27`	`30`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@`
`23`	`23`	`#include <QPainter>`
`24`	`24`
`25`	`25`	`QgsRubberBand::QgsRubberBand( QgsMapCanvas *mapCanvas, QgsWkbTypes::GeometryType geometryType )`
`26`		`- : QgsMapCanvasItem( mapCanvas )`
	`26`	`+ : QObject( nullptr )`
	`27`	`+ , QgsMapCanvasItem( mapCanvas )`
`27`	`28`	`, mGeometryType( geometryType )`
`28`	`29`	`{`
`29`	`30`	`reset( geometryType );`
`@@ -37,7 +38,8 @@ QgsRubberBand::QgsRubberBand( QgsMapCanvas *mapCanvas, QgsWkbTypes::GeometryType`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`QgsRubberBand::QgsRubberBand()`
`40`		`- : QgsMapCanvasItem( nullptr )`
	`41`	`+ : QObject( nullptr )`
	`42`	`+ , QgsMapCanvasItem( nullptr )`
`41`	`43`	`{`
`42`	`44`	`}`
`43`	`45`