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

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2009-08-12 02:47:32 -0400 (Wed, 12 Aug 2009)
New Revision: 11349

Modified:
   trunk/qgis/src/core/composer/qgscomposeritem.cpp
   trunk/qgis/src/core/composer/qgscomposermap.cpp
Log:
Fixed reading of frame width from composer items and drawing of frame for composer map

Modified: trunk/qgis/src/core/composer/qgscomposeritem.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposeritem.cpp	2009-08-12 00:49:53 UTC (rev 11348)
+++ trunk/qgis/src/core/composer/qgscomposeritem.cpp	2009-08-12 06:47:32 UTC (rev 11349)
@@ -210,7 +210,9 @@
   {
     QDomElement frameColorElem = frameColorList.at( 0 ).toElement();
     bool redOk, greenOk, blueOk, alphaOk, widthOk;
-    int penRed, penGreen, penBlue, penAlpha, penWidth;
+    int penRed, penGreen, penBlue, penAlpha;
+    double penWidth;
+
     penWidth = itemElem.attribute( "outlineWidth" ).toDouble( &widthOk );
     penRed = frameColorElem.attribute( "red" ).toDouble( &redOk );
     penGreen = frameColorElem.attribute( "green" ).toDouble( &greenOk );
@@ -219,7 +221,7 @@
     if ( redOk && greenOk && blueOk && alphaOk && widthOk )
     {
       QPen framePen( QColor( penRed, penGreen, penBlue, penAlpha ) );
-      framePen.setWidth( penWidth );
+      framePen.setWidthF( penWidth );
       setPen( framePen );
     }
   }

Modified: trunk/qgis/src/core/composer/qgscomposermap.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposermap.cpp	2009-08-12 00:49:53 UTC (rev 11348)
+++ trunk/qgis/src/core/composer/qgscomposermap.cpp	2009-08-12 06:47:32 UTC (rev 11349)
@@ -242,6 +242,8 @@
     mDrawing = false;
   }
 
+  painter->setClipRect( thisPaintRect , Qt::NoClip);
+
   drawFrame( painter );
   if ( isSelected() )
   {