[QGIS Commit] r9185 - in trunk/qgis/src: core plugins

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-08-27 05:43:20 -0400 (Wed, 27 Aug 2008)
New Revision: 9185

Modified:
   trunk/qgis/src/core/qgslabel.cpp
   trunk/qgis/src/core/qgslabel.h
   trunk/qgis/src/core/qgsvectorlayer.cpp
   trunk/qgis/src/plugins/CMakeLists.txt
Log:
Some fixes for font scaling

Modified: trunk/qgis/src/core/qgslabel.cpp
===================================================================
--- trunk/qgis/src/core/qgslabel.cpp	2008-08-27 08:03:17 UTC (rev 9184)
+++ trunk/qgis/src/core/qgslabel.cpp	2008-08-27 09:43:20 UTC (rev 9185)
@@ -150,12 +150,15 @@
   {
     size *= scale;
   }
-  else
+  else //point units
   {
-    size *= sizeScale;
+    double sizeMM = size * 0.3527;
+    size = sizeMM * sizeScale;
   }
   if ( size > 0.0 )
-    font.setPointSizeF( size );
+    {
+      font.setPixelSize(size);
+    }
 
   value = fieldValue( Color, feature );
   if ( value.isEmpty() )
@@ -237,6 +240,7 @@
     width = fm.width( text );
     height = fm.height();
   }
+
   int dx = 0;
   int dy = 0;
 
@@ -313,12 +317,17 @@
     yoffset = value.toDouble();
   }
 
-  // recalc offset to points
+  // recalc offset to pixels
   if ( mLabelAttributes->offsetType() == QgsLabelAttributes::MapUnits )
   {
     xoffset *= scale;
     yoffset *= scale;
   }
+  else
+    {
+      xoffset = xoffset * 0.3527 * sizeScale;
+      yoffset = yoffset * 0.3527 * sizeScale;
+    }
 
   // Angle
   double ang;
@@ -340,7 +349,7 @@
   {
     renderLabel( painter, overridePoint, coordinateTransform,
                  transform, text, font, pen, dx, dy,
-                 xoffset, yoffset, ang, width, height, alignment );
+                 xoffset, yoffset, ang, width, height, alignment, sizeScale );
   }
   else
   {
@@ -350,7 +359,7 @@
     {
       renderLabel( painter, points[i], coordinateTransform,
                    transform, text, font, pen, dx, dy,
-                   xoffset, yoffset, ang, width, height, alignment );
+                   xoffset, yoffset, ang, width, height, alignment, sizeScale );
     }
   }
 }
@@ -362,7 +371,7 @@
                             int dx, int dy,
                             double xoffset, double yoffset,
                             double ang,
-                            int width, int height, int alignment )
+                            int width, int height, int alignment, double sizeScale )
 {
   // Convert point to projected units
   if ( coordinateTransform )
@@ -399,23 +408,36 @@
   //
   if ( mLabelAttributes->bufferSizeIsSet() && mLabelAttributes->bufferEnabled() )
   {
-    int myBufferSize = static_cast<int>( mLabelAttributes->bufferSize() );
+    int myBufferSize = static_cast<int>( mLabelAttributes->bufferSize() * 0.3527 * sizeScale);
+    QPen bufferPen;
     if ( mLabelAttributes->bufferColorIsSet() )
     {
-      painter->setPen( mLabelAttributes->bufferColor() );
+      bufferPen.setColor( mLabelAttributes->bufferColor());
     }
     else //default to a white buffer
     {
-      painter->setPen( Qt::white );
+      bufferPen.setColor( Qt::white );
     }
-    for ( int i = dx - myBufferSize; i <= dx + myBufferSize; i++ )
+    painter->setPen(bufferPen);
+
+    double bufferStepSize; //hack to distinguish pixel devices from logical devices
+    if((sizeScale - 1) > 1.5)
+      {
+	bufferStepSize = 1;
+      }
+    else //draw more dense in case of logical devices
+      {
+	bufferStepSize = 0.25;
+      }
+
+    for ( double i = dx - myBufferSize; i <= dx + myBufferSize; i+= 0.25)
     {
-      for ( int j = dy - myBufferSize; j <= dy + myBufferSize; j++ )
+      for ( double j = dy - myBufferSize; j <= dy + myBufferSize; j+= 0.25 )
       {
         if ( mLabelAttributes->multilineEnabled() )
-          painter->drawText( i , j - height, width, height, alignment, text );
+          painter->drawText( QRectF(i , j - height, width, height), alignment, text );
         else
-          painter->drawText( i , j, text );
+          painter->drawText( QPointF(i , j), text );
       }
     }
   }

Modified: trunk/qgis/src/core/qgslabel.h
===================================================================
--- trunk/qgis/src/core/qgslabel.h	2008-08-27 08:03:17 UTC (rev 9184)
+++ trunk/qgis/src/core/qgslabel.h	2008-08-27 09:43:20 UTC (rev 9185)
@@ -134,7 +134,7 @@
                       int dx, int dy,
                       double xoffset, double yoffset,
                       double ang,
-                      int width, int height, int alignment );
+                      int width, int height, int alignment, double sizeScale=1.0 );
 
     /** Get label point for simple feature in map units */
     void labelPoint( std::vector<QgsPoint>&, QgsFeature &feature );

Modified: trunk/qgis/src/core/qgsvectorlayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.cpp	2008-08-27 08:03:17 UTC (rev 9184)
+++ trunk/qgis/src/core/qgsvectorlayer.cpp	2008-08-27 09:43:20 UTC (rev 9185)
@@ -286,7 +286,7 @@
   {
     return;
   }
-  drawLabels( thePainter, rendererContext.extent(), &( rendererContext.mapToPixel() ), rendererContext.coordinateTransform(), 1.0 / rendererContext.rasterScaleFactor() );
+  drawLabels( thePainter, rendererContext.extent(), &( rendererContext.mapToPixel() ), rendererContext.coordinateTransform(), rendererContext.scaleFactor());
 }
 
 // NOTE this is a temporary method added by Tim to prevent label clipping

Modified: trunk/qgis/src/plugins/CMakeLists.txt
===================================================================
--- trunk/qgis/src/plugins/CMakeLists.txt	2008-08-27 08:03:17 UTC (rev 9184)
+++ trunk/qgis/src/plugins/CMakeLists.txt	2008-08-27 09:43:20 UTC (rev 9185)
@@ -22,3 +22,5 @@
 
 
 SUBDIRS (coordinate_capture dxf2shp_converter) 
+
+SUBDIRS (ogr_converter)