Use QImage in QgsMapCanvasMap by default, QImage was set by default from GUI, only if a user applied options from gui, otherwise QPixmap (8x slower) was used)

blazek · blazek · commit 6e1d38c13969 · 2011-11-27T12:44:38.000+01:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1668,7 +1668,7 @@ void QgisApp::createOverview()
   QSettings mySettings;
   // Anti Aliasing enabled by default as of QGIS 1.7
   mMapCanvas->enableAntiAliasing( mySettings.value( "/qgis/enable_anti_aliasing", true ).toBool() );
-  mMapCanvas->useImageToRender( mySettings.value( "/qgis/use_qimage_to_render", false ).toBool() );
+  mMapCanvas->useImageToRender( mySettings.value( "/qgis/use_qimage_to_render", true ).toBool() );
 
   int action = mySettings.value( "/qgis/wheel_action", 0 ).toInt();
   double zoomFactor = mySettings.value( "/qgis/zoom_factor", 2 ).toDouble();
diff --git a/src/gui/qgsmapcanvasmap.cpp b/src/gui/qgsmapcanvasmap.cpp
@@ -26,7 +26,7 @@ QgsMapCanvasMap::QgsMapCanvasMap( QgsMapCanvas* canvas )
   setZValue( -10 );
   setPos( 0, 0 );
   resize( QSize( 1, 1 ) );
-  mUseQImageToRender = false;
+  mUseQImageToRender = true;
 }
 
 void QgsMapCanvasMap::paint( QPainter* p, const QStyleOptionGraphicsItem*, QWidget* )
@@ -60,6 +60,7 @@ void QgsMapCanvasMap::setPanningOffset( const QPoint& point )
 
 void QgsMapCanvasMap::render()
 {
+  QgsDebugMsg( QString( "mUseQImageToRender = %1" ).arg( mUseQImageToRender ) );
   if ( mUseQImageToRender )
   {
     // use temporary image for rendering

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ QgsMapCanvasMap::QgsMapCanvasMap( QgsMapCanvas* canvas )`
`26`	`26`	`setZValue( -10 );`
`27`	`27`	`setPos( 0, 0 );`
`28`	`28`	`resize( QSize( 1, 1 ) );`
`29`		`- mUseQImageToRender = false;`
	`29`	`+ mUseQImageToRender = true;`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`void QgsMapCanvasMap::paint( QPainter* p, const QStyleOptionGraphicsItem, QWidget )`
`@@ -60,6 +60,7 @@ void QgsMapCanvasMap::setPanningOffset( const QPoint& point )`
`60`	`60`
`61`	`61`	`void QgsMapCanvasMap::render()`
`62`	`62`	`{`
	`63`	`+ QgsDebugMsg( QString( "mUseQImageToRender = %1" ).arg( mUseQImageToRender ) );`
`63`	`64`	`if ( mUseQImageToRender )`
`64`	`65`	`{`
`65`	`66`	`// use temporary image for rendering`