[QGIS Commit] r11277 - trunk/qgis/python/core

[svn_qgis at osgeo.org]

Author: homann
Date: 2009-08-05 12:43:33 -0400 (Wed, 05 Aug 2009)
New Revision: 11277

Modified:
   trunk/qgis/python/core/qgscontinuouscolorrenderer.sip
   trunk/qgis/python/core/qgsgraduatedsymbolrenderer.sip
   trunk/qgis/python/core/qgsmarkercatalogue.sip
   trunk/qgis/python/core/qgsrenderer.sip
   trunk/qgis/python/core/qgssinglesymbolrenderer.sip
   trunk/qgis/python/core/qgssymbol.sip
   trunk/qgis/python/core/qgsuniquevaluerenderer.sip
Log:
Updated SIP-files after r11275 and r11276. Fix for #1220.

Modified: trunk/qgis/python/core/qgscontinuouscolorrenderer.sip
===================================================================
--- trunk/qgis/python/core/qgscontinuouscolorrenderer.sip	2009-08-05 16:12:24 UTC (rev 11276)
+++ trunk/qgis/python/core/qgscontinuouscolorrenderer.sip	2009-08-05 16:43:33 UTC (rev 11277)
@@ -12,7 +12,7 @@
     virtual ~QgsContinuousColorRenderer();
     /**Renders the feature using the minimum and maximum value of the classification field
       * added in 1.2 */
-    void renderFeature(QgsRenderContext &renderContext, QgsFeature& f, QImage* img, bool selected);
+    void renderFeature(QgsRenderContext &renderContext, QgsFeature& f, QImage* img, bool selected, double opacity = 1.0 );
     /**Returns the number of the classification field*/
     int classificationField() const;
     /**Sets the id of the classification field*/

Modified: trunk/qgis/python/core/qgsgraduatedsymbolrenderer.sip
===================================================================
--- trunk/qgis/python/core/qgsgraduatedsymbolrenderer.sip	2009-08-05 16:12:24 UTC (rev 11276)
+++ trunk/qgis/python/core/qgsgraduatedsymbolrenderer.sip	2009-08-05 16:43:33 UTC (rev 11277)
@@ -52,7 +52,7 @@
      \param p a painter (usually the one from the current map canvas)
      \param f a pointer to a feature to render
      \param t the transform object containing the information how to transform the map coordinates to screen coordinates*/
-    void renderFeature(QgsRenderContext &renderContext, QgsFeature& f, QImage* img, bool selected);	
+    void renderFeature(QgsRenderContext &renderContext, QgsFeature& f, QImage* img, bool selected, double opacity = 1.0 );	
     
     /**Sets the number of the classicifation field
     \param field the number of the field to classify*/

Modified: trunk/qgis/python/core/qgsmarkercatalogue.sip
===================================================================
--- trunk/qgis/python/core/qgsmarkercatalogue.sip	2009-08-05 16:12:24 UTC (rev 11276)
+++ trunk/qgis/python/core/qgsmarkercatalogue.sip	2009-08-05 16:43:33 UTC (rev 11277)
@@ -19,12 +19,12 @@
     /** Returns pixmap of the marker
      * \param fullName full name, e.g. hard:circle, svg:/home/usr1/marker1.svg
      */
-    QImage imageMarker (QString fullName, int size, QPen pen, QBrush brush, bool qtBug = true );
+    QImage imageMarker (QString fullName, int size, QPen pen, QBrush brush, double opacity );
 
     /** Returns qpicture of the marker
      * \param fullName full name, e.g. hard:circle, svg:/home/usr1/marker1.svg
      */
-    QPicture pictureMarker (QString fullName, int size, QPen pen, QBrush brush, bool qtBug = true );
+    QPicture pictureMarker (QString fullName, int size, QPen pen, QBrush brush, double opacity );
     
     /** Returns a pixmap given a file name of a svg marker
      *  NOTE: this method needs to be public static for QgsMarkerDialog::visualizeMarkers */

Modified: trunk/qgis/python/core/qgsrenderer.sip
===================================================================
--- trunk/qgis/python/core/qgsrenderer.sip	2009-08-05 16:12:24 UTC (rev 11276)
+++ trunk/qgis/python/core/qgsrenderer.sip	2009-08-05 16:43:33 UTC (rev 11277)
@@ -29,8 +29,10 @@
       @param selected the feature is to be shown selected
       
       added in 1.2 */
-    virtual void renderFeature(QgsRenderContext &renderContext, QgsFeature& f,QImage* pic, bool selected)=0;
+    void renderFeature( QgsRenderContext &renderContext, QgsFeature& f, QImage* pic, bool selected );
 
+    virtual void renderFeature( QgsRenderContext &renderContext, QgsFeature& f, QImage* pic, bool selected, double opacity ) = 0;
+
     /**Reads the renderer configuration from an XML file
      @param rnode the Dom node to read 
      @param vl the vector layer which will be associated with the renderer*/

Modified: trunk/qgis/python/core/qgssinglesymbolrenderer.sip
===================================================================
--- trunk/qgis/python/core/qgssinglesymbolrenderer.sip	2009-08-05 16:12:24 UTC (rev 11276)
+++ trunk/qgis/python/core/qgssinglesymbolrenderer.sip	2009-08-05 16:43:33 UTC (rev 11277)
@@ -16,7 +16,7 @@
     const QgsSymbol* symbol() const;
 
     /**Renders a feature added in 1.2 */
-    void renderFeature(QgsRenderContext &renderContext, QgsFeature& f, QImage* img, bool selected);
+    void renderFeature(QgsRenderContext &renderContext, QgsFeature& f, QImage* img, bool selected, double opacity = 1.0 );
 
     /**Reads the renderer configuration from an XML file
      @param rnode the Dom node to read 

Modified: trunk/qgis/python/core/qgssymbol.sip
===================================================================
--- trunk/qgis/python/core/qgssymbol.sip	2009-08-05 16:12:24 UTC (rev 11276)
+++ trunk/qgis/python/core/qgssymbol.sip	2009-08-05 16:43:33 UTC (rev 11277)
@@ -77,7 +77,8 @@
                                           QColor selectionColor = Qt::yellow,
                                           double scale = 1.0,
                                           double rotation = 0.0,
-                                          double rasterScaleFactor = 1.0 );
+                                          double rasterScaleFactor = 1.0
+                                          double opacity = 1.0 );
 
     /**Writes the contents of the symbol to a configuration file
      @ return true in case of success*/

Modified: trunk/qgis/python/core/qgsuniquevaluerenderer.sip
===================================================================
--- trunk/qgis/python/core/qgsuniquevaluerenderer.sip	2009-08-05 16:12:24 UTC (rev 11276)
+++ trunk/qgis/python/core/qgsuniquevaluerenderer.sip	2009-08-05 16:43:33 UTC (rev 11277)
@@ -14,7 +14,7 @@
 
     /* render feature
      * added in 1.2 */
-    void renderFeature(QgsRenderContext &renderContext, QgsFeature& f, QImage* img, bool selected);
+    void renderFeature(QgsRenderContext &renderContext, QgsFeature& f, QImage* img, bool selected, double opacity = 1.0);
 
     /**Reads the renderer configuration from an XML file
      @param rnode the Dom node to read