Fix #12167 - Handle nulls in show label property for labels

NathanW2 · NathanW2 · commit a15aa74bb7e4 · 2015-02-11T13:01:30.000+10:00
Funded by Digital Mapping Solutions
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -1449,10 +1449,12 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
   dataDefinedValues.clear();
 
   // data defined show label? defaults to show label if not 0
-  if ( dataDefinedEvaluate( QgsPalLayerSettings::Show, exprVal ) )
+  if ( dataDefinedIsActive( QgsPalLayerSettings::Show ) )
   {
-    QgsDebugMsgLevel( QString( "exprVal Show:%1" ).arg( exprVal.toBool() ? "true" : "false" ), 4 );
-    if ( !exprVal.toBool() )
+    bool showLabel = dataDefinedEvaluate( QgsPalLayerSettings::Show, exprVal );
+    showLabel = exprVal.toBool();
+    QgsDebugMsgLevel( QString( "exprVal Show:%1" ).arg( showLabel ? "true" : "false" ), 4 );
+    if ( !showLabel )
     {
       return;
     }

Original file line number	Diff line number	Diff line change
`@@ -1449,10 +1449,12 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext`
`1449`	`1449`	`dataDefinedValues.clear();`
`1450`	`1450`
`1451`	`1451`	`// data defined show label? defaults to show label if not 0`
`1452`		`- if ( dataDefinedEvaluate( QgsPalLayerSettings::Show, exprVal ) )`
	`1452`	`+ if ( dataDefinedIsActive( QgsPalLayerSettings::Show ) )`
`1453`	`1453`	`{`
`1454`		`- QgsDebugMsgLevel( QString( "exprVal Show:%1" ).arg( exprVal.toBool() ? "true" : "false" ), 4 );`
`1455`		`- if ( !exprVal.toBool() )`
	`1454`	`+ bool showLabel = dataDefinedEvaluate( QgsPalLayerSettings::Show, exprVal );`
	`1455`	`+ showLabel = exprVal.toBool();`
	`1456`	`+ QgsDebugMsgLevel( QString( "exprVal Show:%1" ).arg( showLabel ? "true" : "false" ), 4 );`
	`1457`	`+ if ( !showLabel )`
`1456`	`1458`	`{`
`1457`	`1459`	`return;`
`1458`	`1460`	`}`