Merge branch 'master' of github.com:qgis/Quantum-GIS

etiennesky · etiennesky · commit 126932f09d79 · 2012-08-28T13:31:49.000-03:00
diff --git a/src/core/qgsdiagramrendererv2.cpp b/src/core/qgsdiagramrendererv2.cpp
@@ -184,13 +184,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
`@@ -184,13 +184,7 @@ void QgsDiagramRendererV2::convertSizeToMapUnits( QSizeF& size, const QgsRenderC`
`184`	`184`	`return;`
`185`	`185`	`}`
`186`	`186`
`187`		`- int dpi = dpiPaintDevice( context.constPainter() );`
`188`		`- if ( dpi < 0 )`
`189`		`- {`
`190`		`- return;`
`191`		`- }`
`192`		`-`
`193`		`- double pixelToMap = dpi / 25.4 * context.mapToPixel().mapUnitsPerPixel();`
	`187`	`+ double pixelToMap = context.scaleFactor() * context.mapToPixel().mapUnitsPerPixel();`
`194`	`188`	`size.rwidth() *= pixelToMap;`
`195`	`189`	`size.rheight() *= pixelToMap;`
`196`	`190`	`}`