Skip to content
Permalink
Browse files

Add missing bracket to formula generated by data defined override

Refs #21617
  • Loading branch information
backporting authored and nyalldawson committed Mar 22, 2019
1 parent 3adb617 commit e880db57a31e1542e91e2bb4fcd04f1a9313fd8f
Showing with 3 additions and 3 deletions.
  1. +1 −1 src/core/qgspropertytransformer.cpp
  2. +2 −2 tests/src/core/testqgsproperty.cpp
@@ -619,7 +619,7 @@ QString QgsColorRampTransformer::toExpression( const QString &baseExpression ) c
QString maxValueString = QString::number( mMaxValue );
QString nullColorString = mNullColor.name();

return QStringLiteral( "coalesce(ramp_color('%1',scale_linear(%2, %3, %4, 0, 1), '%5')" ).arg( !mRampName.isEmpty() ? mRampName : QStringLiteral( "custom ramp" ),
return QStringLiteral( "coalesce(ramp_color('%1',scale_linear(%2, %3, %4, 0, 1)), '%5')" ).arg( !mRampName.isEmpty() ? mRampName : QStringLiteral( "custom ramp" ),
baseExpression, minValueString, maxValueString, nullColorString );
}

@@ -1252,9 +1252,9 @@ void TestQgsProperty::colorRampTransformer()
25,
new QgsGradientColorRamp( QColor( 10, 20, 30 ), QColor( 200, 190, 180 ) ),
QColor( 100, 150, 200 ) );
QCOMPARE( t5.toExpression( "5+6" ), QStringLiteral( "coalesce(ramp_color('custom ramp',scale_linear(5+6, 15, 25, 0, 1), '#6496c8')" ) );
QCOMPARE( t5.toExpression( "5+6" ), QStringLiteral( "coalesce(ramp_color('custom ramp',scale_linear(5+6, 15, 25, 0, 1)), '#6496c8')" ) );
t5.setRampName( QStringLiteral( "my ramp" ) );
QCOMPARE( t5.toExpression( "5+6" ), QStringLiteral( "coalesce(ramp_color('my ramp',scale_linear(5+6, 15, 25, 0, 1), '#6496c8')" ) );
QCOMPARE( t5.toExpression( "5+6" ), QStringLiteral( "coalesce(ramp_color('my ramp',scale_linear(5+6, 15, 25, 0, 1)), '#6496c8')" ) );
}

void TestQgsProperty::propertyToTransformer()

0 comments on commit e880db5

Please sign in to comment.
You can’t perform that action at this time.