[QGIS Commit] r12188 - trunk/qgis/src/core/composer

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2009-11-19 06:42:41 -0500 (Thu, 19 Nov 2009)
New Revision: 12188

Modified:
   trunk/qgis/src/core/composer/qgscomposerlegend.cpp
   trunk/qgis/src/core/composer/qgscomposerpicture.cpp
Log:
Use flat caps for line symbols in composer legend

Modified: trunk/qgis/src/core/composer/qgscomposerlegend.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposerlegend.cpp	2009-11-19 11:22:20 UTC (rev 12187)
+++ trunk/qgis/src/core/composer/qgscomposerlegend.cpp	2009-11-19 11:42:41 UTC (rev 12188)
@@ -75,7 +75,7 @@
   {
     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 @@
     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();

Modified: trunk/qgis/src/core/composer/qgscomposerpicture.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposerpicture.cpp	2009-11-19 11:22:20 UTC (rev 12187)
+++ trunk/qgis/src/core/composer/qgscomposerpicture.cpp	2009-11-19 11:42:41 UTC (rev 12188)
@@ -101,11 +101,6 @@
     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();