Changeset 701

Timestamp:

06/29/08 06:40:08 (8 weeks ago)

Author:

artem

Message:

applied font fallbacj patch from Beau Gunderson

Location:

trunk

Files:

• SConstruct (modified) (5 diffs)
• agg/include/agg_config.h (modified) (1 diff)
• bindings/python/SConscript (modified) (1 diff)
• demo/c++/rundemo.cpp (modified) (2 diffs)
• demo/python/rundemo.py (modified) (1 diff)
• demo/viewer/main.cpp (modified) (1 diff)
• demo/viewer/mainwindow.cpp (modified) (1 diff)
• demo/viewer/mapwidget.cpp (modified) (17 diffs)
• demo/viewer/mapwidget.hpp (modified) (3 diffs)
• demo/viewer/viewer.pro (modified) (3 diffs)
• include/mapnik/agg_renderer.hpp (modified) (1 diff)
• include/mapnik/ctrans.hpp (modified) (1 diff)
• include/mapnik/font_engine_freetype.hpp (modified) (12 diffs)
• include/mapnik/font_set.hpp (added)
• include/mapnik/image_view.hpp (modified) (2 diffs)
• include/mapnik/map.hpp (modified) (4 diffs)
• include/mapnik/octree.hpp (modified) (1 diff)
• include/mapnik/png_io.hpp (modified) (1 diff)
• include/mapnik/text_symbolizer.hpp (modified) (4 diffs)
• include/mapnik/unicode.hpp (modified) (1 diff)
• plugins/input/gdal/SConscript (modified) (1 diff)
• plugins/input/postgis/SConscript (modified) (1 diff)
• plugins/input/raster/SConscript (modified) (1 diff)
• plugins/input/shape/SConscript (modified) (1 diff)
• plugins/input/shape/dbffile.hpp (modified) (1 diff)
• src/SConscript (modified) (1 diff)
• src/agg_renderer.cpp (modified) (8 diffs)
• src/cairo_renderer.cpp (modified) (1 diff)
• src/load_map.cpp (modified) (9 diffs)
• src/map.cpp (modified) (5 diffs)
• src/text_symbolizer.cpp (modified) (5 diffs)
• src/unicode.cpp (modified) (1 diff)
• utils/shapeindex/SConscript (modified) (1 diff)

trunk/SConstruct

@@ -46 +46 @@
 opts.Add(PathOption('PNG_INCLUDES', 'Search path for libpng include files', '/usr/include'))
 opts.Add(PathOption('PNG_LIBS','Search path for libpng include files','/usr/' + LIBDIR_SCHEMA))
-opts.Add(PathOption('JPEG_INCLUDES', 'Search path for libjpeg include files', '/usr/include'))
-opts.Add(PathOption('JPEG_LIBS', 'Search path for libjpeg library files', '/usr/' + LIBDIR_SCHEMA))
+opts.Add(PathOption('JPEG_INCLUDES', 'Search path for libjpeg include files', '/usr/local/include'))
+opts.Add(PathOption('JPEG_LIBS', 'Search path for libjpeg library files', '/usr/local/' + LIBDIR_SCHEMA))
 opts.Add(PathOption('TIFF_INCLUDES', 'Search path for libtiff include files', '/usr/include'))
 opts.Add(PathOption('TIFF_LIBS', 'Search path for libtiff library files', '/usr/' + LIBDIR_SCHEMA))
 opts.Add(PathOption('PGSQL_INCLUDES', 'Search path for PostgreSQL include files', '/usr/include'))
 opts.Add(PathOption('PGSQL_LIBS', 'Search path for PostgreSQL library files', '/usr/' + LIBDIR_SCHEMA))
-opts.Add(PathOption('PROJ_INCLUDES', 'Search path for PROJ.4 include files', '/usr/local/include'))
-opts.Add(PathOption('PROJ_LIBS', 'Search path for PROJ.4 library files', '/usr/local/' + LIBDIR_SCHEMA))
+opts.Add(PathOption('PROJ_INCLUDES', 'Search path for PROJ.4 include files', '/opt/proj4/include'))
+opts.Add(PathOption('PROJ_LIBS', 'Search path for PROJ.4 library files', '/opt/proj4/' + LIBDIR_SCHEMA))
 opts.Add(PathOption('GDAL_INCLUDES', 'Search path for GDAL include files', '/usr/include'))
 opts.Add(PathOption('GDAL_LIBS', 'Search path for GDAL library files', '/usr/' + LIBDIR_SCHEMA))
 opts.Add(PathOption('PYTHON','Python executable', sys.executable))
-opts.Add(ListOption('INPUT_PLUGINS','Input drivers to include','all',['postgis','shape','raster','gdal']))
+opts.Add(ListOption('INPUT_PLUGINS','Input drivers to include','all',['postgis','shape','raster','gdal','osm']))
 opts.Add(ListOption('BINDINGS','Language bindings to build','all',['python']))
 opts.Add(BoolOption('DEBUG', 'Compile a debug version of mapnik', 'False'))
@@ -155 +155 @@
 
 BOOST_LIBSHEADERS = [
-    # ['system', 'boost/system/system_error.hpp', True], # uncomment this on Darwin + boost_1_35
+    ['system', 'boost/system/system_error.hpp', True], # uncomment this on Darwin + boost_1_35
     ['filesystem', 'boost/filesystem/operations.hpp', True],
     ['regex', 'boost/regex.hpp', True],
@@ -179 +179 @@
 else:
     env['BOOST_APPEND']=''
+
     
 for count, libinfo in enumerate(BOOST_LIBSHEADERS):
     if  env['THREADING'] == 'multi' :
-        if not conf.CheckLibWithHeader('boost_%s%s%s' % (libinfo[0],env['BOOST_APPEND'],thread_suffix), libinfo[1], 'C++') and libinfo[2] :
+        if not conf.CheckLibWithHeader('boost_%s%s%s' % (libinfo[0],thread_suffix,env['BOOST_APPEND']), libinfo[1], 'C++') and libinfo[2] :
             color_print(1,'Could not find header or shared library for boost %s, exiting!' % libinfo[0])
             Exit(1)
@@ -204 +205 @@
 
 # Build shapeindex and remove its dependency from the LIBS
-if 'boost_program_options%s%s' % (env['BOOST_APPEND'],thread_suffix) in env['LIBS']:
+# if 'boost_program_options%s%s-1_35' % (env['BOOST_APPEND'],thread_suffix) in env['LIBS']:
+if 'boost_program_options-mt-1_35' in env['LIBS']:
     SConscript('utils/shapeindex/SConscript')
-    env['LIBS'].remove('boost_program_options%s%s' % (env['BOOST_APPEND'],thread_suffix))
+    env['LIBS'].remove('boost_program_options-mt-1_35')
 
 # Build the input plug-ins
+
 if 'postgis' in inputplugins and 'pq' in env['LIBS']:
     SConscript('plugins/input/postgis/SConscript')
@@ -222 +225 @@
     SConscript('plugins/input/gdal/SConscript')
 
-if 'gigabase' in inputplugins and 'gigabase_r' in env['LIBS']:
-    SConscript('plugins/input/gigabase/SConscript')
+if 'osm' in inputplugins :
+    SConscript('plugins/input/osm/SConscript')
 
 # Build the Python bindings.

trunk/agg/include/agg_config.h

@@ -34 +34 @@
 // such as blur, image filtering:
 
-#define AGG_RENDERING_BUFFER row_ptr_cache<int8u>
+//#define AGG_RENDERING_BUFFER row_ptr_cache<int8u>
 // 
 // Provides cheaper creation and destruction (no mem allocs):

trunk/bindings/python/SConscript

@@ -41 +41 @@
 libraries = ['mapnik','png','jpeg']
 if env['THREADING'] == 'multi':
-    libraries.append('boost_python%s%s' % (env['BOOST_APPEND'],thread_suffix))
-else :
-    libraries.append('boost_python%s' % env['BOOST_APPEND'])
+    #libraries.append('boost_python%s%s-1_35' % (env['BOOST_APPEND'],thread_suffix))
+    libraries.append('boost_python%s-1_35' % (thread_suffix))
+#else :
+#    libraries.append('boost_python%s' % env['BOOST_APPEND'])
 
 if env['PLATFORM'] == 'Darwin':
+    libraries.append(env['LIBS'])
     libraries.append('icuuc')
     libraries.append('icudata')
-    if env['THREADING'] == 'multi':
-        libraries.append('boost_regex%s%s' % (env['BOOST_APPEND'],thread_suffix))
-    else :
-        libraries.append('boost_regex%s' % env['BOOST_APPEND'])
-    if env['THREADING'] == 'multi':
-        libraries.append('boost_thread%s%s' % (env['BOOST_APPEND'],thread_suffix))
+    #if env['THREADING'] == 'multi':
+    #    libraries.append('boost_regex%s%s' % (env['BOOST_APPEND'],thread_suffix))
+    #else :
+    #    libraries.append('boost_regex%s' % env['BOOST_APPEND'])
+    
+    #if env['THREADING'] == 'multi':
+    #    libraries.append('boost_thread%s%s' % (env['BOOST_APPEND'],thread_suffix))
     if '-DHAVE_PYCAIRO' in env['CXXFLAGS']:
         libraries.append([lib for lib in env['LIBS'] if lib.startswith('cairo')])

trunk/demo/c++/rundemo.cpp

@@ -29 +29 @@
 #include <mapnik/font_engine_freetype.hpp>
 #include <mapnik/agg_renderer.hpp>
+#include <mapnik/cairo_renderer.hpp>
 #include <mapnik/filter_factory.hpp>
 #include <mapnik/color_factory.hpp>
@@ -53 +54 @@
         
         Map m(800,600);
-        m.set_background(color_factory::from_string("white"));
         
-        // create styles
+        mapnik::load_map(m,"/Users/artem/projects/openstreetmap/mapnik/openstreetmap_kleptog.xml");
+        
+        m.zoomToBox(Envelope<double>(-762470.6985688356,4004842.088052442,-761928.349698612,4005328.834769584));
+        
+        //Image32 buf(m.getWidth(),m.getHeight());
+        //agg_renderer<Image32> ren(m,buf);
+        //ren.apply();
+        
+        //save_to_file<ImageData32>(buf.data(),"demo.jpg","jpeg");
+        //save_to_file<ImageData32>(buf.data(),"demo.png","png");
+        //save_to_file<ImageData32>(buf.data(),"demo256.png","png256");
+        //std::cout << "Three maps have been rendered in the current directory:\n"
+        //  "- demo.jpg\n"
+        //  "- demo.png\n"
+        //  "- demo256.png\n"
+        //  "Have a look!\n";
 
-        // Provinces (polygon)
-        feature_type_style provpoly_style;
-       
-        rule_type provpoly_rule_on;
-        provpoly_rule_on.set_filter(create_filter("[NAME_EN] = 'Ontario'"));
-        provpoly_rule_on.append(polygon_symbolizer(Color(250, 190, 183)));
-        provpoly_style.add_rule(provpoly_rule_on);
+        // Cairo renderer
+
+        // Pdf
+        Cairo::RefPtr<Cairo::PdfSurface> pdf = Cairo::PdfSurface::create("mapnik.pdf",m.getWidth(),m.getHeight());
+        mapnik::cairo_renderer<Cairo::Surface> cairo1(m, pdf);
+        cairo1.apply();
+        // Svg
+        //Cairo::RefPtr<Cairo::SvgSurface> svg = Cairo::SvgSurface::create("demo.svg",m.getWidth(),m.getHeight());
+        //mapnik::cairo_renderer<Cairo::Surface> cairo2(m, svg);  
+        //cairo2.apply();
+        // Png
+        //Cairo::RefPtr<Cairo::ImageSurface> image = Cairo::ImageSurface::create(Cairo::FORMAT_ARGB32,m.getWidth(),m.getHeight());
+        //mapnik::cairo_renderer<Cairo::Surface> cairo3(m, image);  
+        //cairo3.apply();
         
-        rule_type provpoly_rule_qc;
-        provpoly_rule_qc.set_filter(create_filter("[NAME_EN] = 'Quebec'"));
-        provpoly_rule_qc.append(polygon_symbolizer(Color(217, 235, 203)));
-        provpoly_style.add_rule(provpoly_rule_qc);
+        //std::string filename = "demo_cairo.png";
+        //image->write_to_png(filename);
         
-        m.insert_style("provinces",provpoly_style);
-
-        // Provinces (polyline)
-        feature_type_style provlines_style;
+        // Ps
+        //Cairo::RefPtr<Cairo::PsSurface> ps = Cairo::PsSurface::create("demo.ps",m.getWidth(),m.getHeight());
+        //mapnik::cairo_renderer<Cairo::Surface> cairo4(m, ps);
+        //cairo4.apply();
         
-        stroke provlines_stk (Color(0,0,0),1.0);
-        provlines_stk.add_dash(8, 4);
-        provlines_stk.add_dash(2, 2);
-        provlines_stk.add_dash(2, 2);
-        
-        rule_type provlines_rule;
-        provlines_rule.append(line_symbolizer(provlines_stk));
-        provlines_style.add_rule(provlines_rule);
-        
-        m.insert_style("provlines",provlines_style);
-        
-        // Drainage 
-        feature_type_style qcdrain_style;
-        
-        rule_type qcdrain_rule;
-        qcdrain_rule.set_filter(create_filter("[HYC] = 8"));
-        qcdrain_rule.append(polygon_symbolizer(Color(153, 204, 255)));
-        qcdrain_style.add_rule(qcdrain_rule);
-        
-        m.insert_style("drainage",qcdrain_style);
-        
-        // Roads 3 and 4 (The "grey" roads)
-        feature_type_style roads34_style;    
-        rule_type roads34_rule;
-        roads34_rule.set_filter(create_filter("[CLASS] = 3 or [CLASS] = 4"));
-        stroke roads34_rule_stk(Color(171,158,137),2.0);
-        roads34_rule_stk.set_line_cap(ROUND_CAP);
-        roads34_rule_stk.set_line_join(ROUND_JOIN);
-        roads34_rule.append(line_symbolizer(roads34_rule_stk));
-        roads34_style.add_rule(roads34_rule);
-        
-        m.insert_style("smallroads",roads34_style);
-        
-
-        // Roads 2 (The thin yellow ones)
-        feature_type_style roads2_style_1;
-        rule_type roads2_rule_1;
-        roads2_rule_1.set_filter(create_filter("[CLASS] = 2"));
-        stroke roads2_rule_stk_1(Color(171,158,137),4.0);
-        roads2_rule_stk_1.set_line_cap(ROUND_CAP);
-        roads2_rule_stk_1.set_line_join(ROUND_JOIN);
-        roads2_rule_1.append(line_symbolizer(roads2_rule_stk_1));
-        roads2_style_1.add_rule(roads2_rule_1);
-        
-        m.insert_style("road-border", roads2_style_1);
-        
-        feature_type_style roads2_style_2;
-        rule_type roads2_rule_2;
-        roads2_rule_2.set_filter(create_filter("[CLASS] = 2"));
-        stroke roads2_rule_stk_2(Color(255,250,115),2.0);
-        roads2_rule_stk_2.set_line_cap(ROUND_CAP);
-        roads2_rule_stk_2.set_line_join(ROUND_JOIN);
-        roads2_rule_2.append(line_symbolizer(roads2_rule_stk_2));
-        roads2_style_2.add_rule(roads2_rule_2);
-        
-        m.insert_style("road-fill", roads2_style_2);
-        
-        // Roads 1 (The big orange ones, the highways)
-        feature_type_style roads1_style_1;
-        rule_type roads1_rule_1;
-        roads1_rule_1.set_filter(create_filter("[CLASS] = 1"));
-        stroke roads1_rule_stk_1(Color(188,149,28),7.0);
-        roads1_rule_stk_1.set_line_cap(ROUND_CAP);
-        roads1_rule_stk_1.set_line_join(ROUND_JOIN);
-        roads1_rule_1.append(line_symbolizer(roads1_rule_stk_1));
-        roads1_style_1.add_rule(roads1_rule_1);
-        m.insert_style("highway-border", roads1_style_1);
-        
-        feature_type_style roads1_style_2;
-        rule_type roads1_rule_2;
-        roads1_rule_2.set_filter(create_filter("[CLASS] = 1"));
-        stroke roads1_rule_stk_2(Color(242,191,36),5.0);
-        roads1_rule_stk_2.set_line_cap(ROUND_CAP);
-        roads1_rule_stk_2.set_line_join(ROUND_JOIN);
-        roads1_rule_2.append(line_symbolizer(roads1_rule_stk_2));
-        roads1_style_2.add_rule(roads1_rule_2);
-        m.insert_style("highway-fill", roads1_style_2);
-        
-        // Populated Places
-        
-        feature_type_style popplaces_style;
-        rule_type popplaces_rule;
-        text_symbolizer popplaces_text_symbolizer("GEONAME","DejaVu Sans Book",10,Color(0,0,0));
-        popplaces_text_symbolizer.set_halo_fill(Color(255,255,200));
-        popplaces_text_symbolizer.set_halo_radius(1);
-        popplaces_rule.append(popplaces_text_symbolizer);
-        popplaces_style.add_rule(popplaces_rule);
-        
-        m.insert_style("popplaces",popplaces_style );
-        
-        // Layers
-        // Provincial  polygons
-        {
-            parameters p;
-            p["type"]="shape";
-            p["file"]="../data/boundaries";
-            
-            Layer lyr("Provinces"); 
-            lyr.set_datasource(datasource_cache::instance()->create(p));
-            lyr.add_style("provinces");    
-            m.addLayer(lyr);
-        }
-        
-        // Drainage
-        {
-            parameters p;
-            p["type"]="shape";
-            p["file"]="../data/qcdrainage";
-            Layer lyr("Quebec Hydrography");
-            lyr.set_datasource(datasource_cache::instance()->create(p));
-            lyr.add_style("drainage");    
-            m.addLayer(lyr);
-        }
-        
-        {
-            parameters p;
-            p["type"]="shape";
-            p["file"]="../data/ontdrainage";
-            
-            Layer lyr("Ontario Hydrography"); 
-            lyr.set_datasource(datasource_cache::instance()->create(p));
-            lyr.add_style("drainage");    
-            m.addLayer(lyr);
-        }
-        
-        // Provincial boundaries
-        {
-            parameters p;
-            p["type"]="shape";
-            p["file"]="../data/boundaries_l";
-            Layer lyr("Provincial borders"); 
-            lyr.set_datasource(datasource_cache::instance()->create(p));
-            lyr.add_style("provlines");    
-            m.addLayer(lyr);
-        }
-        
-        // Roads
-        {
-            parameters p;
-            p["type"]="shape";
-            p["file"]="../data/roads";        
-            Layer lyr("Roads"); 
-            lyr.set_datasource(datasource_cache::instance()->create(p));
-            lyr.add_style("smallroads");
-            lyr.add_style("road-border");
-            lyr.add_style("road-fill");
-            lyr.add_style("highway-border");
-            lyr.add_style("highway-fill");
-
-            m.addLayer(lyr);        
-        }
-        // popplaces
-        {
-            parameters p;
-            p["type"]="shape";
-            p["file"]="../data/popplaces";
-            p["encoding"] = "latin1";
-            Layer lyr("Populated Places");
-            lyr.set_datasource(datasource_cache::instance()->create(p));
-            lyr.add_style("popplaces");    
-            m.addLayer(lyr);
-        }
-        
-        m.zoomToBox(Envelope<double>(1405120.04127408,-247003.813399447,
-                                     1706357.31328276,-25098.593149577));
-        
-        Image32 buf(m.getWidth(),m.getHeight());
-        agg_renderer<Image32> ren(m,buf);
-        ren.apply();
-        
-        save_to_file<ImageData32>(buf.data(),"demo.jpg","jpeg");
-        save_to_file<ImageData32>(buf.data(),"demo.png","png");
-        save_to_file<ImageData32>(buf.data(),"demo256.png","png256");
-        std::cout << "Three maps have been rendered in the current directory:\n"
-           "- demo.jpg\n"
-           "- demo.png\n"
-           "- demo256.png\n"
-           "Have a look!\n";
     }
     catch ( const mapnik::config_error & ex )

trunk/demo/python/rundemo.py

@@ -317 +317 @@
 images.append('demo.jpg')
 
+save_map(m,'map.xml')
+
 # Render cairo examples
 try:

trunk/demo/viewer/main.cpp

@@ -36 +36 @@
    freetype_engine::register_font("/opt/mapnik/lib/mapnik/fonts/DejaVuSans-Bold.ttf");
    freetype_engine::register_font("/opt/mapnik/lib/mapnik/fonts/DejaVuSansMono.ttf");
-    
-        
+   freetype_engine::register_font("/System/Library/Fonts/Monaco.dfont");
+   freetype_engine::register_font("/Users/artem/Desktop/japanese.otf");
+   freetype_engine::register_font("/Users/artem/Desktop/IPAfont00201/ipagp.ttf");
+   freetype_engine::register_font("/Users/artem/Desktop/IPAfont00201/ipag.ttf");
+   
    QApplication app( argc, argv ); 
    MainWindow window;

trunk/demo/viewer/mainwindow.cpp

@@ -93 +93 @@
    connect(slider_,SIGNAL(valueChanged(int)),mapWidget_,SLOT(zoomToLevel(int)));
    // 
-   connect(layerTab_,SIGNAL(update_mapwidget()),mapWidget_,SLOT(updateMap()));
+   connect(layerTab_,SIGNAL(update_mapwidget()),mapWidget_,SLOT(renderMap()));
    connect(layerTab_,SIGNAL(layerSelected(int)), 
            mapWidget_,SLOT(layerSelected(int)));

trunk/demo/viewer/mapwidget.cpp

@@ -30 +30 @@
 #include "mapwidget.hpp"
 #include "info_dialog.hpp"
+#include <unicode/unistr.h>
 
 using mapnik::Image32;
@@ -80 +81 @@
    pen_.setCapStyle(Qt::RoundCap);
    pen_.setJoinStyle(Qt::RoundJoin);
+   connect(&thread_, SIGNAL(renderedMap(const QImage &)),
+                this, SLOT(updateMap(const QImage &)));
 }
 
@@ -122 +125 @@
    {
       map_->resize(ev->size().width(),ev->size().height());
-      updateMap();
+      renderMap();
    }
 }
@@ -172 +175 @@
                         if (itr->second.to_string().length() > 0)
                         {
+                           UnicodeString unicode = itr->second.to_unicode();
                            info.push_back(QPair<QString,QString>(QString(itr->first.c_str()),
-                                                                 itr->second.to_string().c_str()));
+                                                                 QString((QChar*)unicode.getBuffer(),unicode.length())));
                         }
                      }
@@ -224 +228 @@
    else if (e->button()==Qt::RightButton) 
    {    
-      //updateMap();
+      //renderMap();
    }
 }
@@ -252 +256 @@
             Envelope<double> box = t.backward(Envelope<double>(start_x_,start_y_,end_x_,end_y_));
             map_->zoomToBox(box);
-            updateMap();
+            renderMap();
          }
       }
@@ -265 +269 @@
             int dy = end_y_ - start_y_;
             map_->pan(cx - dx ,cy - dy); 
-            updateMap();
+            renderMap();
          }
       }
@@ -334 +338 @@
    {
       map_->zoomToBox(bbox);
-      updateMap();
+      renderMap();
    }
 }
@@ -344 +348 @@
       map_->resize(width(),height());
       map_->zoom_all();
-      updateMap();
+      renderMap();
    }
 }
@@ -353 +357 @@
    {
       map_->zoom(0.5);
-      updateMap();
+      renderMap();
    }
 }
@@ -362 +366 @@
    {
       map_->zoom(2.0);
-      updateMap();
+      renderMap();
    }
 }
@@ -373 +377 @@
       double cy = 0.5*map_->getHeight();
       map_->pan(int(cx),int(cy - cy*0.25));
-      updateMap();
+      renderMap();
    }
 }
@@ -384 +388 @@
       double cy = 0.5*map_->getHeight();
       map_->pan(int(cx),int(cy + cy*0.25));
-      updateMap();
+      renderMap();
    }
 }
@@ -395 +399 @@
       double cy = 0.5*map_->getHeight();
       map_->pan(int(cx - cx * 0.25),int(cy));
-      updateMap();
+      renderMap();
    }
 }
@@ -406 +410 @@
       double cy = 0.5*map_->getHeight();
       map_->pan(int(cx + cx * 0.25),int(cy)); 
-      updateMap();
+      renderMap();
    }
 }
@@ -429 +433 @@
                                    pt.y + 0.5 * height*res);
       map_->zoomToBox(box);
-      updateMap();
+      renderMap();
    }
 }
@@ -442 +446 @@
        
 
-void MapWidget::updateMap() 
-{   
-   if (map_)
-   {
-      unsigned width=map_->getWidth();
-      unsigned height=map_->getHeight();
-      
-      Image32 buf(width,height);
-      mapnik::agg_renderer<Image32> ren(*map_,buf);
-      ren.apply();
-      
-      QImage image((uchar*)buf.raw_data(),width,height,QImage::Format_ARGB32);
-      pix_=QPixmap::fromImage(image.rgbSwapped());
-      update();
-      // emit signal to interested widgets
-      emit mapViewChanged();
-      std::cout << map_->getCurrentExtent() << "\n";
-   }
+void MapWidget::renderMap()
+{
+   thread_.render(map_);
+}
+
+void MapWidget::updateMap(QImage const& image) 
+{  
+   std::cout << "updateMap called \n";
+   pix_ = QPixmap::fromImage(image);
+   update();
+   // emit signal to interested widgets
+   emit mapViewChanged();
+   std::cout << map_->getCurrentExtent() << "\n";
 }
 

trunk/demo/viewer/mapwidget.hpp

@@ -32 +32 @@
 #include <boost/scoped_ptr.hpp>
 #include <mapnik/map.hpp>
+#include "renderthread.hpp"
 
 class MapWidget : public QWidget 
@@ -59 +60 @@
       QPen pen_;
       int selectedLayer_;
+      RenderThread thread_;
    public:
       MapWidget(QWidget *parent=0);
@@ -73 +75 @@
       void panUp();
       void panDown();
+      void renderMap();
  public slots:
       void zoomToLevel(int level);
-      void updateMap();
+      void updateMap(QImage const&);
       void layerSelected(int);
    signals: