Fix minimumValue for QgsVectorLayerSelectedFeatureSource

nyalldawson · nyalldawson · commit 16f15042d4f7 · 2018-07-10T11:15:49.000+10:00
(cherry-picked from 565980f)
diff --git a/src/core/qgsfeaturesource.cpp b/src/core/qgsfeaturesource.cpp
@@ -59,7 +59,7 @@ QVariant QgsFeatureSource::minimumValue( int fieldIndex ) const
   while ( it.nextFeature( f ) )
   {
     QVariant v = f.attribute( fieldIndex );
-    if ( v.isValid() && qgsVariantLessThan( v, min ) )
+    if ( !v.isNull() && ( qgsVariantLessThan( v, min ) || min.isNull() ) )
     {
       min = v;
     }
@@ -82,7 +82,7 @@ QVariant QgsFeatureSource::maximumValue( int fieldIndex ) const
   while ( it.nextFeature( f ) )
   {
     QVariant v = f.attribute( fieldIndex );
-    if ( v.isValid() && qgsVariantGreaterThan( v, max ) )
+    if ( !v.isNull() && ( qgsVariantGreaterThan( v, max ) || max.isNull() ) )
     {
       max = v;
     }

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ QVariant QgsFeatureSource::minimumValue( int fieldIndex ) const`
`59`	`59`	`while ( it.nextFeature( f ) )`
`60`	`60`	`{`
`61`	`61`	`QVariant v = f.attribute( fieldIndex );`
`62`		`- if ( v.isValid() && qgsVariantLessThan( v, min ) )`
	`62`	`+ if ( !v.isNull() && ( qgsVariantLessThan( v, min ) \|\| min.isNull() ) )`
`63`	`63`	`{`
`64`	`64`	`min = v;`
`65`	`65`	`}`
`@@ -82,7 +82,7 @@ QVariant QgsFeatureSource::maximumValue( int fieldIndex ) const`
`82`	`82`	`while ( it.nextFeature( f ) )`
`83`	`83`	`{`
`84`	`84`	`QVariant v = f.attribute( fieldIndex );`
`85`		`- if ( v.isValid() && qgsVariantGreaterThan( v, max ) )`
	`85`	`+ if ( !v.isNull() && ( qgsVariantGreaterThan( v, max ) \|\| max.isNull() ) )`
`86`	`86`	`{`
`87`	`87`	`max = v;`
`88`	`88`	`}`