Use flat caps for line symbols in composer legend

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12188 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: mhugent

src/core/composer/qgscomposerlegend.cpp

@@ -75,7 +75,7 @@ QSizeF QgsComposerLegend::paintAndDetermineSize( QPainter* painter )
   {
     painter->save();
     drawBackground( painter );
-    painter->setPen( QPen( QColor( 0, 0, 0 ) ) ); //draw all text black
+    painter->setPen( QPen( QColor( 0, 0, 0 ) ) );
   }
 
   int numLayerItems = rootItem->rowCount();
@@ -326,6 +326,7 @@ void QgsComposerLegend::drawLineSymbol( QPainter* p, QgsSymbol* s, double curren
     QColor penColor = symbolPen.color();
     penColor.setAlpha( opacity );
     symbolPen.setColor( penColor );
+    symbolPen.setCapStyle( Qt::FlatCap );
     p->setPen( symbolPen );
     p->drawLine( QPointF( currentXPosition, yCoord ), QPointF( currentXPosition + mSymbolWidth, yCoord ) );
     p->restore();

src/core/composer/qgscomposerpicture.cpp

@@ -101,11 +101,6 @@ void QgsComposerPicture::paint( QPainter* painter, const QStyleOptionGraphicsIte
     painter->rotate( mRotation );
     painter->translate( -rotatedBoundImageWidthMM / 2.0, -rotatedBoundImageHeightMM / 2.0 );
 
-    /*if ( mComposition && mComposition->plotStyle() == QgsComposition::Preview )
-    {
-      rotatedBoundImageWidthMM /= std::min( viewScaleFactor, 10.0 );
-      rotatedBoundImageHeightMM /= std::min( viewScaleFactor, 10.0 );
-    }*/
     painter->drawImage( QRectF( 0, 0, rotatedBoundImageWidthMM,  rotatedBoundImageHeightMM ), mImage, QRectF( 0, 0, mImage.width(), mImage.height() ) );
 
     painter->restore();