[labeling] Fix broken data defined shape radius setting

nyalldawson · nyalldawson · commit d665cd5b280e · 2018-03-02T07:50:36.000+11:00
(cherry-picked from 2345852)
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -2186,6 +2186,17 @@ bool QgsPalLayerSettings::dataDefinedValEval( DataDefinedValueType valType,
         }
         return false;
       }
+      case DDSizeF:
+      {
+        QString ptstr = exprVal.toString().trimmed();
+
+        if ( !ptstr.isEmpty() )
+        {
+          dataDefinedValues.insert( p, QVariant( QgsSymbolLayerUtils::decodeSize( ptstr ) ) );
+          return true;
+        }
+        return false;
+      }
     }
   }
   return false;
@@ -2671,7 +2682,7 @@ void QgsPalLayerSettings::parseShapeBackground( QgsRenderContext &context )
   dataDefinedValEval( DDUnits, QgsPalLayerSettings::ShapeOffsetUnits, exprVal, context.expressionContext() );
 
   // data defined shape radii?
-  dataDefinedValEval( DDPointF, QgsPalLayerSettings::ShapeRadii, exprVal, context.expressionContext(), QgsSymbolLayerUtils::encodeSize( background.radii() ) );
+  dataDefinedValEval( DDSizeF, QgsPalLayerSettings::ShapeRadii, exprVal, context.expressionContext(), QgsSymbolLayerUtils::encodeSize( background.radii() ) );
 
   // data defined shape radii units?
   dataDefinedValEval( DDUnits, QgsPalLayerSettings::ShapeRadiiUnits, exprVal, context.expressionContext() );
diff --git a/src/core/qgspallabeling.h b/src/core/qgspallabeling.h
@@ -847,7 +847,8 @@ class CORE_EXPORT QgsPalLayerSettings
       DDColor,
       DDJoinStyle,
       DDBlendMode,
-      DDPointF
+      DDPointF,
+      DDSizeF, //!< Data defined size
     };
 
     // convenience data defined evaluation function

Original file line number	Diff line number	Diff line change
`@@ -2186,6 +2186,17 @@ bool QgsPalLayerSettings::dataDefinedValEval( DataDefinedValueType valType,`
`2186`	`2186`	`}`
`2187`	`2187`	`return false;`
`2188`	`2188`	`}`
	`2189`	`+ case DDSizeF:`
	`2190`	`+ {`
	`2191`	`+ QString ptstr = exprVal.toString().trimmed();`
	`2192`	`+`
	`2193`	`+ if ( !ptstr.isEmpty() )`
	`2194`	`+ {`
	`2195`	`+ dataDefinedValues.insert( p, QVariant( QgsSymbolLayerUtils::decodeSize( ptstr ) ) );`
	`2196`	`+ return true;`
	`2197`	`+ }`
	`2198`	`+ return false;`
	`2199`	`+ }`
`2189`	`2200`	`}`
`2190`	`2201`	`}`
`2191`	`2202`	`return false;`
`@@ -2671,7 +2682,7 @@ void QgsPalLayerSettings::parseShapeBackground( QgsRenderContext &context )`
`2671`	`2682`	`dataDefinedValEval( DDUnits, QgsPalLayerSettings::ShapeOffsetUnits, exprVal, context.expressionContext() );`
`2672`	`2683`
`2673`	`2684`	`// data defined shape radii?`
`2674`		`- dataDefinedValEval( DDPointF, QgsPalLayerSettings::ShapeRadii, exprVal, context.expressionContext(), QgsSymbolLayerUtils::encodeSize( background.radii() ) );`
	`2685`	`+ dataDefinedValEval( DDSizeF, QgsPalLayerSettings::ShapeRadii, exprVal, context.expressionContext(), QgsSymbolLayerUtils::encodeSize( background.radii() ) );`
`2675`	`2686`
`2676`	`2687`	`// data defined shape radii units?`
`2677`	`2688`	`dataDefinedValEval( DDUnits, QgsPalLayerSettings::ShapeRadiiUnits, exprVal, context.expressionContext() );`