[bugfix] Categorized style issue using numeric fields with NULL values

elpaso · elpaso · commit 29abd9d3f990 · 2017-11-24T08:54:13.000+01:00
Fixes #17442
diff --git a/src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp b/src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp
@@ -604,28 +604,22 @@ static void _createCategories( QgsCategoryList &cats, QList<QVariant> &values, Q
 
   int num = values.count();
 
-  bool hasNull = false;
-
   for ( int i = 0; i < num; i++ )
   {
     QVariant value = values[i];
-    if ( value.toString().isNull() )
+    QgsSymbol *newSymbol = symbol->clone();
+    if ( ! value.isNull() )
     {
-      hasNull = true;
+      cats.append( QgsRendererCategory( value, newSymbol, value.toString(), true ) );
     }
-    QgsSymbol *newSymbol = symbol->clone();
-
-    cats.append( QgsRendererCategory( value, newSymbol, value.toString(), true ) );
   }
 
-  // add null (default) value if not exists
-  if ( !hasNull )
-  {
-    QgsSymbol *newSymbol = symbol->clone();
-    cats.append( QgsRendererCategory( QVariant( "" ), newSymbol, QString(), true ) );
-  }
+  // add null (default) value
+  QgsSymbol *newSymbol = symbol->clone();
+  cats.append( QgsRendererCategory( QVariant( "" ), newSymbol, QString(), true ) );
 }
 
+
 void QgsCategorizedSymbolRendererWidget::addCategories()
 {
   QString attrName = mExpressionWidget->currentField();

Original file line number	Diff line number	Diff line change
`@@ -604,28 +604,22 @@ static void _createCategories( QgsCategoryList &cats, QList<QVariant> &values, Q`
`604`	`604`
`605`	`605`	`int num = values.count();`
`606`	`606`
`607`		`- bool hasNull = false;`
`608`		`-`
`609`	`607`	`for ( int i = 0; i < num; i++ )`
`610`	`608`	`{`
`611`	`609`	`QVariant value = values[i];`
`612`		`- if ( value.toString().isNull() )`
	`610`	`+ QgsSymbol *newSymbol = symbol->clone();`
	`611`	`+ if ( ! value.isNull() )`
`613`	`612`	`{`
`614`		`- hasNull = true;`
	`613`	`+ cats.append( QgsRendererCategory( value, newSymbol, value.toString(), true ) );`
`615`	`614`	`}`
`616`		`- QgsSymbol *newSymbol = symbol->clone();`
`617`		`-`
`618`		`- cats.append( QgsRendererCategory( value, newSymbol, value.toString(), true ) );`
`619`	`615`	`}`
`620`	`616`
`621`		`- // add null (default) value if not exists`
`622`		`- if ( !hasNull )`
`623`		`- {`
`624`		`- QgsSymbol *newSymbol = symbol->clone();`
`625`		`- cats.append( QgsRendererCategory( QVariant( "" ), newSymbol, QString(), true ) );`
`626`		`- }`
	`617`	`+ // add null (default) value`
	`618`	`+ QgsSymbol *newSymbol = symbol->clone();`
	`619`	`+ cats.append( QgsRendererCategory( QVariant( "" ), newSymbol, QString(), true ) );`
`627`	`620`	`}`
`628`	`621`
	`622`	`+`
`629`	`623`	`void QgsCategorizedSymbolRendererWidget::addCategories()`
`630`	`624`	`{`
`631`	`625`	`QString attrName = mExpressionWidget->currentField();`