QImage is optimized for IO, as states QT documentation,
and operation like drawing one QImage to another or
drawing QImage to screen are very slow, especially when
pixel format of QImage not same as screen (on my system
pixel format of screen is rgb32, but qlandkarte use
QImage::Format_ARGB32_Premultiplied).
Using QPixmap speeds up paintEvent handler, before this
patch time of CCanvas::paintEvent was ~85ms, after - ~2.5ms.
Update rate is still not high, about 40FPS, because
of qt events, but map moves more smoothly.
---
src/CMapOSM.cpp | 8 ++++----
src/CMapOSM.h | 5 +++--
src/COsmTilesHash.cpp | 16 ++++++++++------
src/COsmTilesHash.h | 8 ++++----
4 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/CMapOSM.cpp b/src/CMapOSM.cpp
index 5c25462..c9cb2d7 100644
--- a/src/CMapOSM.cpp
+++ b/src/CMapOSM.cpp
@@ -216,7 +216,7 @@ void CMapOSM::setNewTileUrl(int cbIndex)
}
osmTiles = new COsmTilesHash(tileList.at(index).path);
-
connect(osmTiles,SIGNAL(newImageReady(QImage,bool)),this,SLOT(newImageReady(QImage,bool)));
+
connect(osmTiles,SIGNAL(newImageReady(QPixmap,bool)),this,SLOT(newImageReady(QPixmap,bool)));
needsRedraw = true;
emit sigChanged();
@@ -370,7 +370,7 @@ void CMapOSM::draw(QPainter& p)
draw();
}
- p.drawImage(0,0,buffer);
+ p.drawPixmap(0, 0, image);
// render overlay
if(!ovlMap.isNull() && lastTileLoaded && !doFastDraw)
@@ -437,9 +437,9 @@ void CMapOSM::draw()
}
-void CMapOSM::newImageReady(QImage image, bool done)
+void CMapOSM::newImageReady(QPixmap image, bool done)
{
- buffer = image;
+ this->image = image;
lastTileLoaded = done;
needsRedraw = false;
emit sigChanged();
diff --git a/src/CMapOSM.h b/src/CMapOSM.h
index 6b7e2f8..2a44081 100644
--- a/src/CMapOSM.h
+++ b/src/CMapOSM.h
@@ -21,6 +21,7 @@
#define CMAPOSM_H
#include <IMap.h>
+#include <QPixmap>
#include "CMapOSMType.h"
class COsmTilesHash;
@@ -49,14 +50,14 @@ class CMapOSM : public IMap
bool rebuildServerList();
public slots:
- void newImageReady(QImage image, bool lastTileLoaded);
+ void newImageReady(QPixmap image, bool lastTileLoaded);
void setNewTileUrl(int cbIndex = -1);
private:
QComboBox *cb;
QWidget *parent;
int currentTileListIndex;
QList<CMapOSMType> tileList;
- QImage image;
+ QPixmap image;
bool lastTileLoaded;
void draw();
COsmTilesHash *osmTiles;
diff --git a/src/COsmTilesHash.cpp b/src/COsmTilesHash.cpp
index 3455cc0..7471f36 100644
--- a/src/COsmTilesHash.cpp
+++ b/src/COsmTilesHash.cpp
@@ -183,7 +183,7 @@ void COsmTilesHash::startNewDrawing( double lon, double
lat, int osm_zoom, const
//qDebug() << xCount << yCount << window;
- image = QImage(window.size(),QImage::Format_ARGB32_Premultiplied);
+ image = QPixmap(window.size());
image.fill(Qt::white);
for(int x=0; x<xCount; x++)
{
@@ -212,7 +212,7 @@ void COsmTilesHash::getImage(int osm_zoom, int osm_x, int
osm_y, QPoint point)
if (tiles.contains(osmUrlPart))
{
QPainter p(&image);
- p.drawImage(point,tiles.value(osmUrlPart));
+ p.drawPixmap(point,tiles.value(osmUrlPart));
#ifdef COSMTILESHASHDEBUG
p.drawRect(QRect(point,QSize(255,255)));
p.drawText(point + QPoint(10,10), "cached " + osmUrlPart);
@@ -229,9 +229,11 @@ void COsmTilesHash::getImage(int osm_zoom, int osm_x, int
osm_y, QPoint point)
if(img1.format() != QImage::Format_Invalid)
{
+ QPixmap pix1(img1.size());
+ pix1.convertFromImage(img1);
QPainter p(&image);
- p.drawImage(point,img1);
- tiles.insert(osmUrlPart,img1);
+ p.drawPixmap(point,pix1);
+ tiles.insert(osmUrlPart,pix1);
int days =
QFileInfo(osmFilePath).lastModified().daysTo(QDateTime::currentDateTime());
if ( days < 8)
{
@@ -309,10 +311,12 @@ void COsmTilesHash::slotRequestFinished(int id, bool
error)
img1.save ( &f);
}
- tiles.insert(osmUrlPart,img1);
+ QPixmap pix1(img1.size());
+ pix1.convertFromImage(img1);
+ tiles.insert(osmUrlPart,pix1);
// if (osmUrlPart.startsWith(QString("/%1/").arg(osm_zoom))) {
QPainter p(&image);
- p.drawImage(startPointHash.value(id),img1);
+ p.drawPixmap(startPointHash.value(id),pix1);
#ifdef COSMTILESHASHDEBUG
p.drawRect(QRect(startPointHash.value(id),QSize(255,255)));
p.drawText(startPointHash.value(id) + QPoint(10,10), QString::number(id) +
osmUrlPartHash.value(id));
diff --git a/src/COsmTilesHash.h b/src/COsmTilesHash.h
index f5f6e8f..5ee7d68 100644
--- a/src/COsmTilesHash.h
+++ b/src/COsmTilesHash.h
@@ -20,7 +20,7 @@
#include <QString>
#include <QRect>
#include <QPainter>
-#include <QImage>
+#include <QPixmap>
#include <QHash>
class QHttp;
@@ -34,7 +34,7 @@ class COsmTilesHash: public QObject
void startNewDrawing( double lon, double lat, int osm_zoom, const
QRect& window);
static const QString &getCacheFolder(void) { return cacheFolder; };
signals:
- void newImageReady(QImage image, bool lastTileLoaded);
+ void newImageReady(QPixmap image, bool lastTileLoaded);
private:
QString tileServer;
QString tileUrlPart;
@@ -48,12 +48,12 @@ class COsmTilesHash: public QObject
double tile2long(int x, int zoom);
double tile2lat(int y, int zoom);
void getImage(int osm_zoom, int osm_x, int osm_y, QPoint startPoint);
- QImage image;
+ QPixmap image;
QHttp *tilesConnection;
// CMapOSM *cmapOSM;
QString osmTileBaseUrl;
bool requestInProgress;
- QHash<QString,QImage> tiles;
+ QHash<QString,QPixmap> tiles;
int getid;
static QString cacheFolder;
private slots:
--
1.7.6.4
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2d-oct
_______________________________________________
Qlandkartegt-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/qlandkartegt-users
