sizePainterUnits: Calculate based on specified size instead of size in QgsDiagramSettings

m-kuhn · m-kuhn · commit aa31c8c6ba11 · 2012-09-03T10:47:21.000+02:00
diff --git a/src/core/diagram/qgsdiagram.cpp b/src/core/diagram/qgsdiagram.cpp
@@ -33,14 +33,13 @@ void QgsDiagram::setPenWidth( QPen& pen, const QgsDiagramSettings& s, const QgsR
 
 QSizeF QgsDiagram::sizePainterUnits( const QSizeF& size, const QgsDiagramSettings& s, const QgsRenderContext& c )
 {
-  Q_UNUSED( size );
   if ( s.sizeType == QgsDiagramSettings::MM )
   {
-    return QSizeF( s.size.width() * c.scaleFactor() * c.rasterScaleFactor(), s.size.height() * c.scaleFactor() * c.rasterScaleFactor());
+    return QSizeF( size.width() * c.scaleFactor() * c.rasterScaleFactor(), size.height() * c.scaleFactor() * c.rasterScaleFactor());
   }
   else
   {
-    return QSizeF( s.size.width() / c.mapToPixel().mapUnitsPerPixel(), s.size.height() / c.mapToPixel().mapUnitsPerPixel() );
+    return QSizeF( size.width() / c.mapToPixel().mapUnitsPerPixel(), size.height() / c.mapToPixel().mapUnitsPerPixel() );
   }
 }
 
diff --git a/src/core/diagram/qgsdiagram.h b/src/core/diagram/qgsdiagram.h
@@ -50,8 +50,8 @@ class CORE_EXPORT QgsDiagram
     void setPenWidth( QPen& pen, const QgsDiagramSettings& s, const QgsRenderContext& c );
 
     /** Calculates a size to match the current settings and rendering context
-     *  @param size Unused
-     *  @param s    The settings that specify the diagram size
+     *  @param size The size to convert
+     *  @param s    The settings that specify the size type
      *  @param c    The rendering specifying the proper scale units for pixel conversion
      *
      *  @return The converted size for rendering

Original file line number	Diff line number	Diff line change
`@@ -33,14 +33,13 @@ void QgsDiagram::setPenWidth( QPen& pen, const QgsDiagramSettings& s, const QgsR`
`33`	`33`
`34`	`34`	`QSizeF QgsDiagram::sizePainterUnits( const QSizeF& size, const QgsDiagramSettings& s, const QgsRenderContext& c )`
`35`	`35`	`{`
`36`		`- Q_UNUSED( size );`
`37`	`36`	`if ( s.sizeType == QgsDiagramSettings::MM )`
`38`	`37`	`{`
`39`		`- return QSizeF( s.size.width() * c.scaleFactor() * c.rasterScaleFactor(), s.size.height() * c.scaleFactor() * c.rasterScaleFactor());`
	`38`	`+ return QSizeF( size.width() * c.scaleFactor() * c.rasterScaleFactor(), size.height() * c.scaleFactor() * c.rasterScaleFactor());`
`40`	`39`	`}`
`41`	`40`	`else`
`42`	`41`	`{`
`43`		`- return QSizeF( s.size.width() / c.mapToPixel().mapUnitsPerPixel(), s.size.height() / c.mapToPixel().mapUnitsPerPixel() );`
	`42`	`+ return QSizeF( size.width() / c.mapToPixel().mapUnitsPerPixel(), size.height() / c.mapToPixel().mapUnitsPerPixel() );`
`44`	`43`	`}`
`45`	`44`	`}`
`46`	`45`