Make QgsRubberBand fillColor a Q_PROPERTY

m-kuhn · m-kuhn · commit 328760437cf5 · 2018-09-30T09:46:24.000+02:00
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/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
@@ -49,6 +49,9 @@ void QgsRubberBand::setColor( const QColor &color )
 
 void QgsRubberBand::setFillColor( const QColor &color )
 {
+  if ( mBrush.color() == color )
+    return;
+
   mBrush.setColor( color );
 }
 
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,13 @@ 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 )
+
     //! 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
`@@ -49,6 +49,9 @@ void QgsRubberBand::setColor( const QColor &color )`
`49`	`49`
`50`	`50`	`void QgsRubberBand::setFillColor( const QColor &color )`
`51`	`51`	`{`
	`52`	`+ if ( mBrush.color() == color )`
	`53`	`+ return;`
	`54`	`+`
`52`	`55`	`mBrush.setColor( color );`
`53`	`56`	`}`
`54`	`57`