Show cached content of composer maps in screen resolution after loading from project file

mhugent · mhugent · commit 5e51be26ca8c · 2009-09-26T15:40:24.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@11715 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -65,7 +65,7 @@
 #include <QSizeGrip>
 #include "qgslogger.h"
 
-QgsComposer::QgsComposer( QgisApp *qgis ): QMainWindow()
+QgsComposer::QgsComposer( QgisApp *qgis ): QMainWindow(), mFirstPaint( true )
 {
   setupUi( this );
   setupTheme();
@@ -300,6 +300,27 @@ void QgsComposer::open( void )
   }
 }
 
+void QgsComposer::paintEvent( QPaintEvent* event )
+{
+  QMainWindow::paintEvent( event );
+  //The cached content of the composer maps need to be recreated it is the first paint event of the composer after reading from XML file.
+  //Otherwise the resolution of the composer map is not suitable for screen
+  if ( mFirstPaint )
+  {
+    QMap<QgsComposerItem*, QWidget*>::iterator it = mItemWidgetMap.begin();
+    for ( ; it != mItemWidgetMap.constEnd(); ++it )
+    {
+      QgsComposerMap* cm = dynamic_cast<QgsComposerMap*>( it.key() );
+      if ( cm )
+      {
+        cm->cache();
+        cm->update();
+      }
+    }
+    mFirstPaint = false;
+  }
+}
+
 void QgsComposer::activate()
 {
   raise();
@@ -1352,3 +1373,5 @@ void QgsComposer::cleanupAfterTemplateRead()
     }
   }
 }
+
+
diff --git a/src/app/composer/qgscomposer.h b/src/app/composer/qgscomposer.h
@@ -224,6 +224,10 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
 
     void setSelectionTool();
 
+  protected:
+
+    void paintEvent( QPaintEvent* event );
+
   private slots:
 
     //! Raise, unminimize and activate this window
@@ -283,6 +287,9 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
     QAction *mWindowAction;
 #endif
 
+    /**False if first paint already happened (used to create cache of composer maps for screen resolution after reading from project files)*/
+    bool mFirstPaint;
+
     //! Help context id
     static const int context_id = 985715179;
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@`
`65`	`65`	`#include <QSizeGrip>`
`66`	`66`	`#include "qgslogger.h"`
`67`	`67`
`68`		`-QgsComposer::QgsComposer( QgisApp *qgis ): QMainWindow()`
	`68`	`+QgsComposer::QgsComposer( QgisApp *qgis ): QMainWindow(), mFirstPaint( true )`
`69`	`69`	`{`
`70`	`70`	`setupUi( this );`
`71`	`71`	`setupTheme();`
`@@ -300,6 +300,27 @@ void QgsComposer::open( void )`
`300`	`300`	`}`
`301`	`301`	`}`
`302`	`302`
	`303`	`+void QgsComposer::paintEvent( QPaintEvent* event )`
	`304`	`+{`
	`305`	`+ QMainWindow::paintEvent( event );`
	`306`	`+ //The cached content of the composer maps need to be recreated it is the first paint event of the composer after reading from XML file.`
	`307`	`+ //Otherwise the resolution of the composer map is not suitable for screen`
	`308`	`+ if ( mFirstPaint )`
	`309`	`+ {`
	`310`	`+ QMap<QgsComposerItem, QWidget>::iterator it = mItemWidgetMap.begin();`
	`311`	`+ for ( ; it != mItemWidgetMap.constEnd(); ++it )`
	`312`	`+ {`
	`313`	`+ QgsComposerMap* cm = dynamic_cast<QgsComposerMap*>( it.key() );`
	`314`	`+ if ( cm )`
	`315`	`+ {`
	`316`	`+ cm->cache();`
	`317`	`+ cm->update();`
	`318`	`+ }`
	`319`	`+ }`
	`320`	`+ mFirstPaint = false;`
	`321`	`+ }`
	`322`	`+}`
	`323`	`+`
`303`	`324`	`void QgsComposer::activate()`
`304`	`325`	`{`
`305`	`326`	`raise();`
`@@ -1352,3 +1373,5 @@ void QgsComposer::cleanupAfterTemplateRead()`
`1352`	`1373`	`}`
`1353`	`1374`	`}`
`1354`	`1375`	`}`
	`1376`	`+`
	`1377`	`+`