Fix for bug #1347, no label buffers in composer image output

mhugent · mhugent · commit 49eeb8a1d8db · 2008-10-25T13:02:21.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@9545 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgslabel.cpp b/src/core/qgslabel.cpp
@@ -408,7 +408,7 @@ void QgsLabel::renderLabel( QPainter* painter, QgsPoint point,
   //
   if ( mLabelAttributes->bufferSizeIsSet() && mLabelAttributes->bufferEnabled() )
   {
-    int myBufferSize = static_cast<int>( mLabelAttributes->bufferSize() * 0.3527 * sizeScale );
+    double myBufferSize = mLabelAttributes->bufferSize() * 0.3527 * sizeScale;
     QPen bufferPen;
     if ( mLabelAttributes->bufferColorIsSet() )
     {
@@ -427,12 +427,12 @@ void QgsLabel::renderLabel( QPainter* painter, QgsPoint point,
     }
     else //draw more dense in case of logical devices
     {
-      bufferStepSize = 0.25;
+      bufferStepSize = 0.1;
     }
 
-    for ( double i = dx - myBufferSize; i <= dx + myBufferSize; i += 0.25 )
+    for ( double i = dx - myBufferSize; i <= dx + myBufferSize; i += bufferStepSize )
     {
-      for ( double j = dy - myBufferSize; j <= dy + myBufferSize; j += 0.25 )
+      for ( double j = dy - myBufferSize; j <= dy + myBufferSize; j += bufferStepSize )
       {
         if ( mLabelAttributes->multilineEnabled() )
           painter->drawText( QRectF( i, j - height, width, height ), alignment, text );

Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,7 @@ void QgsLabel::renderLabel( QPainter* painter, QgsPoint point,`
`408`	`408`	`//`
`409`	`409`	`if ( mLabelAttributes->bufferSizeIsSet() && mLabelAttributes->bufferEnabled() )`
`410`	`410`	`{`
`411`		`- int myBufferSize = static_cast<int>( mLabelAttributes->bufferSize() * 0.3527 * sizeScale );`
	`411`	`+ double myBufferSize = mLabelAttributes->bufferSize() * 0.3527 * sizeScale;`
`412`	`412`	`QPen bufferPen;`
`413`	`413`	`if ( mLabelAttributes->bufferColorIsSet() )`
`414`	`414`	`{`
`@@ -427,12 +427,12 @@ void QgsLabel::renderLabel( QPainter* painter, QgsPoint point,`
`427`	`427`	`}`
`428`	`428`	`else //draw more dense in case of logical devices`
`429`	`429`	`{`
`430`		`- bufferStepSize = 0.25;`
	`430`	`+ bufferStepSize = 0.1;`
`431`	`431`	`}`
`432`	`432`
`433`		`- for ( double i = dx - myBufferSize; i <= dx + myBufferSize; i += 0.25 )`
	`433`	`+ for ( double i = dx - myBufferSize; i <= dx + myBufferSize; i += bufferStepSize )`
`434`	`434`	`{`
`435`		`- for ( double j = dy - myBufferSize; j <= dy + myBufferSize; j += 0.25 )`
	`435`	`+ for ( double j = dy - myBufferSize; j <= dy + myBufferSize; j += bufferStepSize )`
`436`	`436`	`{`
`437`	`437`	`if ( mLabelAttributes->multilineEnabled() )`
`438`	`438`	`painter->drawText( QRectF( i, j - height, width, height ), alignment, text );`