sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-26 00:02:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

cache changed from pointer to object

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@3038 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
rabla 2005-03-29 15:51:49 +00:00
parent 54f22b7f0f
commit 9315995ecc
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qgscomposervectorlegend.cpp
View File

@ -88,7 +88,6 @@ QgsComposerVectorLegend::QgsComposerVectorLegend ( QgsComposition *composition,
// Calc size and cache
recalculate();
cache();
// Add to canvas
setCanvas(mComposition->canvas());
@ -115,7 +114,6 @@ QgsComposerVectorLegend::QgsComposerVectorLegend ( QgsComposition *composition,
// Calc size and cache
recalculate();
cache();
// Add to canvas
setCanvas(mComposition->canvas());
@ -133,7 +131,7 @@ void QgsComposerVectorLegend::init ( void )
mNextLayerGroup = 1;
// Cache
mCachePixmap = new QPixmap();
mCacheUpdated = false;
// Rectangle
QCanvasRectangle::setZ(50);
@ -470,16 +468,16 @@ void QgsComposerVectorLegend::cache ( void )
{
std::cout << "QgsComposerVectorLegend::cache()" << std::endl;
delete mCachePixmap;
mCachePixmap = new QPixmap ( QCanvasRectangle::width(), QCanvasRectangle::height(), -1, QPixmap::BestOptim );
mCachePixmap.resize ( QCanvasRectangle::width(), QCanvasRectangle::height() );
QPainter p(mCachePixmap);
QPainter p(&mCachePixmap);
mCachePixmap->fill(QColor(255,255,255));
mCachePixmap.fill(QColor(255,255,255));
render ( &p );
p.end();
mNumCachedLayers = mMapCanvas->layerCount();
mCacheUpdated = true;
}
void QgsComposerVectorLegend::draw ( QPainter & painter )
@ -500,14 +498,14 @@ void QgsComposerVectorLegend::draw ( QPainter & painter )
if ( plotStyle() == QgsComposition::Preview && mPreviewMode == Cache ) { // Draw from cache
std::cout << "use cache" << std::endl;
if ( mMapCanvas->layerCount() != mNumCachedLayers ) {
if ( !mCacheUpdated || mMapCanvas->layerCount() != mNumCachedLayers ) {
cache();
}
painter.save();
painter.translate ( QCanvasRectangle::x(), QCanvasRectangle::y() );
std::cout << "translate: " << QCanvasRectangle::x() << ", " << QCanvasRectangle::y() << std::endl;
painter.drawPixmap(0,0, *mCachePixmap);
painter.drawPixmap(0,0, mCachePixmap);
painter.restore();
@ -623,8 +621,7 @@ void QgsComposerVectorLegend::recalculate ( void )
QCanvasRectangle::setSize ( r.width(), r.height() );
//setOptions();
cache();
mCacheUpdated = false;
}
void QgsComposerVectorLegend::setOptions ( void )

5
src/qgscomposervectorlegend.h
View File

@ -206,7 +206,10 @@ private:
// NOTE: QCanvasView is slow with bigger images but the spped does not decrease with image size.
// It is very slow, with zoom in in QCanvasView, it seems, that QCanvas is stored as a big image
// with resolution necessary for current zoom and so always a big image mus be redrawn.
QPixmap *mCachePixmap;
QPixmap mCachePixmap;
// Is cache up to date
bool mCacheUpdated;
/** \brief Preview style */
PreviewMode mPreviewMode;