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

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-09-17 14:55:59 -0400 (Wed, 17 Sep 2008)
New Revision: 9344

Modified:
   trunk/qgis/src/core/composer/qgscomposeritem.cpp
   trunk/qgis/src/core/composer/qgscomposerpicture.cpp
Log:
Consider view box of svg pictures in composer, set default frame width to 0.3

Modified: trunk/qgis/src/core/composer/qgscomposeritem.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposeritem.cpp	2008-09-17 16:33:09 UTC (rev 9343)
+++ trunk/qgis/src/core/composer/qgscomposeritem.cpp	2008-09-17 18:55:59 UTC (rev 9344)
@@ -37,7 +37,7 @@
   //set default pen and brush
   setBrush( QBrush( QColor( 255, 255, 255, 255 ) ) );
   QPen defaultPen( QColor( 0, 0, 0 ) );
-  defaultPen.setWidth( 1 );
+  defaultPen.setWidthF( 0.3 );
   setPen( defaultPen );
 
   //let z-Value be managed by composition
@@ -59,7 +59,7 @@
   //set default pen and brush
   setBrush( QBrush( QColor( 255, 255, 255, 255 ) ) );
   QPen defaultPen( QColor( 0, 0, 0 ) );
-  defaultPen.setWidth( 1 );
+  defaultPen.setWidthF( 0.3 );
   setPen( defaultPen );
 
 //let z-Value be managed by composition

Modified: trunk/qgis/src/core/composer/qgscomposerpicture.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposerpicture.cpp	2008-09-17 16:33:09 UTC (rev 9343)
+++ trunk/qgis/src/core/composer/qgscomposerpicture.cpp	2008-09-17 18:55:59 UTC (rev 9344)
@@ -110,7 +110,9 @@
     if ( validTestRenderer.isValid() )
     {
       mMode = SVG;
-      mDefaultSvgSize = validTestRenderer.defaultSize();
+      QRect viewBox = validTestRenderer.viewBox(); //take width/height ratio from view box instead of default size
+      mDefaultSvgSize.setWidth(viewBox.width());
+      mDefaultSvgSize.setHeight(viewBox.height());
       mSvgCacheUpToDate = false;
     }
     else
@@ -138,6 +140,7 @@
 {
   mImage.fill( 0 );
   QPainter p( &mImage );
+  p.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing, true);
   QSvgRenderer theRenderer( mSourceFile.fileName() );
   if ( theRenderer.isValid() )
   {