Updated SIP-files after r11275 and r11276. Fix for #1220.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11277 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 5, 2009 · e78c20b · e78c20b
1 parent 2c666b7
commit e78c20b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/python/core/qgscontinuouscolorrenderer.sip b/python/core/qgscontinuouscolorrenderer.sip
@@ -12,7 +12,7 @@ class QgsContinuousColorRenderer : QgsRenderer
     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*/

diff --git a/python/core/qgsgraduatedsymbolrenderer.sip b/python/core/qgsgraduatedsymbolrenderer.sip
@@ -52,7 +52,7 @@ class QgsGraduatedSymbolRenderer : QgsRenderer
      \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*/

diff --git a/python/core/qgsmarkercatalogue.sip b/python/core/qgsmarkercatalogue.sip
@@ -19,12 +19,12 @@ public:
     /** 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 */

diff --git a/python/core/qgsrenderer.sip b/python/core/qgsrenderer.sip
@@ -29,7 +29,9 @@ class QgsRenderer
       @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 

diff --git a/python/core/qgssinglesymbolrenderer.sip b/python/core/qgssinglesymbolrenderer.sip
@@ -16,7 +16,7 @@ class QgsSingleSymbolRenderer : QgsRenderer
     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 

diff --git a/python/core/qgssymbol.sip b/python/core/qgssymbol.sip
@@ -77,7 +77,8 @@ class QgsSymbol
                                           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*/

diff --git a/python/core/qgsuniquevaluerenderer.sip b/python/core/qgsuniquevaluerenderer.sip
@@ -14,7 +14,7 @@ class QgsUniqueValueRenderer : QgsRenderer
 
     /* 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