scale is the same whatever the level of magnification

pblottiere · pblottiere · commit 95038b143d6d · 2016-05-18T11:42:22.000+02:00
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -316,11 +316,13 @@ void QgsMapCanvas::setMagnificationFactor( double level )
   QgsMapSettings settings = mSettings;
   settings.setRotation( 0.0 );
 
-  QgsRectangle ext = settings.visibleExtent();
-  ext.scale( mMagnificationFactor / level );
-
+  double ratio = mMagnificationFactor / level;
   mMagnificationFactor = level;
 
+  QgsRectangle ext = settings.visibleExtent();
+  ext.scale( ratio );
+
+  mSettings.setOutputDpi( mSettings.outputDpi() / ratio );
   setExtent( ext, true );
 
   refresh();
@@ -694,17 +696,13 @@ void QgsMapCanvas::refreshMap()
 
   mSettings.setExpressionContext( expressionContext );
 
-  // magnify level to use in renderers
-  QgsMapSettings settings = mSettings;
-  settings.setOutputDpi( settings.outputDpi() * mMagnificationFactor );
-
   // create the renderer job
   Q_ASSERT( !mJob );
   mJobCancelled = false;
   if ( mUseParallelRendering )
-    mJob = new QgsMapRendererParallelJob( settings );
+    mJob = new QgsMapRendererParallelJob( mSettings );
   else
-    mJob = new QgsMapRendererSequentialJob( settings );
+    mJob = new QgsMapRendererSequentialJob( mSettings );
   connect( mJob, SIGNAL( finished() ), SLOT( rendererJobFinished() ) );
   mJob->setCache( mCache );
 
