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

[svn_qgis at osgeo.org]

Author: wonder
Date: 2008-11-17 11:04:30 -0500 (Mon, 17 Nov 2008)
New Revision: 9653

Modified:
   trunk/qgis/python/core/qgslabel.sip
   trunk/qgis/python/core/qgslabelattributes.sip
   trunk/qgis/python/core/qgsrendercontext.sip
Log:
Added python bindings for changes in r9649.


Modified: trunk/qgis/python/core/qgslabel.sip
===================================================================
--- trunk/qgis/python/core/qgslabel.sip	2008-11-17 15:35:45 UTC (rev 9652)
+++ trunk/qgis/python/core/qgslabel.sip	2008-11-17 16:04:30 UTC (rev 9653)
@@ -41,6 +41,11 @@
   LabelFieldCount
 };
 
+    struct labelpoint {
+      QgsPoint p;
+      double angle;
+    };
+    
     /** \brief render label
      *  \param sizeScale global scale factor for size in pixels, labels in map units are not scaled
     */
@@ -55,7 +60,7 @@
     void readXML(const QDomNode& node);
 
     /** Writes the contents of the renderer to a configuration file */
-    // TODO: wrap void writeXML(std::ostream& xml);
+    void writeXML( QDomNode & label_node, QDomDocument & document );
 
     //! add vector of required fields to existing list of fields
     void addRequiredFields ( QList<int> & fields );
@@ -82,5 +87,18 @@
     */
     QString fieldValue ( int attr, QgsFeature& feature );
 
+
+    /** Accessor and mutator for the minimum scale member */
+    void setMinScale( float theMinScale );
+    float minScale();
+
+    /** Accessor and mutator for the maximum scale member */
+    void setMaxScale( float theMaxScale );
+    float maxScale();
+
+    /** Accessor and mutator for the scale based visilibility flag */
+    void setScaleBasedVisibility( bool theVisibilityFlag );
+    bool scaleBasedVisibility();
+
 };
 

Modified: trunk/qgis/python/core/qgslabelattributes.sip
===================================================================
--- trunk/qgis/python/core/qgslabelattributes.sip	2008-11-17 15:35:45 UTC (rev 9652)
+++ trunk/qgis/python/core/qgslabelattributes.sip	2008-11-17 16:04:30 UTC (rev 9653)
@@ -68,6 +68,9 @@
     bool   angleIsSet ( ) const;
     double angle ( ) const;
 
+    bool   angleIsAuto( ) const;
+    void   setAutoAngle(bool state);
+
     /* Alignment */
     void setAlignment ( int alignment );
     bool alignmentIsSet ( ) const;

Modified: trunk/qgis/python/core/qgsrendercontext.sip
===================================================================
--- trunk/qgis/python/core/qgsrendercontext.sip	2008-11-17 15:35:45 UTC (rev 9652)
+++ trunk/qgis/python/core/qgsrendercontext.sip	2008-11-17 16:04:30 UTC (rev 9653)
@@ -30,6 +30,8 @@
 
   bool drawEditingInformation() const;
 
+  double rendererScale() const;
+
   //setters
 
   /**Sets coordinate transformation. QgsRenderContext takes ownership and deletes if necessary*/
@@ -40,5 +42,6 @@
   void setRenderingStopped(bool stopped);
   void setScaleFactor(double factor);
   void setRasterScaleFactor(double factor);
+  void setRendererScale( double scale );
   void setPainter(QPainter* p);
 };