Python bindings for symbology-ng

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@10780 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · May 13, 2009 · 22cfaa3 · 22cfaa3
1 parent b5d6a9e
commit 22cfaa3
Show file tree

Hide file tree

Showing 7 changed files with 630 additions and 0 deletions.
diff --git a/python/configure.py.in b/python/configure.py.in
@@ -141,6 +141,7 @@ for mk in [ makefile_core, makefile_gui ]:
                            src_path+"/src/core/renderer",
                            src_path+"/src/core/spatialindex",
                            src_path+"/src/core/symbology",
+                           src_path+"/src/core/symbology-ng",
                            build_path, # qgsconfig.h, qgssvnversion.h
                            gdal_inc_dir,
                            geos_inc_dir]
@@ -150,6 +151,7 @@ for mk in [ makefile_core, makefile_gui ]:
 makefile_gui.extra_libs.append("qgis_gui")
 makefile_gui.extra_lib_dirs.append(build_path+"/src/gui"+intdir)
 makefile_gui.extra_include_dirs.append(src_path+"/src/gui")
+makefile_gui.extra_include_dirs.append(src_path+"/src/gui/symbology-ng")
 makefile_gui.extra_include_dirs.append(build_path+"/src/gui")
 makefile_gui.extra_include_dirs.append(build_path+"/src/ui")
 makefile_gui.extra_include_dirs.append(src_path+"/src/plugins") # because of qgisplugin.h TODO: sort out

diff --git a/python/core/core.sip b/python/core/core.sip
@@ -71,3 +71,4 @@
 %Include qgsvectorfilewriter.sip
 %Include qgsvectorlayer.sip
 
+%Include symbology-ng-core.sip
diff --git a/python/core/qgsapplication.sip b/python/core/qgsapplication.sip
@@ -137,6 +137,12 @@ static void qtgui_UpdatePyArgv(PyObject *argvlist, int argc, char **argv)
     //! Returns the path to the svg directory.
     static const QString svgPath();
 
+    //! Returns the path to user's style. Added in QGIS 1.2
+    static const QString userStyleV2Path();
+
+    //! Returns the path to default style (works as a starting point). Added in QGIS 1.2
+    static const QString defaultStyleV2Path();
+
     //! Returns the path to the application prefix directory.
     static const QString prefixPath();
 

diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -97,6 +97,15 @@ public:
   /** Sets the renderer. If a renderer is already present, it is deleted */
   void setRenderer(QgsRenderer * r /Transfer/);
 
+  /** Return renderer V2. Added in QGIS 1.2 */
+  QgsFeatureRendererV2* rendererV2();
+  /** Set renderer V2. Added in QGIS 1.2 */
+  void setRendererV2(QgsFeatureRendererV2* r);
+  /** Return whether using renderer V2. Added in QGIS 1.2 */
+  bool isUsingRendererV2();
+  /** set whether to use renderer V2 for drawing. Added in QGIS 1.2 */
+  void setUsingRendererV2(bool usingRendererV2);
+
   /** Returns point, line or polygon */
   QGis::GeometryType geometryType() const;