sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-10 00:13:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

[properties] Do not return nan values when an assistant is used

Browse Source 
with min val == max val

Fixes #31242
This commit is contained in:
Nyall Dawson 2019-09-17 15:52:58 +10:00
parent f9a47738aa
commit 979237515c
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/qgspropertytransformer.cpp
View File

@ -175,6 +175,9 @@ bool QgsGenericNumericTransformer::loadVariant( const QVariant &transformer )
double QgsGenericNumericTransformer::value( double input ) const
{
if ( qgsDoubleNear( mMaxValue, mMinValue ) )
return qBound( mMinOutput, input, mMaxOutput );
input = transformNumeric( input );
if ( qgsDoubleNear( mExponent, 1.0 ) )
return mMinOutput + ( qBound( mMinValue, input, mMaxValue ) - mMinValue ) * ( mMaxOutput - mMinOutput ) / ( mMaxValue - mMinValue );

7
tests/src/core/testqgsproperty.cpp
View File

@ -807,6 +807,13 @@ void TestQgsProperty::genericNumericTransformer()
QGSCOMPARENEAR( t.value( 150 ), 13.5355, 0.001 );
QCOMPARE( t.value( 200 ), 20.0 );
// invalid settings, where minValue = maxValue
QgsGenericNumericTransformer invalid( 1.0, 1.0, 0, 1.0 );
QCOMPARE( invalid.value( -1 ), 0.0 );
QCOMPARE( invalid.value( 0 ), 0.0 );
QCOMPARE( invalid.value( 1.0 ), 1.0 );
QCOMPARE( invalid.value( 2.0 ), 1.0 );
//as expression
QgsGenericNumericTransformer t3( 15,
25,