Merge pull request #1426 from EnMAP-Box/prepare_3.17.3

Prepare 3.17.3

Author: janzandr

enmapbox/coreapps/rasterlayerstylingapp/rasterlayerstylingpanel.py

@@ -2,6 +2,15 @@
 from typing import Optional
 
 from osgeo import gdal
+from qgis.PyQt import uic
+from qgis.PyQt.QtWidgets import QDoubleSpinBox, QComboBox, QCheckBox, QToolButton, QLabel, QTabWidget, \
+    QLineEdit, QTableWidget, QSpinBox
+from qgis.core import QgsRasterLayer, QgsSingleBandGrayRenderer, QgsRectangle, QgsMapLayer, \
+    QgsContrastEnhancement, QgsRasterRenderer, QgsMultiBandColorRenderer, QgsSingleBandPseudoColorRenderer, \
+    QgsMapLayerProxyModel, QgsRasterDataProvider, QgsRasterShader, QgsProject, QgsRasterTransparency
+from qgis.gui import (
+    QgsDockWidget, QgsMapLayerComboBox, QgsCollapsibleGroupBox, QgsColorRampButton, QgsRangeSlider
+)
 
 from enmapbox.gui.dataviews.dockmanager import DockPanelUI
 from enmapbox.gui.enmapboxgui import EnMAPBox
@@ -10,18 +19,9 @@
 from enmapbox.typeguard import typechecked
 from enmapbox.utils import BlockSignals
 from enmapboxprocessing.algorithm.createspectralindicesalgorithm import CreateSpectralIndicesAlgorithm
-from enmapboxprocessing.rasterreader import RasterReader
+from enmapboxprocessing.rasterreader import RasterReader, metadataCache, setMetadataCache, buildMetadataCache
 from enmapboxprocessing.rasterwriter import RasterWriter
 from enmapboxprocessing.utils import Utils
-from qgis.PyQt import uic
-from qgis.PyQt.QtWidgets import QDoubleSpinBox, QComboBox, QCheckBox, QToolButton, QLabel, QTabWidget, \
-    QLineEdit, QTableWidget, QSpinBox
-from qgis.core import QgsRasterLayer, QgsSingleBandGrayRenderer, QgsRectangle, QgsMapLayer, \
-    QgsContrastEnhancement, QgsRasterRenderer, QgsMultiBandColorRenderer, QgsSingleBandPseudoColorRenderer, \
-    QgsMapLayerProxyModel, QgsRasterDataProvider, QgsRasterShader, QgsProject, QgsRasterTransparency
-from qgis.gui import (
-    QgsDockWidget, QgsMapLayerComboBox, QgsCollapsibleGroupBox, QgsColorRampButton, QgsRangeSlider
-)
 from rasterlayerstylingapp.rasterlayerstylingbandwidget import RasterLayerStylingBandWidget
 from rasterlayerstylingapp.rasterlayerstylingpercentileswidget import RasterLayerStylingPercentilesWidget
 
@@ -141,6 +141,8 @@ def __init__(self, enmapBox: EnMAPBox, parent=None):
         # init GUI
         self.mRenderer.setCurrentIndex(self.DefaultRendererTab)
 
+        self.initMinMax = 0
+
     def project(self) -> QgsProject:
         return self.enmapBox.project()
 
@@ -291,6 +293,11 @@ def onLayerChanged(self):
             self.disableGui()
             return
 
+        hasNoMetadataCache = metadataCache(layer) is None
+        if hasNoMetadataCache:
+            cache = buildMetadataCache(layer)
+            setMetadataCache(layer, cache)
+
         try:
             layer.rendererChanged.disconnect(self.onLayerRendererChanged)
         except Exception:
@@ -335,7 +342,9 @@ def onRendererTabChanged(self):
                 if isinstance(self.originalRenderer, QgsMultiBandColorRenderer):
                     renderer = self.originalRenderer.clone()
                 else:
-                    renderer = Utils.multiBandColorRenderer(layer.dataProvider(), [1] * 3, [nan] * 3, [nan] * 3)
+                    renderer = Utils.multiBandColorRenderer(
+                        layer.dataProvider(), [1] * 3, [self.initMinMax] * 3, [self.initMinMax] * 3
+                    )
                 layer.setRenderer(renderer)
 
             for mBand, ce, bandNo in [
@@ -358,7 +367,7 @@ def onRendererTabChanged(self):
                 if isinstance(self.originalRenderer, QgsSingleBandGrayRenderer):
                     renderer = self.originalRenderer.clone()
                 else:
-                    renderer = Utils.singleBandGrayRenderer(layer.dataProvider(), 1, nan, nan)
+                    renderer = Utils.singleBandGrayRenderer(layer.dataProvider(), 1, self.initMinMax, self.initMinMax)
                 layer.setRenderer(renderer)
             ce: QgsContrastEnhancement = renderer.contrastEnhancement()
 
@@ -377,7 +386,9 @@ def onRendererTabChanged(self):
                 if isinstance(self.originalRenderer, QgsSingleBandPseudoColorRenderer):
                     renderer = self.originalRenderer.clone()
                 else:
-                    renderer = Utils.singleBandPseudoColorRenderer(layer.dataProvider(), 1, nan, nan, None)
+                    renderer = Utils.singleBandPseudoColorRenderer(
+                        layer.dataProvider(), 1, self.initMinMax, self.initMinMax, None
+                    )
                 layer.setRenderer(renderer)
             shader: QgsRasterShader = renderer.shader()
 
@@ -427,16 +438,22 @@ def onBandChanged(self):
         # If so, create a new renderer with correct type.
         if self.mRenderer.currentIndex() == self.RgbRendererTab:
             if not isinstance(layer.renderer(), QgsMultiBandColorRenderer):
-                renderer = Utils.multiBandColorRenderer(layer.dataProvider(), [bandNo] * 3, [nan] * 3, [nan] * 3)
+                renderer = Utils.multiBandColorRenderer(
+                    layer.dataProvider(), [bandNo] * 3, [self.initMinMax] * 3, [self.initMinMax] * 3
+                )
                 layer.setRenderer(renderer)
         elif self.mRenderer.currentIndex() == self.GrayRendererTab:
             if not isinstance(layer.renderer(), QgsSingleBandGrayRenderer):
-                renderer = Utils.singleBandGrayRenderer(layer.dataProvider(), bandNo, nan, nan)
+                renderer = Utils.singleBandGrayRenderer(layer.dataProvider(), bandNo, self.initMinMax, self.initMinMax)
                 layer.setRenderer(renderer)
         elif self.mRenderer.currentIndex() == self.PseudoRendererTab:
             if not isinstance(layer.renderer(), QgsSingleBandPseudoColorRenderer):
-                renderer = Utils.singleBandPseudoColorRenderer(layer.dataProvider(), bandNo, nan, nan, None)
+                renderer = Utils.singleBandPseudoColorRenderer(
+                    layer.dataProvider(), bandNo, self.initMinMax, self.initMinMax, None
+                )
                 layer.setRenderer(renderer)
+        elif self.mRenderer.currentIndex() == self.DefaultRendererTab:
+            pass
         else:
             raise ValueError()
 
@@ -534,6 +551,8 @@ def onTransparencyRangeChanged(self):
             lower, upper = provider.cumulativeCut(
                 bandNo, max(p1, 0) / 100., min(p2, 100) / 100., layer.extent(), int(QgsRasterLayer.SAMPLE_SIZE)
             )
+            if lower is nan or upper is nan:
+                lower = upper = 0
         if p1 == 0:
             self.mTransparencyLower.setText('')
         else:
@@ -591,6 +610,8 @@ def setCumulativeCut(bandNo: int, mBandMin: QLineEdit, mBandMax: QLineEdit):
                 bandNo, self.mP1.value() / 100., self.mP2.value() / 100., extent,
                 self.currentSampleSize(self.mAccuracy.currentIndex())
             )
+            if vmin is nan or vmax is nan:
+                vmin = vmax = 0
 
             with BlockSignals(mBandMin, mBandMax):
                 mBandMin.setText(str(vmin))
@@ -757,6 +778,13 @@ def updateLinkedLayerRenderer(self):
                         self.currentSampleSize(accuracyType)
                     )
 
+                    if redMin is nan or redMax is nan:
+                        redMin = redMax = 0
+                    if greenMin is nan or greenMax is nan:
+                        greenMin = greenMax = 0
+                    if blueMin is nan or blueMax is nan:
+                        blueMin = blueMax = 0
+
                 elif stretchType == self.ReferenceLayerStrech:
                     ce: QgsContrastEnhancement = renderer.redContrastEnhancement()
                     redMin = ce.minimumValue()
@@ -831,6 +859,8 @@ def updateLinkedLayerRenderer(self):
                         bandNo, p1 / 100., p2 / 100., self.currentExtent(layer2, statisticsType),
                         self.currentSampleSize(accuracyType)
                     )
+                    if redMin is nan or redMax is nan:
+                        redMin = redMax = 0
 
                 elif stretchType == self.ReferenceLayerStrech:
                     ce: QgsContrastEnhancement = renderer.contrastEnhancement()
@@ -871,6 +901,8 @@ def updateLinkedLayerRenderer(self):
                         bandNo, p1 / 100., p2 / 100., self.currentExtent(layer2, statisticsType),
                         self.currentSampleSize(accuracyType)
                     )
+                    if redMin is nan or redMax is nan:
+                        redMin = redMax = 0
                 elif stretchType == self.ReferenceLayerStrech:
                     shader: QgsRasterShader = renderer.shader()
                     redMin = shader.minimumValue()
@@ -953,6 +985,10 @@ def enableGui(self):
 # utils
 def tofloat(text: str) -> float:
     try:
-        return float(text)
+        value = float(text)
+        if value is nan:
+            value = 0
     except Exception:
-        return nan
+        value = 0
+
+    return value

enmapbox/eo4qapps/profileanalyticsapp/profileanalyticsdockwidget.py

@@ -432,7 +432,6 @@ def onApplyClicked(self):
                         'DISTANCE': samplingDistance,
                         'START_OFFSET': 0,
                         'END_OFFSET': 0,
-                        # 'OUTPUT': r'C:\Users\Andreas\Downloads\points.gpkg'  # 'TEMPORARY_OUTPUT'
                         'OUTPUT': 'TEMPORARY_OUTPUT'
                     }
                     pointLayer = processing.run(alg, parameters)['OUTPUT']
@@ -453,7 +452,6 @@ def onApplyClicked(self):
                         'RASTERCOPY': rasterLayer,
                         'COLUMN_PREFIX': 'SAMPLE_',
                         'OUTPUT': 'TEMPORARY_OUTPUT'
-                        # 'OUTPUT': r'C:\Users\Andreas\Downloads\sample.gpkg' # 'TEMPORARY_OUTPUT'
                     }
                     pointLayer2: QgsVectorLayer = processing.run(alg, parameters)['OUTPUT']
                     xValues = [feature['distance'] for feature in pointLayer2.getFeatures()]
@@ -474,7 +472,6 @@ def onApplyClicked(self):
                         return
 
                     polygonId = polygonLayer.selectedFeatureIds()[0]
-                    name = f'{layer.name()} [band {bandNo}, polygon ID {polygonId}]'
 
                     # 1. extract region of interest from raster
                     alg = 'gdal:cliprasterbymasklayer'
@@ -484,6 +481,7 @@ def onApplyClicked(self):
                             polygonLayer.source(), selectedFeaturesOnly=True, featureLimit=-1,
                             geometryCheck=QgsFeatureRequest.InvalidGeometryCheck.GeometryAbortOnInvalid),
                         'TARGET_CRS': layer.crs(),
+                        "DATA_TYPE": 6,
                         'NODATA': np.nan,
                         'OUTPUT': 'TEMPORARY_OUTPUT'
                     }
@@ -548,7 +546,7 @@ def onApplyClicked(self):
                     except Exception:
                         traceback.print_exc()
 
-                userFunctionEditor = w.dialog
+                userFunctionEditor = getattr(w, 'dialog', None)
                 xValues = [float(v) for v in xValues]
                 yValues = [float(v) for v in yValues]
                 profile = Profile(xValues, yValues, xUnit, name, style)
@@ -634,19 +632,20 @@ def onApplyClicked(self):
                     dialog.mLog.setText(msg)
 
         # add profiles to library (for potential visualization in a Spectral View)
-        allProfiles = profiles + ufuncProfiles
-        self.mLibrary.dataProvider().truncate()  # delete all features
-        self.mLibrary.startEditing()
-        for id, profile in enumerate(allProfiles):
-            profileValueDict = prepareProfileValueDict(
-                profile.xValues, profile.yValues, profile.xUnit)
-            feature = QgsFeature()
-            feature.setId(id)
-            feature.setFields(self.mLibrary.fields())
-            feature.setAttribute('name', profile.name)
-            feature.setAttribute('profiles', profileValueDict)
-            self.mLibrary.addFeatures([feature])
-        self.mLibrary.commitChanges()
+        if self.mLibrary is not None:
+            allProfiles = profiles + ufuncProfiles
+            self.mLibrary.dataProvider().truncate()  # delete all features
+            self.mLibrary.startEditing()
+            for id, profile in enumerate(allProfiles):
+                profileValueDict = prepareProfileValueDict(
+                    profile.xValues, profile.yValues, profile.xUnit)
+                feature = QgsFeature()
+                feature.setId(id)
+                feature.setFields(self.mLibrary.fields())
+                feature.setAttribute('name', profile.name)
+                feature.setAttribute('profiles', profileValueDict)
+                self.mLibrary.addFeatures([feature])
+            self.mLibrary.commitChanges()
 
         # set x axis title
         if self.mSourceType.currentIndex() == self.RasterLayerSource: