[QGIS Commit] r10548 - in trunk/qgis: python/core src/core/symbology

[svn_qgis at osgeo.org]

Author: wonder
Date: 2009-04-12 18:01:13 -0400 (Sun, 12 Apr 2009)
New Revision: 10548

Modified:
   trunk/qgis/python/core/qgssymbol.sip
   trunk/qgis/src/core/symbology/qgssymbol.h
Log:
Added a bunch of missing functions in bindings for QgsSymbol.


Modified: trunk/qgis/python/core/qgssymbol.sip
===================================================================
--- trunk/qgis/python/core/qgssymbol.sip	2009-04-12 20:21:49 UTC (rev 10547)
+++ trunk/qgis/python/core/qgssymbol.sip	2009-04-12 22:01:13 UTC (rev 10548)
@@ -35,10 +35,16 @@
     /**Gets a reference to m_pen. Don't use the pen to change color/style  */
     virtual const QPen& pen() const;
 
+    /**Gets the path to the customs texture image*/
+    virtual QString customTexture() const;
+    /**Sets the path to the custom texture, and sets the brush to use TexturePattern */
+    virtual void setCustomTexture( QString path );
+
     /**Set the line (pen) style*/
     virtual void setLineStyle(Qt::PenStyle s);
     /**Set the fill (brush) style*/
     virtual void setFillStyle(Qt::BrushStyle s);
+    
     virtual void setLowerValue(QString value);
     virtual QString lowerValue() const;
     virtual void setUpperValue(QString value);
@@ -64,9 +70,14 @@
     virtual QImage getPolygonSymbolAsImage();
     
     /** Get QImage representation of point symbol with current settings
-      */
-    virtual QImage getPointSymbolAsImage( double widthScale = 1, 
-	               bool selected = false, QColor selectionColor = Qt::yellow );
+     * and scaled (can be slow when scale != 1.0)
+     */
+    virtual QImage getPointSymbolAsImage( double widthScale = 1.,
+                                          bool selected = false,
+                                          QColor selectionColor = Qt::yellow,
+                                          double scale = 1.0,
+                                          double rotation = 0.0,
+                                          double rasterScaleFactor = 1.0 );
 
     /**Writes the contents of the symbol to a configuration file
      @ return true in case of success*/
@@ -77,6 +88,18 @@
     /**Returns if this symbol is point/ line or polygon*/
     QGis::GeometryType type() const;
 
+    /**Returns the number of the rotation classification field*/
+    int rotationClassificationField() const;
+    /**Sets the number of the rotation classicifation field
+    \param field the number of the field to classify for rotation*/
+    void setRotationClassificationField( int field );
+
+    /**Returns the number of the scale classification field*/
+    int scaleClassificationField() const;
+    /**Sets the number of the scale classicifation field
+    \param field the number of the field to classify for scale*/
+    void setScaleClassificationField( int field );
+
 };
 
 

Modified: trunk/qgis/src/core/symbology/qgssymbol.h
===================================================================
--- trunk/qgis/src/core/symbology/qgssymbol.h	2009-04-12 20:21:49 UTC (rev 10547)
+++ trunk/qgis/src/core/symbology/qgssymbol.h	2009-04-12 22:01:13 UTC (rev 10548)
@@ -104,7 +104,7 @@
     virtual QImage getCachedPointSymbolAsImage( double widthScale = 1.,
         bool selected = false, QColor selectionColor = Qt::yellow );
 
-    /* Get QImage representation of point symbol with current settings
+    /** Get QImage representation of point symbol with current settings
      * and scaled (can be slow when scale != 1.0)
      */
     virtual QImage getPointSymbolAsImage( double widthScale = 1.,