From 59ca985928e80cb5ecae531e7718c8955e0fe972 Mon Sep 17 00:00:00 2001
From: Martin Dobias <wonder.sk@gmail.com>
Date: Thu, 22 Jun 2017 12:56:02 +0200
Subject: [PATCH] Use white bg color for test images to avoid black background

---
 python/core/qgsdatadefinedsizelegend.sip        | 2 +-
 src/core/qgsdatadefinedsizelegend.cpp           | 4 ++--
 src/core/qgsdatadefinedsizelegend.h             | 2 +-
 tests/src/core/testqgsdatadefinedsizelegend.cpp | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/python/core/qgsdatadefinedsizelegend.sip b/python/core/qgsdatadefinedsizelegend.sip
index 4550d95632a..9d316f68ff8 100644
--- a/python/core/qgsdatadefinedsizelegend.sip
+++ b/python/core/qgsdatadefinedsizelegend.sip
@@ -149,7 +149,7 @@ Generates legend symbol items according to the configuration
 Does nothing if legend is not configured as collapsed.
 %End
 
-    QImage collapsedLegendImage( QgsRenderContext &context, double paddingMM = 1 ) const;
+    QImage collapsedLegendImage( QgsRenderContext &context, const QColor &backgroundColor = Qt::transparent, double paddingMM = 1 ) const;
 %Docstring
 Returns output image that would be shown in the legend. Returns invalid image if legend is not configured as collapsed.
  :rtype: QImage
diff --git a/src/core/qgsdatadefinedsizelegend.cpp b/src/core/qgsdatadefinedsizelegend.cpp
index 9ddbd197bb8..26208d8c4d4 100644
--- a/src/core/qgsdatadefinedsizelegend.cpp
+++ b/src/core/qgsdatadefinedsizelegend.cpp
@@ -261,7 +261,7 @@ void QgsDataDefinedSizeLegend::drawCollapsedLegend( QgsRenderContext &context, Q
 }
 
 
-QImage QgsDataDefinedSizeLegend::collapsedLegendImage( QgsRenderContext &context, double paddingMM ) const
+QImage QgsDataDefinedSizeLegend::collapsedLegendImage( QgsRenderContext &context, const QColor &backgroundColor, double paddingMM ) const
 {
   if ( mType != LegendCollapsed || mSizeClasses.isEmpty() || !mSymbol )
     return QImage();
@@ -276,7 +276,7 @@ QImage QgsDataDefinedSizeLegend::collapsedLegendImage( QgsRenderContext &context
   QImage img( contentSize.width() + padding * 2, contentSize.height() + padding * 2, QImage::Format_ARGB32_Premultiplied );
   img.setDotsPerMeterX( dpm );
   img.setDotsPerMeterY( dpm );
-  img.fill( Qt::transparent );
+  img.fill( backgroundColor );
 
   QPainter painter( &img );
   painter.setRenderHint( QPainter::Antialiasing, true );
diff --git a/src/core/qgsdatadefinedsizelegend.h b/src/core/qgsdatadefinedsizelegend.h
index c498b3aa862..0ac07884f16 100644
--- a/src/core/qgsdatadefinedsizelegend.h
+++ b/src/core/qgsdatadefinedsizelegend.h
@@ -121,7 +121,7 @@ class CORE_EXPORT QgsDataDefinedSizeLegend
     void drawCollapsedLegend( QgsRenderContext &context, QSize *outputSize SIP_OUT = nullptr, int *labelXOffset SIP_OUT = nullptr ) const;
 
     //! Returns output image that would be shown in the legend. Returns invalid image if legend is not configured as collapsed.
-    QImage collapsedLegendImage( QgsRenderContext &context, double paddingMM = 1 ) const;
+    QImage collapsedLegendImage( QgsRenderContext &context, const QColor &backgroundColor = Qt::transparent, double paddingMM = 1 ) const;
 
     //! Creates instance from given element and returns it (caller takes ownership). Returns null on error.
     static QgsDataDefinedSizeLegend *readXml( const QDomElement &elem, const QgsReadWriteContext &context ) SIP_FACTORY;
diff --git a/tests/src/core/testqgsdatadefinedsizelegend.cpp b/tests/src/core/testqgsdatadefinedsizelegend.cpp
index dce4f8829e9..04a12e17e2a 100644
--- a/tests/src/core/testqgsdatadefinedsizelegend.cpp
+++ b/tests/src/core/testqgsdatadefinedsizelegend.cpp
@@ -114,13 +114,13 @@ void TestQgsDataDefinedSizeLegend::testBasic()
 
   QgsRenderContext context( _createRenderContext( 100, 96, 100 ) );
 
-  QImage imgBottom = settings.collapsedLegendImage( context, 1 );
+  QImage imgBottom = settings.collapsedLegendImage( context, Qt::white, 1 );
   imgBottom.save( _fileNameForTest( "basic_bottom" ) );
   QVERIFY( _verifyImage( "basic_bottom", mReport ) );
 
   settings.setVerticalAlignment( QgsDataDefinedSizeLegend::AlignCenter );
 
-  QImage imgCenter = settings.collapsedLegendImage( context, 1 );
+  QImage imgCenter = settings.collapsedLegendImage( context, Qt::white, 1 );
   imgCenter.save( _fileNameForTest( "basic_center" ) );
   QVERIFY( _verifyImage( "basic_center", mReport ) );
 }
@@ -149,7 +149,7 @@ void TestQgsDataDefinedSizeLegend::testCrowded()
 
   QgsRenderContext context( _createRenderContext( 100, 96, 100 ) );
 
-  QImage img = settings.collapsedLegendImage( context, 1 );
+  QImage img = settings.collapsedLegendImage( context, Qt::white, 1 );
   img.save( _fileNameForTest( "crowded" ) );
 
   QVERIFY( _verifyImage( "crowded", mReport ) );