Skip to content

Commit a52998b

Browse files
authored
Merge pull request #1438 from EnMAP-Box/main
updates 3.17.4
2 parents 21bc729 + e96cd86 commit a52998b

20 files changed

+427
-4249
lines changed

.env/conda/enmapbox_full.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# EnMAP-Box conda environment (generated 2026-01-26 17:42:24)
1+
# EnMAP-Box conda environment (generated 2026-01-29 16:28:00)
22
# run to install: conda env create -n enmapbox_full --file=enmapbox_full.yml
33
# run to update : conda env update -n enmapbox_full --file=enmapbox_full.yml --prune
44
# run to delete : conda env remove -n enmapbox_full
@@ -33,7 +33,7 @@ dependencies:
3333
- pytest
3434
- pytest-cov
3535
- pytest-xdist
36-
- python>=3.10
36+
- python>=3.12
3737
- scikit-learn>=1
3838
- sympy
3939
- xarray

.env/conda/enmapbox_full_3.40.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# EnMAP-Box conda environment (generated 2026-01-26 17:41:47)
1+
# EnMAP-Box conda environment (generated 2026-01-26 17:42:24)
22
# run to install: conda env create -n enmapbox_full_3.40 --file=enmapbox_full_3.40.yml
33
# run to update : conda env update -n enmapbox_full_3.40 --file=enmapbox_full_3.40.yml --prune
44
# run to delete : conda env remove -n enmapbox_full_3.40

.env/conda/enmapbox_full_ltr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# EnMAP-Box conda environment (generated 2026-01-26 17:42:24)
1+
# EnMAP-Box conda environment (generated 2026-01-29 16:28:00)
22
# run to install: conda env create -n enmapbox_full_ltr --file=enmapbox_full_ltr.yml
33
# run to update : conda env update -n enmapbox_full_ltr --file=enmapbox_full_ltr.yml --prune
44
# run to delete : conda env remove -n enmapbox_full_ltr
@@ -33,7 +33,7 @@ dependencies:
3333
- pytest
3434
- pytest-cov
3535
- pytest-xdist
36-
- python>=3.10
36+
- python>=3.12
3737
- scikit-learn>=1
3838
- sympy
3939
- xarray

.env/conda/enmapbox_light.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# EnMAP-Box conda environment (generated 2026-01-26 17:42:24)
1+
# EnMAP-Box conda environment (generated 2026-01-29 16:28:00)
22
# run to install: conda env create -n enmapbox_light --file=enmapbox_light.yml
33
# run to update : conda env update -n enmapbox_light --file=enmapbox_light.yml --prune
44
# run to delete : conda env remove -n enmapbox_light
@@ -20,7 +20,7 @@ dependencies:
2020
- pytest
2121
- pytest-cov
2222
- pytest-xdist
23-
- python>=3.10
23+
- python>=3.12
2424
- scikit-learn>=1
2525
- pip:
2626
- flake8-qgis

.env/conda/enmapbox_light_3.40.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# EnMAP-Box conda environment (generated 2026-01-26 17:41:47)
1+
# EnMAP-Box conda environment (generated 2026-01-26 17:42:24)
22
# run to install: conda env create -n enmapbox_light_3.40 --file=enmapbox_light_3.40.yml
33
# run to update : conda env update -n enmapbox_light_3.40 --file=enmapbox_light_3.40.yml --prune
44
# run to delete : conda env remove -n enmapbox_light_3.40

.env/conda/enmapbox_light_ltr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# EnMAP-Box conda environment (generated 2026-01-26 17:42:24)
1+
# EnMAP-Box conda environment (generated 2026-01-29 16:28:00)
22
# run to install: conda env create -n enmapbox_light_ltr --file=enmapbox_light_ltr.yml
33
# run to update : conda env update -n enmapbox_light_ltr --file=enmapbox_light_ltr.yml --prune
44
# run to delete : conda env remove -n enmapbox_light_ltr
@@ -20,7 +20,7 @@ dependencies:
2020
- pytest
2121
- pytest-cov
2222
- pytest-xdist
23-
- python>=3.10
23+
- python>=3.12
2424
- scikit-learn>=1
2525
- pip:
2626
- flake8-qgis

enmapbox/coreapps/rasterlayerstylingapp/rasterlayerstylingpanel.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,10 +391,11 @@ def onRendererTabChanged(self):
391391
)
392392
layer.setRenderer(renderer)
393393
shader: QgsRasterShader = renderer.shader()
394+
shaderFunction = shader.rasterShaderFunction()
394395

395396
with BlockSignals(self.mPseudoBand.mMin, self.mPseudoBand.mMax, self.mPseudoBand.mBandNo):
396-
self.mPseudoBand.mMin.setText(str(shader.minimumValue()))
397-
self.mPseudoBand.mMax.setText(str(shader.maximumValue()))
397+
self.mPseudoBand.mMin.setText(str(shaderFunction.minimumValue()))
398+
self.mPseudoBand.mMax.setText(str(shaderFunction.maximumValue()))
398399
self.mPseudoBand.mBandNo.setBand(renderer.inputBand())
399400
self.mPseudoBand.mSlider.setValue(renderer.inputBand())
400401

enmapbox/gui/datasources/datasources.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,10 @@ def updateNodes(self, **kwds) -> dict:
124124
self.mUpdateTime = datetime.datetime.now()
125125
dataItem: QgsDataItem = self.dataItem()
126126
self.setName(dataItem.name())
127-
self.setToolTip(dataItem.toolTip())
127+
tt = dataItem.toolTip()
128+
if tt is None or len(tt) == 0:
129+
tt = dataItem.path()
130+
self.setToolTip(tt)
128131
self.setIcon(dataItem.icon())
129132

130133
self.mNodePath.setValue(dataItem.path())
@@ -271,6 +274,7 @@ def __init__(self, dataItem: QgsLayerItem):
271274
self.mWavelength = None
272275

273276
self.updateNodes()
277+
s = ""
274278

275279
def updateNodes(self) -> dict:
276280
MD = super().updateNodes()

enmapbox/gui/dataviews/dockmanager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2377,7 +2377,7 @@ def name(self):
23772377
return self.mVis.text()
23782378

23792379
def tooltip(self):
2380-
return self.mVis.name()
2380+
return self.mVis.data(Qt.ItemDataRole.ToolTipRole)
23812381

23822382
def icon(self):
23832383
ps = self.vis().plotStyle()

enmapbox/gui/dataviews/docks.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -847,10 +847,8 @@ def updateName():
847847
# change the dock title
848848
sid = s.id()
849849
title = s.name()
850-
for dock in self.docks(SpectralLibraryDock):
851-
assert isinstance(dock, SpectralLibraryDock)
852-
if dock.mDefaultSpeclibId == sid and dock.title() != title:
853-
dock.setTitle(title)
850+
if self.mDefaultSpeclibId == sid and self.title() != title:
851+
self.setTitle(title)
854852

855853
self.sigTitleChanged.connect(updateName)
856854
sl.nameChanged.connect(updateName)

0 commit comments

Comments
 (0)