[labelling] fix font size @value variable (fixes #16362) (#4273)

nirvn · web-flow · commit 25fe2b07b9bd · 2017-03-17T15:00:22.000+07:00
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -1158,6 +1158,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature &f, QgsRenderContext &cont
   if ( useScaleVisibility )
   {
     // data defined min scale?
+    context.expressionContext().setOriginalValueVariable( scaleMin );
     double minScale = mDataDefinedProperties.valueAsDouble( QgsPalLayerSettings::MinScale, context.expressionContext(), scaleMin );
 
     // scales closer than 1:1
@@ -1172,6 +1173,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature &f, QgsRenderContext &cont
     }
 
     // data defined max scale?
+    context.expressionContext().setOriginalValueVariable( scaleMax );
     double maxScale = mDataDefinedProperties.valueAsDouble( QgsPalLayerSettings::MaxScale, context.expressionContext(), scaleMax );
 
     // scales closer than 1:1
@@ -1205,6 +1207,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature &f, QgsRenderContext &cont
   }
 
   //data defined label size?
+  context.expressionContext().setOriginalValueVariable( mFormat.size() );
   double fontSize = mDataDefinedProperties.valueAsDouble( QgsPalLayerSettings::Size, context.expressionContext(), mFormat.size() );
   if ( fontSize <= 0.0 )
   {

Original file line number	Diff line number	Diff line change
`@@ -1158,6 +1158,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature &f, QgsRenderContext &cont`
`1158`	`1158`	`if ( useScaleVisibility )`
`1159`	`1159`	`{`
`1160`	`1160`	`// data defined min scale?`
	`1161`	`+ context.expressionContext().setOriginalValueVariable( scaleMin );`
`1161`	`1162`	`double minScale = mDataDefinedProperties.valueAsDouble( QgsPalLayerSettings::MinScale, context.expressionContext(), scaleMin );`
`1162`	`1163`
`1163`	`1164`	`// scales closer than 1:1`
`@@ -1172,6 +1173,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature &f, QgsRenderContext &cont`
`1172`	`1173`	`}`
`1173`	`1174`
`1174`	`1175`	`// data defined max scale?`
	`1176`	`+ context.expressionContext().setOriginalValueVariable( scaleMax );`
`1175`	`1177`	`double maxScale = mDataDefinedProperties.valueAsDouble( QgsPalLayerSettings::MaxScale, context.expressionContext(), scaleMax );`
`1176`	`1178`
`1177`	`1179`	`// scales closer than 1:1`
`@@ -1205,6 +1207,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature &f, QgsRenderContext &cont`
`1205`	`1207`	`}`
`1206`	`1208`
`1207`	`1209`	`//data defined label size?`
	`1210`	`+ context.expressionContext().setOriginalValueVariable( mFormat.size() );`
`1208`	`1211`	`double fontSize = mDataDefinedProperties.valueAsDouble( QgsPalLayerSettings::Size, context.expressionContext(), mFormat.size() );`
`1209`	`1212`	`if ( fontSize <= 0.0 )`
`1210`	`1213`	`{`