Fix minimumValue for QgsVectorLayerSelectedFeatureSource

nyalldawson · nyalldawson · commit 565980f6a1b2 · 2018-07-06T02:25:08.000+10:00
diff --git a/src/core/qgsfeaturesource.cpp b/src/core/qgsfeaturesource.cpp
@@ -64,7 +64,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;
     }
@@ -87,7 +87,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
`@@ -64,7 +64,7 @@ QVariant QgsFeatureSource::minimumValue( int fieldIndex ) const`
`64`	`64`	`while ( it.nextFeature( f ) )`
`65`	`65`	`{`
`66`	`66`	`QVariant v = f.attribute( fieldIndex );`
`67`		`- if ( v.isValid() && qgsVariantLessThan( v, min ) )`
	`67`	`+ if ( !v.isNull() && ( qgsVariantLessThan( v, min ) \|\| min.isNull() ) )`
`68`	`68`	`{`
`69`	`69`	`min = v;`
`70`	`70`	`}`
`@@ -87,7 +87,7 @@ QVariant QgsFeatureSource::maximumValue( int fieldIndex ) const`
`87`	`87`	`while ( it.nextFeature( f ) )`
`88`	`88`	`{`
`89`	`89`	`QVariant v = f.attribute( fieldIndex );`
`90`		`- if ( v.isValid() && qgsVariantGreaterThan( v, max ) )`
	`90`	`+ if ( !v.isNull() && ( qgsVariantGreaterThan( v, max ) \|\| max.isNull() ) )`
`91`	`91`	`{`
`92`	`92`	`max = v;`
`93`	`93`	`}`