Merge pull request #54854 from elpaso/backport-54644

elpaso · web-flow · commit f3daa38bd867 · 2023-10-11T20:10:30.000+02:00
Backport: RASTER properties dlg sync opacity
diff --git a/src/gui/raster/qgsrasterlayerproperties.cpp b/src/gui/raster/qgsrasterlayerproperties.cpp
@@ -678,6 +678,8 @@ void QgsRasterLayerProperties::sync()
   if ( !provider )
     return;
 
+  mRasterTransparencyWidget->syncToLayer();
+
   if ( provider->dataType( 1 ) == Qgis::DataType::ARGB32
        || provider->dataType( 1 ) == Qgis::DataType::ARGB32_Premultiplied )
   {
diff --git a/tests/src/python/test_qgsrasterlayerproperties.py b/tests/src/python/test_qgsrasterlayerproperties.py
@@ -17,8 +17,15 @@
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import QWidget
 from qgis.core import QgsMapLayer, QgsProject, QgsRasterLayer
-from qgis.gui import QgsMapCanvas, QgsMapLayerConfigWidgetFactory, QgsMapLayerConfigWidget, QgsRasterLayerProperties
-from qgis.testing import start_app, unittest
+from qgis.gui import (
+    QgsMapCanvas,
+    QgsMapLayerConfigWidget,
+    QgsMapLayerConfigWidgetFactory,
+    QgsRasterLayerProperties,
+)
+import unittest
+from qgis.testing import start_app
+import tempfile
 
 from utilities import unitTestDataPath
 
@@ -92,6 +99,29 @@ def createWidget(self,
         self.assertEqual(MyFactory.COUNT, 1, msg='Custom QgsMapLayerConfigWidget::createWidget(...) not called')
         self.assertEqual(MyWidget.COUNT, 1, msg='Custom QgsMapLayerConfigWidget::apply() not called')
 
+    def test_transparency_load(self):
+        """Test issue GH #54496"""
+
+        myCanvas = QgsMapCanvas()
+        myPath = pathlib.Path(unitTestDataPath('raster')) / 'band1_float32_noct_epsg4326.tif'
+        myRasterLayer = QgsRasterLayer(myPath.as_posix(), myPath.name)
+
+        assert myRasterLayer.isValid(), f'Raster not loaded {myPath}'
+
+        dialog = QgsRasterLayerProperties(myRasterLayer, myCanvas)
+
+        with tempfile.NamedTemporaryFile(suffix='.qml') as qml_file_object:
+            renderer = myRasterLayer.renderer()
+            renderer.setOpacity(0.5)
+            self.assertTrue(myRasterLayer.saveNamedStyle(qml_file_object.name)[1])
+            myRasterLayer.loadNamedStyle(qml_file_object.name)
+            dialog.syncToLayer()
+            renderer = myRasterLayer.renderer()
+            self.assertEqual(renderer.opacity(), 0.5)
+            dialog.apply()
+            renderer = myRasterLayer.renderer()
+            self.assertEqual(renderer.opacity(), 0.5)
+
 
 if __name__ == '__main__':
     unittest.main()

Original file line number	Diff line number	Diff line change
`@@ -678,6 +678,8 @@ void QgsRasterLayerProperties::sync()`
`678`	`678`	`if ( !provider )`
`679`	`679`	`return;`
`680`	`680`
	`681`	`+ mRasterTransparencyWidget->syncToLayer();`
	`682`	`+`
`681`	`683`	`if ( provider->dataType( 1 ) == Qgis::DataType::ARGB32`
`682`	`684`	`\|\| provider->dataType( 1 ) == Qgis::DataType::ARGB32_Premultiplied )`
`683`	`685`	`{`