Merge pull request #1663 from timlinux/papercuts

timlinux · timlinux · commit c21edd066518 · 2014-10-27T17:20:09.000+02:00
Add missing sip bindings for fill and border colours of rubber band.
diff --git a/python/gui/qgsrubberband.sip b/python/gui/qgsrubberband.sip
@@ -57,6 +57,20 @@ class QgsRubberBand: QgsMapCanvasItem
      */
     void setColor( const QColor & color );
 
+    /**
+     * Set the fill color for the rubberband
+     *  @param color  The color used to render this rubberband
+     *  @note Added in 2.6
+     */
+    void setFillColor( const QColor & color );
+
+    /**
+     * Set the border color for the rubberband
+     *  @param color  The color used to render this rubberband
+     *  @note Added in 2.6
+     */
+    void setBorderColor( const QColor & color );
+
     /**
      * Set the width of the line. Outline width for polygon.
      *  @param width The width for any lines painted for this rubberband
diff --git a/src/gui/qgsrubberband.h b/src/gui/qgsrubberband.h
@@ -86,14 +86,16 @@ class GUI_EXPORT QgsRubberBand: public QgsMapCanvasItem
     void setColor( const QColor & color );
 
     /**
-     * Set the file color for the rubberband
+     * Set the fill color for the rubberband
      *  @param color  The color used to render this rubberband
+     *  @note Added in 2.6
      */
     void setFillColor( const QColor & color );
 
     /**
      * Set the border color for the rubberband
      *  @param color  The color used to render this rubberband
+     *  @note Added in 2.6
      */
     void setBorderColor( const QColor & color );
 
