Changeset 666 for trunk

Timestamp:

03/11/08 19:37:53 (9 months ago)

Author:

tom

Message:

Add cairo support to the python bindings - needs Pycairo installed.

Location:

trunk

Files:

• bindings/python/SConscript (modified) (1 diff)
• bindings/python/mapnik_python.cpp (modified) (7 diffs)
• bindings/python/python_cairo.cpp (added)
• demo/python/rundemo.py (modified) (1 diff)

trunk/bindings/python/SConscript

@@ -25 +25 @@
 
 Import('env')
+   
+env.ParseConfig('pkg-config --cflags pycairo')
 
 prefix = env['PYTHON_PREFIX'] + '/' + env['LIBDIR_SCHEMA'] + '/python' + env['PYTHON_VERSION'] + '/site-packages/'

trunk/bindings/python/mapnik_python.cpp

@@ -27 +27 @@
 #include <boost/python/exception_translator.hpp>
 
+void register_cairo();
 void export_color();
 void export_coord();
@@ -58 +59 @@
 #include <mapnik/map.hpp>
 #include <mapnik/agg_renderer.hpp>
+#include <mapnik/cairo_renderer.hpp>
 #include <mapnik/graphics.hpp>
 #include <mapnik/image_util.hpp>
@@ -64 +66 @@
 #include <mapnik/save_map.hpp>
 
+#include <pycairo.h>
 
 void render(const mapnik::Map& map,mapnik::Image32& image, unsigned offset_x = 0, unsigned offset_y = 0)
@@ -74 +77 @@
 {
     mapnik::agg_renderer<mapnik::Image32> ren(map,image);
+    ren.apply();
+}
+
+void render3(const mapnik::Map& map,PycairoSurface* surface, unsigned offset_x = 0, unsigned offset_y = 0)
+{
+    Cairo::RefPtr<Cairo::Surface> s(new Cairo::Surface(surface->surface));
+    mapnik::cairo_renderer<Cairo::Surface> ren(map,s,offset_x, offset_y);
+    ren.apply();
+}
+
+void render4(const mapnik::Map& map,PycairoSurface* surface)
+{
+    Cairo::RefPtr<Cairo::Surface> s(new Cairo::Surface(surface->surface));
+    mapnik::cairo_renderer<Cairo::Surface> ren(map,s);
     ren.apply();
 }
@@ -126 +143 @@
 
     register_exception_translator<mapnik::config_error>(translator);
+    register_cairo();
     export_query();    
     export_feature();
@@ -153 +171 @@
     export_coord();
     export_map();
-    
+
     def("render_to_file",&render_to_file1);
     def("render_to_file",&render_to_file2);
@@ -159 +177 @@
     def("render",&render); 
     def("render",&render2);
+    def("render",&render3);
+    def("render",&render4);
     def("scale_denominator", &scale_denominator);
     

trunk/demo/python/rundemo.py

@@ -309 +309 @@
 
 # Save image to files
+images = []
 im.save('demo.png', 'png') # true-colour RGBA
+images.append('demo.png')
 im.save('demo256.png', 'png256') # save to palette based (max 256 colours) png 
+images.append('demo256.png')
 im.save('demo.jpg', 'jpeg')
-
-print """\n\nThree maps have been rendered in the current directory:
-- demo.jpg
-- demo.png
-- demo256.png
-
-Have a look!\n\n"""
+images.append('demo.jpg')
+
+# Render cairo examples
+try:
+    import cairo
+    surface = cairo.SVGSurface('demo.svg', m.width,m.height)
+    render(m, surface)
+    images.append('demo.svg')
+    surface = cairo.PDFSurface('demo.pdf', m.width,m.height)
+    render(m, surface)
+    images.append('demo.pdf')
+except:
+    print '\n\nSkipping cairo examples as Pycairo not available'
+
+print "\n\n", len(images), "maps have been rendered in the current directory:"
+for image in images:
+    print "-", image
+print "\n\nHave a look!\n\n"