Revert "Fix label word and letter spacing cannot be decimals"

nyalldawson · nyalldawson · commit cd33ccf7f6e1 · 2016-07-20T19:44:20.000+10:00
This reverts commit 48f090c. Causes issues with font sizes/spacing
diff --git a/python/core/qgspallabeling.sip b/python/core/qgspallabeling.sip
@@ -639,7 +639,7 @@ class QgsPalLayerSettings
      * @param mapUnitScale a mapUnitScale clamper
      * @return font pixel size
      */
-    double sizeToPixel( double size, const QgsRenderContext& c, SizeUnit unit, bool rasterfactor = false, const QgsMapUnitScale& mapUnitScale = QgsMapUnitScale() ) const;
+    int sizeToPixel( double size, const QgsRenderContext& c, SizeUnit unit, bool rasterfactor = false, const QgsMapUnitScale& mapUnitScale = QgsMapUnitScale() ) const;
 
     /** Calculates size (considering output size should be in pixel or map units, scale factors and optionally oversampling)
      * @param size size to convert
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -2223,7 +2223,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, QgsRenderContext &cont
     return;
   }
 
-  int fontPixelSize = qRound( sizeToPixel( fontSize, context, fontunits, true, fontSizeMapUnitScale ) );
+  int fontPixelSize = sizeToPixel( fontSize, context, fontunits, true, fontSizeMapUnitScale );
   // don't try to show font sizes less than 1 pixel (Qt complains)
   if ( fontPixelSize < 1 )
   {
@@ -3874,9 +3874,9 @@ void QgsPalLayerSettings::parseDropShadow( QgsRenderContext &context )
   dataDefinedValEval( DDBlendMode, QgsPalLayerSettings::ShadowBlendMode, exprVal, context.expressionContext() );
 }
 
-double QgsPalLayerSettings::sizeToPixel( double size, const QgsRenderContext& c, SizeUnit unit, bool rasterfactor, const QgsMapUnitScale& mapUnitScale ) const
+int QgsPalLayerSettings::sizeToPixel( double size, const QgsRenderContext& c, SizeUnit unit, bool rasterfactor, const QgsMapUnitScale& mapUnitScale ) const
 {
-  return scaleToPixelContext( size, c, unit, rasterfactor, mapUnitScale ) + 0.5;
+  return static_cast< int >( scaleToPixelContext( size, c, unit, rasterfactor, mapUnitScale ) + 0.5 );
 }
 
 double QgsPalLayerSettings::scaleToPixelContext( double size, const QgsRenderContext& c, SizeUnit unit, bool rasterfactor, const QgsMapUnitScale& mapUnitScale ) const
diff --git a/src/core/qgspallabeling.h b/src/core/qgspallabeling.h
@@ -625,7 +625,7 @@ class CORE_EXPORT QgsPalLayerSettings
      * @param mapUnitScale a mapUnitScale clamper
      * @return font pixel size
      */
-    double sizeToPixel( double size, const QgsRenderContext& c, SizeUnit unit, bool rasterfactor = false, const QgsMapUnitScale& mapUnitScale = QgsMapUnitScale() ) const;
+    int sizeToPixel( double size, const QgsRenderContext& c, SizeUnit unit, bool rasterfactor = false, const QgsMapUnitScale& mapUnitScale = QgsMapUnitScale() ) const;
 
     /** Calculates size (considering output size should be in pixel or map units, scale factors and optionally oversampling)
      * @param size size to convert

Original file line number	Diff line number	Diff line change
`@@ -2223,7 +2223,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, QgsRenderContext &cont`
`2223`	`2223`	`return;`
`2224`	`2224`	`}`
`2225`	`2225`
`2226`		`- int fontPixelSize = qRound( sizeToPixel( fontSize, context, fontunits, true, fontSizeMapUnitScale ) );`
	`2226`	`+ int fontPixelSize = sizeToPixel( fontSize, context, fontunits, true, fontSizeMapUnitScale );`
`2227`	`2227`	`// don't try to show font sizes less than 1 pixel (Qt complains)`
`2228`	`2228`	`if ( fontPixelSize < 1 )`
`2229`	`2229`	`{`
`@@ -3874,9 +3874,9 @@ void QgsPalLayerSettings::parseDropShadow( QgsRenderContext &context )`
`3874`	`3874`	`dataDefinedValEval( DDBlendMode, QgsPalLayerSettings::ShadowBlendMode, exprVal, context.expressionContext() );`
`3875`	`3875`	`}`
`3876`	`3876`
`3877`		`-double QgsPalLayerSettings::sizeToPixel( double size, const QgsRenderContext& c, SizeUnit unit, bool rasterfactor, const QgsMapUnitScale& mapUnitScale ) const`
	`3877`	`+int QgsPalLayerSettings::sizeToPixel( double size, const QgsRenderContext& c, SizeUnit unit, bool rasterfactor, const QgsMapUnitScale& mapUnitScale ) const`
`3878`	`3878`	`{`
`3879`		`- return scaleToPixelContext( size, c, unit, rasterfactor, mapUnitScale ) + 0.5;`
	`3879`	`+ return static_cast< int >( scaleToPixelContext( size, c, unit, rasterfactor, mapUnitScale ) + 0.5 );`
`3880`	`3880`	`}`
`3881`	`3881`
`3882`	`3882`	`double QgsPalLayerSettings::scaleToPixelContext( double size, const QgsRenderContext& c, SizeUnit unit, bool rasterfactor, const QgsMapUnitScale& mapUnitScale ) const`