converted size expr evaluate to 0 on NULL field

vmora · nyalldawson · commit 4fb22b4ef6da · 2015-06-24T20:08:49.000+10:00
fix #12888 use coalesce(expr,0) to have zero size if expression evaluates to NULL otherwise the default size would be used
diff --git a/src/core/symbology-ng/qgsrendererv2.cpp b/src/core/symbology-ng/qgsrendererv2.cpp
@@ -665,20 +665,20 @@ void QgsFeatureRendererV2::convertSymbolSizeScale( QgsSymbolV2 * symbol, QgsSymb
     QgsMarkerSymbolV2 * s = static_cast<QgsMarkerSymbolV2 *>( symbol );
     if ( QgsSymbolV2::ScaleArea == QgsSymbolV2::ScaleMethod( method ) )
     {
-      const QgsDataDefined dd( "sqrt(" + QString::number( s->size() ) + " * (" + field + "))" );
+      const QgsDataDefined dd( "coalesce(sqrt(" + QString::number( s->size() ) + " * (" + field + ")),0)" );
       s->setDataDefinedSize( dd );
     }
     else
     {
-      const QgsDataDefined dd( QString::number( s->size() ) + " * (" + field + ")" );
+      const QgsDataDefined dd( "coalesce(" + QString::number( s->size() ) + " * (" + field + "),0)" );
       s->setDataDefinedSize( dd );
     }
     s->setScaleMethod( QgsSymbolV2::ScaleDiameter );
   }
   else if ( symbol->type() == QgsSymbolV2::Line )
   {
     QgsLineSymbolV2 * s = static_cast<QgsLineSymbolV2 *>( symbol );
-    const QgsDataDefined dd( QString::number( s->width() ) + " * (" + field + ")" );
+    const QgsDataDefined dd( "coalesce(" + QString::number( s->width() ) + " * (" + field + "),0)" );
     s->setDataDefinedWidth( dd );
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -665,20 +665,20 @@ void QgsFeatureRendererV2::convertSymbolSizeScale( QgsSymbolV2 * symbol, QgsSymb`
`665`	`665`	`QgsMarkerSymbolV2 * s = static_cast<QgsMarkerSymbolV2 *>( symbol );`
`666`	`666`	`if ( QgsSymbolV2::ScaleArea == QgsSymbolV2::ScaleMethod( method ) )`
`667`	`667`	`{`
`668`		`- const QgsDataDefined dd( "sqrt(" + QString::number( s->size() ) + " * (" + field + "))" );`
	`668`	`+ const QgsDataDefined dd( "coalesce(sqrt(" + QString::number( s->size() ) + " * (" + field + ")),0)" );`
`669`	`669`	`s->setDataDefinedSize( dd );`
`670`	`670`	`}`
`671`	`671`	`else`
`672`	`672`	`{`
`673`		`- const QgsDataDefined dd( QString::number( s->size() ) + " * (" + field + ")" );`
	`673`	`+ const QgsDataDefined dd( "coalesce(" + QString::number( s->size() ) + " * (" + field + "),0)" );`
`674`	`674`	`s->setDataDefinedSize( dd );`
`675`	`675`	`}`
`676`	`676`	`s->setScaleMethod( QgsSymbolV2::ScaleDiameter );`
`677`	`677`	`}`
`678`	`678`	`else if ( symbol->type() == QgsSymbolV2::Line )`
`679`	`679`	`{`
`680`	`680`	`QgsLineSymbolV2 * s = static_cast<QgsLineSymbolV2 *>( symbol );`
`681`		`- const QgsDataDefined dd( QString::number( s->width() ) + " * (" + field + ")" );`
	`681`	`+ const QgsDataDefined dd( "coalesce(" + QString::number( s->width() ) + " * (" + field + "),0)" );`
`682`	`682`	`s->setDataDefinedWidth( dd );`
`683`	`683`	`}`
`684`	`684`	`}`