Fix diagram scaling for print

Marco Hugentobler · m-kuhn · commit 8f891c5e7422 · 2012-08-31T17:10:44.000+02:00
diff --git a/src/core/qgsdiagramrendererv2.cpp b/src/core/qgsdiagramrendererv2.cpp
@@ -283,13 +283,7 @@ void QgsDiagramRendererV2::convertSizeToMapUnits( QSizeF& size, const QgsRenderC
     return;
   }
 
-  int dpi = dpiPaintDevice( context.constPainter() );
-  if ( dpi < 0 )
-  {
-    return;
-  }
-
-  double pixelToMap = dpi / 25.4 * context.mapToPixel().mapUnitsPerPixel();
+  double pixelToMap = context.scaleFactor() * context.mapToPixel().mapUnitsPerPixel();
   size.rwidth() *= pixelToMap;
   size.rheight() *= pixelToMap;
 }

Original file line number	Diff line number	Diff line change
`@@ -283,13 +283,7 @@ void QgsDiagramRendererV2::convertSizeToMapUnits( QSizeF& size, const QgsRenderC`
`283`	`283`	`return;`
`284`	`284`	`}`
`285`	`285`
`286`		`- int dpi = dpiPaintDevice( context.constPainter() );`
`287`		`- if ( dpi < 0 )`
`288`		`- {`
`289`		`- return;`
`290`		`- }`
`291`		`-`
`292`		`- double pixelToMap = dpi / 25.4 * context.mapToPixel().mapUnitsPerPixel();`
	`286`	`+ double pixelToMap = context.scaleFactor() * context.mapToPixel().mapUnitsPerPixel();`
`293`	`287`	`size.rwidth() *= pixelToMap;`
`294`	`288`	`size.rheight() *= pixelToMap;`
`295`	`289`	`}`