Filled marker test

qgis · Nov 17, 2020 · c784831 · c784831
1 parent e0bb7d4
commit c784831
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/tests/src/core/testqgsfilledmarker.cpp b/tests/src/core/testqgsfilledmarker.cpp
@@ -56,6 +56,7 @@ class TestQgsFilledMarkerSymbol : public QObject
     void filledMarkerSymbol();
     void dataDefinedShape();
     void bounds();
+    void opacityWithDataDefinedColor();
 
   private:
     bool mTestHasError =  false ;
@@ -166,6 +167,24 @@ void TestQgsFilledMarkerSymbol::bounds()
   QVERIFY( result );
 }
 
+void TestQgsFilledMarkerSymbol::opacityWithDataDefinedColor()
+{
+  dynamic_cast< QgsGradientFillSymbolLayer * >( mFilledMarkerLayer->subSymbol()->symbolLayer( 0 ) )->setColor( QColor( 200, 200, 200 ) );
+  dynamic_cast< QgsGradientFillSymbolLayer * >( mFilledMarkerLayer->subSymbol()->symbolLayer( 0 ) )->setColor2( QColor( 0, 0, 0 ) );
+  dynamic_cast< QgsGradientFillSymbolLayer * >( mFilledMarkerLayer->subSymbol()->symbolLayer( 0 ) )->setDataDefinedProperty( QgsSymbolLayer::PropertyFillColor, QgsProperty::fromExpression( QStringLiteral( "if(importance > 2, 'red', 'green')" ) ) );
+  dynamic_cast< QgsGradientFillSymbolLayer * >( mFilledMarkerLayer->subSymbol()->symbolLayer( 0 ) )->setDataDefinedProperty( QgsSymbolLayer::PropertySecondaryColor, QgsProperty::fromExpression( QStringLiteral( "if(importance > 2, 'blue', 'magenta')" ) ) );
+  mMarkerSymbol->setOpacity( 0.8 );
+  // set opacity on both the symbol AND sub symbol to test that both are applied
+  mFilledMarkerLayer->subSymbol()->setOpacity( 0.6 );
+
+  bool result = imageCheck( QStringLiteral( "filledmarker_opacityddcolor" ) );
+  mFilledMarkerLayer->setDataDefinedProperty( QgsSymbolLayer::PropertyFillColor, QgsProperty() );
+  mFilledMarkerLayer->setDataDefinedProperty( QgsSymbolLayer::PropertyStrokeColor, QgsProperty() );
+  mMarkerSymbol->setOpacity( 1.0 );
+  mFilledMarkerLayer->subSymbol()->setOpacity( 1.0 );
+  QVERIFY( result );
+}
+
 //
 // Private helper functions not called directly by CTest
 //

diff --git a/...r/expected_filledmarker_opacityddcolor/expected_filledmarker_opacityddcolor.png b/...r/expected_filledmarker_opacityddcolor/expected_filledmarker_opacityddcolor.png