Changeset 701 for trunk/demo/viewer/mapwidget.cpp

Timestamp:

06/29/08 06:40:08 (5 months ago)

Author:

artem

Message:

applied font fallbacj patch from Beau Gunderson

Files:

• trunk/demo/viewer/mapwidget.cpp (modified) (17 diffs)

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";
 }