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

Timestamp:

06/29/08 06:58:29 (6 months ago)

Author:

artem

Message:

reverting back to 700

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;
@@ -81 +80 @@
    pen_.setCapStyle(Qt::RoundCap);
    pen_.setJoinStyle(Qt::RoundJoin);
-   connect(&thread_, SIGNAL(renderedMap(const QImage &)),
-                this, SLOT(updateMap(const QImage &)));
 }
 
@@ -125 +122 @@
    {
       map_->resize(ev->size().width(),ev->size().height());
-      renderMap();
+      updateMap();
    }
 }
@@ -175 +172 @@
                         if (itr->second.to_string().length() > 0)
                         {
-                           UnicodeString unicode = itr->second.to_unicode();
                            info.push_back(QPair<QString,QString>(QString(itr->first.c_str()),
-                                                                 QString((QChar*)unicode.getBuffer(),unicode.length())));
+                                                                 itr->second.to_string().c_str()));
                         }
                      }
@@ -228 +224 @@
    else if (e->button()==Qt::RightButton) 
    {    
-      //renderMap();
+      //updateMap();
    }
 }
@@ -256 +252 @@
             Envelope<double> box = t.backward(Envelope<double>(start_x_,start_y_,end_x_,end_y_));
             map_->zoomToBox(box);
-            renderMap();
+            updateMap();
          }
       }
@@ -269 +265 @@
             int dy = end_y_ - start_y_;
             map_->pan(cx - dx ,cy - dy); 
-            renderMap();
+            updateMap();
          }
       }
@@ -338 +334 @@
    {
       map_->zoomToBox(bbox);
-      renderMap();
+      updateMap();
    }
 }
@@ -348 +344 @@
       map_->resize(width(),height());
       map_->zoom_all();
-      renderMap();
+      updateMap();
    }
 }
@@ -357 +353 @@
    {
       map_->zoom(0.5);
-      renderMap();
+      updateMap();
    }
 }
@@ -366 +362 @@
    {
       map_->zoom(2.0);
-      renderMap();
+      updateMap();
    }
 }
@@ -377 +373 @@
       double cy = 0.5*map_->getHeight();
       map_->pan(int(cx),int(cy - cy*0.25));
-      renderMap();
+      updateMap();
    }
 }
@@ -388 +384 @@
       double cy = 0.5*map_->getHeight();
       map_->pan(int(cx),int(cy + cy*0.25));
-      renderMap();
+      updateMap();
    }
 }
@@ -399 +395 @@
       double cy = 0.5*map_->getHeight();
       map_->pan(int(cx - cx * 0.25),int(cy));
-      renderMap();
+      updateMap();
    }
 }
@@ -410 +406 @@
       double cy = 0.5*map_->getHeight();
       map_->pan(int(cx + cx * 0.25),int(cy)); 
-      renderMap();
+      updateMap();
    }
 }
@@ -433 +429 @@
                                    pt.y + 0.5 * height*res);
       map_->zoomToBox(box);
-      renderMap();
+      updateMap();
    }
 }
@@ -446 +442 @@
        
 
-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";
+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";
+   }
 }