Changeset 12421 in osm for applications/editors

Timestamp:

2008-12-19T12:14:11+01:00 (16 years ago)

Author:

stoecker

Message:

fixed large picture problem

File:

• applications/editors/josm/plugins/wmsplugin/webkit-image.cpp (modified) (4 diffs)

applications/editors/josm/plugins/wmsplugin/webkit-image.cpp

@@ -8 +8 @@
 */
 #include <QtGui/QApplication>
+#include <QtGui/QPainter>
 #include <QtCore/QFile>
 #include <QtCore/QString>
-#include <QtWebKit/QWebView>
+#include <QtWebKit/QWebPage>
+#include <QtWebKit/QWebFrame>
 
 /* using mingw to set binary mode */
@@ -27 +29 @@
 Q_OBJECT
 public:
-  Save(QWebView *v) : view(v) {};
+  Save(QWebPage *p) : page(p) {};
 
 public slots:
-  void setGeometry(const QRect &r)
-  {
-    view->setGeometry(r);
-  }
   void loaded(bool ok)
   {
     if(ok)
     {
-      QImage im = QPixmap::grabWidget(view).toImage();
+      page->setViewportSize(page->mainFrame()->contentsSize());
+      QImage im(page->viewportSize(), QImage::Format_ARGB32);
+      QPainter painter(&im);
+      page->mainFrame()->render(&painter);
 
       QFile f;
@@ -56 +57 @@
 
 private:
-  QWebView *view;
+  QWebPage * page;
 };
 
@@ -67 +68 @@
   QString url = QString(argv[1]);
 
-  QApplication a( argc, argv );
-  QWebView *view = new QWebView();
-  Save *s = new Save(view);
-  view->resize(WIDTH,WIDTH);
+  QApplication a(argc, argv);
+  QWebPage * page = new QWebPage();
+  Save * s = new Save(page);
 
-  QObject::connect(view, SIGNAL(loadFinished(bool)), s, SLOT(loaded(bool)));
+  QObject::connect(page, SIGNAL(loadFinished(bool)), s, SLOT(loaded(bool)));
   QObject::connect(s, SIGNAL(finish(void)), &a, SLOT(quit()));
-  QObject::connect(view->page(), SIGNAL(geometryChangeRequested(const QRect &)), s, SLOT(setGeometry(const QRect &)));
-  view->load(QUrl(url));
+  page->mainFrame()->load (QUrl(url));
   return a.exec();
 }