[processing] deferred transparency/bg_color option in xyz alg

qgis · Jun 7, 2019 · 4013925 · 4013925
1 parent ebab737
commit 4013925
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/python/plugins/processing/algs/qgis/TilesXYZ.py b/python/plugins/processing/algs/qgis/TilesXYZ.py
@@ -43,8 +43,7 @@
                        QgsMapSettings,
                        QgsCoordinateTransform,
                        QgsCoordinateReferenceSystem,
-                       QgsMapRendererCustomPainterJob,
-                       QgsProject)
+                       QgsMapRendererCustomPainterJob)
 from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
 
 
@@ -130,7 +129,6 @@ class TilesXYZAlgorithmBase(QgisAlgorithm):
     ZOOM_MAX = 'ZOOM_MAX'
     DPI = 'DPI'
     TILE_FORMAT = 'TILE_FORMAT'
-    TRANSPARENT = 'TRANSPARENT'
     QUALITY = 'QUALITY'
 
     def initAlgorithm(self, config=None):
@@ -155,9 +153,6 @@ def initAlgorithm(self, config=None):
                                                      self.tr('Tile format'),
                                                      self.formats,
                                                      defaultValue=0))
-        self.addParameter(QgsProcessingParameterBoolean(self.TRANSPARENT,
-                                                        self.tr('Use transparent background (PNG only)'),
-                                                        defaultValue=True))
         self.addParameter(QgsProcessingParameterNumber(self.QUALITY,
                                                        self.tr('Quality (JPG only)'),
                                                        minValue=1,
@@ -178,7 +173,6 @@ def generate(self, writer, parameters, context, feedback):
         self.max_zoom = self.parameterAsInt(parameters, self.ZOOM_MAX, context)
         dpi = self.parameterAsInt(parameters, self.DPI, context)
         self.tile_format = self.formats[self.parameterAsEnum(parameters, self.TILE_FORMAT, context)]
-        transparent = self.parameterAsBool(parameters, self.TRANSPARENT, context)
         quality = self.parameterAsInt(parameters, self.QUALITY, context)
         try:
             tile_width = self.parameterAsInt(parameters, self.TILE_WIDTH, context)
@@ -199,13 +193,8 @@ def generate(self, writer, parameters, context, feedback):
         settings.setDestinationCrs(dest_crs)
         settings.setLayers(self.layers)
         settings.setOutputDpi(dpi)
-        canvas_red = QgsProject.instance().readNumEntry('Gui', '/CanvasColorRedPart', 255)[0]
-        canvas_green = QgsProject.instance().readNumEntry('Gui', '/CanvasColorGreenPart', 255)[0]
-        canvas_blue = QgsProject.instance().readNumEntry('Gui', '/CanvasColorBluePart', 255)[0]
-        color = QColor(canvas_red, canvas_green, canvas_blue, 255)
-        if self.tile_format == 'PNG' and transparent:
-            color.setAlpha(0)
-        settings.setBackgroundColor(color)
+        if self.tile_format == 'PNG':
+            settings.setBackgroundColor(QColor(Qt.transparent))
 
         self.wgs_extent = src_to_wgs.transformBoundingBox(extent)
         self.wgs_extent = [self.wgs_extent.xMinimum(), self.wgs_extent.yMinimum(), self.wgs_extent.xMaximum(),

diff --git a/python/plugins/processing/tests/testdata/qgis_algorithm_tests4.yaml b/python/plugins/processing/tests/testdata/qgis_algorithm_tests4.yaml
@@ -2134,7 +2134,6 @@ tests:
       ZOOM_MIN: 1
       ZOOM_MAX: 3
       TILE_FORMAT: 0     # png
-      ALPHA: 0 # fully transparent
       TMS_CONVENTION: false
       TILE_WIDTH: 256
       TILE_HEIGHT: 256