Merge pull request #33 from EnMAP-Box/main

Merge branch 'EnMAP-Box:main' into main
EnMAP-Box · Nov 14, 2024 · adea398 · adea398
2 parents dc6ef1e + 670bb95
commit adea398
Show file tree

Hide file tree

Showing 22 changed files with 638 additions and 535 deletions.
diff --git a/.env/conda/enmapbox_full_3.38.yml b/.env/conda/enmapbox_full_3.38.yml
@@ -17,7 +17,7 @@ dependencies:
 - flake8
 - git-lfs
 - gitpython
-- hy5py
+- h5py
 - lightgbm
 - matplotlib
 - netcdf4

diff --git a/.env/conda/enmapbox_full_latest.yml b/.env/conda/enmapbox_full_latest.yml
@@ -17,7 +17,7 @@ dependencies:
 - flake8
 - git-lfs
 - gitpython
-- hy5py
+- h5py
 - lightgbm
 - matplotlib
 - netcdf4

diff --git a/.env/conda/enmapbox_full_longterm.yml b/.env/conda/enmapbox_full_longterm.yml
@@ -17,7 +17,7 @@ dependencies:
 - flake8
 - git-lfs
 - gitpython
-- hy5py
+- h5py
 - lightgbm
 - matplotlib
 - netcdf4

diff --git a/.github/workflows/urlcheck.yml b/.github/workflows/urlcheck.yml
@@ -4,12 +4,12 @@ on:
   push:
     branches:
       - main
-      - 'releases/**'
+      - 'release_**'
       - urlcheck
   pull_request:
     branches:
       - main
-      - 'releases/**'
+      - 'release_**'
 
 jobs:
   build:
@@ -34,7 +34,7 @@ jobs:
         force_pass : false
 
         exclude_files:
-          test_glossary.py,snippets/grabPotsdamWmsData.py
+          test_glossary.py,snippets/grabPotsdamWmsData.py,scripts/update_splashscreen.py
 
         # {z}/{x}/{y}: ESRI
         # {z]/{y}/{x}: CartoDB, Open Weather, OpenTopoMap, OSM, Stamen, Strava, Wikimedia

diff --git a/.gitignore b/.gitignore
@@ -18,7 +18,7 @@ examples/*.json
 examples/*.qml
 symbology-style.db
 # enmapbox/exampledata/*.gpkg
-
+splashscreen_tmp.*
 
 # we do not like to have compiled qt resource files in our repository!
 *_rc.py

diff --git a/.plugin.ini b/.plugin.ini
@@ -80,6 +80,7 @@ include =
     rx:enmapboxexternal/.*\.(py)
     enmapboxplugins/*
     enmapboxgeoalgorithms/*
+    enmapbox/gui/splashscreen/splashscreen.png
     __init__.py
     CHANGELOG.rst
     CHANGELOG.md

diff --git a/enmapbox/coreapps/_classic/hubflow/html.py b/enmapbox/coreapps/_classic/hubflow/html.py
@@ -16,7 +16,7 @@
 
 #--- LICENSE ------------------------------------------------------------------
 
-# Copyright Philippe Lagadec - see http://www.decalage.info/contact for contact info
+# Copyright Philippe Lagadec
 #
 # This module provides a few classes to easily generate HTML tables and lists.
 #

diff --git a/enmapbox/enmapboxresources.qrc b/enmapbox/enmapboxresources.qrc
@@ -1,122 +1,121 @@
-<RCC>
-  <qresource prefix="enmapbox">
-    <file>gui/ui/icons/sensor.png</file>
-    <file>gui/ui/icons/viewlist_attributetabledock.svg</file>
-    <file>gui/ui/icons/ActionIdentifyTimeSeries.svg</file>
-    <file>gui/ui/logo/splashscreen.png</file>
-    <file>gui/ui/icons/add_datasource.svg</file>
-    <file>gui/ui/icons/crosshair.svg</file>
-    <file>gui/ui/icons/crs.svg</file>
-    <file>gui/ui/icons/database.svg</file>
-    <file>gui/ui/icons/dataType.svg</file>
-    <file>gui/ui/icons/dims.svg</file>
-    <file>gui/ui/icons/enmapbox.svg</file>
-    <file>gui/ui/icons/fileInfo.svg</file>
-    <file>gui/ui/icons/filelist_classification.svg</file>
-    <file>gui/ui/icons/filelist_image.svg</file>
-    <file>gui/ui/icons/filelist_mask.svg</file>
-    <file>gui/ui/icons/filelist_regression.svg</file>
-    <file>gui/ui/icons/fileSize.svg</file>
-    <file>gui/ui/icons/general.svg</file>
-    <file>gui/ui/icons/IconTimeSeries.svg</file>
-    <file>gui/ui/icons/link_all.svg</file>
-    <file>gui/ui/icons/link_all_center.svg</file>
-    <file>gui/ui/icons/link_all_mapscale.svg</file>
-    <file>gui/ui/icons/link_all_mapscale_center.svg</file>
-    <file>gui/ui/icons/link_basic.svg</file>
-    <file>gui/ui/icons/link_center.svg</file>
-    <file>gui/ui/icons/link_mapextent.svg</file>
-    <file>gui/ui/icons/link_mapscale.svg</file>
-    <file>gui/ui/icons/link_mapscale_center.svg</file>
-    <file>gui/ui/icons/link_open.svg</file>
-    <file>gui/ui/icons/locked.svg</file>
-    <file>gui/ui/icons/lockedGray.svg</file>
-    <file>gui/ui/icons/logo_dlr.svg</file>
-    <file>gui/ui/icons/logo_gfz.svg</file>
-    <file>gui/ui/icons/logo_hub.svg</file>
-    <file>gui/ui/icons/logo_hu-berlin.svg</file>
-    <file>gui/ui/icons/logo_qgis.svg</file>
-    <file>gui/ui/icons/mActionAdd.svg</file>
-    <file>gui/ui/icons/mActionAddMapView.svg</file>
-    <file>gui/ui/icons/mActionAddOgrLayer.svg</file>
-    <file>gui/ui/icons/mActionAddRasterLayer.svg</file>
-    <file>gui/ui/icons/mActionAddTS.svg</file>
-    <file>gui/ui/icons/mActionAddVirtualRaster.svg</file>
-    <file>gui/ui/icons/mActionAtlasFirst.svg</file>
-    <file>gui/ui/icons/mActionAtlasLast.svg</file>
-    <file>gui/ui/icons/mActionAtlasNext.svg</file>
-    <file>gui/ui/icons/mActionAtlasPrev.svg</file>
-    <file>gui/ui/icons/mActionCollapseTree.svg</file>
-    <file>gui/ui/icons/mActionEditCopy.svg</file>
-    <file>gui/ui/icons/mActionEditPaste.svg</file>
-    <file>gui/ui/icons/mActionExpandTree.svg</file>
-    <file>gui/ui/icons/mActionFileSave.svg</file>
-    <file>gui/ui/icons/mActionFileSaveAs.svg</file>
-    <file>gui/ui/icons/mActionIdentify.svg</file>
-    <file>gui/ui/icons/mActionOpenTable.svg</file>
-    <file>gui/ui/icons/mActionPan.svg</file>
-    <file>gui/ui/icons/mActionRefresh.svg</file>
-    <file>gui/ui/icons/mActionRemove.svg</file>
-    <file>gui/ui/icons/mActionRemoveMapView.svg</file>
-    <file>gui/ui/icons/mActionRemoveTS.svg</file>
-    <file>gui/ui/icons/mActionRemoveTSD.svg</file>
-    <file>gui/ui/icons/mActionRemoveVirtualRaster.svg</file>
-    <file>gui/ui/icons/mActionSaveTS.svg</file>
-    <file>gui/ui/icons/mActionShowAllLayers.svg</file>
-    <file>gui/ui/icons/mActionTouch.svg</file>
-    <file>gui/ui/icons/mActionZoomActual.svg</file>
-    <file>gui/ui/icons/mActionZoomFullExtent.svg</file>
-    <file>gui/ui/icons/mActionZoomIn.svg</file>
-    <file>gui/ui/icons/mActionZoomOut.svg</file>
-    <file>gui/ui/icons/mActionZoomPoint.svg</file>
-    <file>gui/ui/icons/mActionZoomToArea.svg</file>
-    <file>gui/ui/icons/mActionZoomToLayer.svg</file>
-    <file>gui/ui/icons/mActionZoomToSelected.svg</file>
-    <file>gui/ui/icons/map.svg</file>
-    <file>gui/ui/icons/mapCenterExport.svg</file>
-    <file>gui/ui/icons/mapCenterImport.svg</file>
-    <file>gui/ui/icons/mapExtentExport.svg</file>
-    <file>gui/ui/icons/mapExtentImport.svg</file>
-    <file>gui/ui/icons/mapview.svg</file>
-    <file>gui/ui/icons/mapview2.svg</file>
-    <file>gui/ui/icons/mapviewHidden.svg</file>
-    <file>gui/ui/icons/metadata.svg</file>
-    <file>gui/ui/icons/mIconClear.svg</file>
-    <file>gui/ui/icons/mIconClearText.svg</file>
-    <file>gui/ui/icons/mIconClose.svg</file>
-    <file>gui/ui/icons/mIconCollapse.svg</file>
-    <file>gui/ui/icons/mIconExpand.svg</file>
-    <file>gui/ui/icons/mIconFieldTime.svg</file>
-    <file>gui/ui/icons/mIconLineLayer.svg</file>
-    <file>gui/ui/icons/mIconModelFile.svg</file>
-    <file>gui/ui/icons/mIconPointLayer.svg</file>
-    <file>gui/ui/icons/mIconPolygonLayer.svg</file>
-    <file>gui/ui/icons/mIconRaster.svg</file>
-    <file>gui/ui/icons/mIconRasterClassification.svg</file>
-    <file>gui/ui/icons/mIconRasterImage.svg</file>
-    <file>gui/ui/icons/mIconRasterLayer.svg</file>
-    <file>gui/ui/icons/mIconRasterMask.svg</file>
-    <file>gui/ui/icons/mIconRasterRegression.svg</file>
-    <file>gui/ui/icons/mIconTemporalProfile.svg</file>
-    <file>gui/ui/icons/mIconTemporalProfile2D.svg</file>
-    <file>gui/ui/icons/mIconTemporalProfile3D.svg</file>
-    <file>gui/ui/icons/mIconTemporalProfileRefresh.svg</file>
-    <file>gui/ui/icons/mIconVirtualRaster.svg</file>
-    <file>gui/ui/icons/mIconVirtualRaster2.svg</file>
-    <file>gui/ui/icons/processingAlgorithm.svg</file>
-    <file>gui/ui/icons/processingModel.svg</file>
-    <file>gui/ui/icons/qgis_icon.svg</file>
-    <file>gui/ui/icons/remove_class.svg</file>
-    <file>gui/ui/icons/render.svg</file>
-    <file>gui/ui/icons/settings.svg</file>
-    <file>gui/ui/icons/spectralprofile.svg</file>
-    <file>gui/ui/icons/stylepreset.svg</file>
-    <file>gui/ui/icons/symbology.svg</file>
-    <file>gui/ui/icons/system.svg</file>
-    <file>gui/ui/icons/viewlist_dock.svg</file>
-    <file>gui/ui/icons/viewlist_mapdock.svg</file>
-    <file>gui/ui/icons/viewlist_spectrumdock.svg</file>
-    <file>gui/ui/icons/viewlist_textview.svg</file>
-    <file>gui/ui/icons/zoomToFullExtent.svg</file>
-  </qresource>
-</RCC>
+<RCC>
+  <qresource prefix="enmapbox">
+    <file>gui/ui/icons/sensor.png</file>
+    <file>gui/ui/icons/viewlist_attributetabledock.svg</file>
+    <file>gui/ui/icons/ActionIdentifyTimeSeries.svg</file>
+    <file>gui/ui/icons/add_datasource.svg</file>
+    <file>gui/ui/icons/crosshair.svg</file>
+    <file>gui/ui/icons/crs.svg</file>
+    <file>gui/ui/icons/database.svg</file>
+    <file>gui/ui/icons/dataType.svg</file>
+    <file>gui/ui/icons/dims.svg</file>
+    <file>gui/ui/icons/enmapbox.svg</file>
+    <file>gui/ui/icons/fileInfo.svg</file>
+    <file>gui/ui/icons/filelist_classification.svg</file>
+    <file>gui/ui/icons/filelist_image.svg</file>
+    <file>gui/ui/icons/filelist_mask.svg</file>
+    <file>gui/ui/icons/filelist_regression.svg</file>
+    <file>gui/ui/icons/fileSize.svg</file>
+    <file>gui/ui/icons/general.svg</file>
+    <file>gui/ui/icons/IconTimeSeries.svg</file>
+    <file>gui/ui/icons/link_all.svg</file>
+    <file>gui/ui/icons/link_all_center.svg</file>
+    <file>gui/ui/icons/link_all_mapscale.svg</file>
+    <file>gui/ui/icons/link_all_mapscale_center.svg</file>
+    <file>gui/ui/icons/link_basic.svg</file>
+    <file>gui/ui/icons/link_center.svg</file>
+    <file>gui/ui/icons/link_mapextent.svg</file>
+    <file>gui/ui/icons/link_mapscale.svg</file>
+    <file>gui/ui/icons/link_mapscale_center.svg</file>
+    <file>gui/ui/icons/link_open.svg</file>
+    <file>gui/ui/icons/locked.svg</file>
+    <file>gui/ui/icons/lockedGray.svg</file>
+    <file>gui/ui/icons/logo_dlr.svg</file>
+    <file>gui/ui/icons/logo_gfz.svg</file>
+    <file>gui/ui/icons/logo_hub.svg</file>
+    <file>gui/ui/icons/logo_hu-berlin.svg</file>
+    <file>gui/ui/icons/logo_qgis.svg</file>
+    <file>gui/ui/icons/mActionAdd.svg</file>
+    <file>gui/ui/icons/mActionAddMapView.svg</file>
+    <file>gui/ui/icons/mActionAddOgrLayer.svg</file>
+    <file>gui/ui/icons/mActionAddRasterLayer.svg</file>
+    <file>gui/ui/icons/mActionAddTS.svg</file>
+    <file>gui/ui/icons/mActionAddVirtualRaster.svg</file>
+    <file>gui/ui/icons/mActionAtlasFirst.svg</file>
+    <file>gui/ui/icons/mActionAtlasLast.svg</file>
+    <file>gui/ui/icons/mActionAtlasNext.svg</file>
+    <file>gui/ui/icons/mActionAtlasPrev.svg</file>
+    <file>gui/ui/icons/mActionCollapseTree.svg</file>
+    <file>gui/ui/icons/mActionEditCopy.svg</file>
+    <file>gui/ui/icons/mActionEditPaste.svg</file>
+    <file>gui/ui/icons/mActionExpandTree.svg</file>
+    <file>gui/ui/icons/mActionFileSave.svg</file>
+    <file>gui/ui/icons/mActionFileSaveAs.svg</file>
+    <file>gui/ui/icons/mActionIdentify.svg</file>
+    <file>gui/ui/icons/mActionOpenTable.svg</file>
+    <file>gui/ui/icons/mActionPan.svg</file>
+    <file>gui/ui/icons/mActionRefresh.svg</file>
+    <file>gui/ui/icons/mActionRemove.svg</file>
+    <file>gui/ui/icons/mActionRemoveMapView.svg</file>
+    <file>gui/ui/icons/mActionRemoveTS.svg</file>
+    <file>gui/ui/icons/mActionRemoveTSD.svg</file>
+    <file>gui/ui/icons/mActionRemoveVirtualRaster.svg</file>
+    <file>gui/ui/icons/mActionSaveTS.svg</file>
+    <file>gui/ui/icons/mActionShowAllLayers.svg</file>
+    <file>gui/ui/icons/mActionTouch.svg</file>
+    <file>gui/ui/icons/mActionZoomActual.svg</file>
+    <file>gui/ui/icons/mActionZoomFullExtent.svg</file>
+    <file>gui/ui/icons/mActionZoomIn.svg</file>
+    <file>gui/ui/icons/mActionZoomOut.svg</file>
+    <file>gui/ui/icons/mActionZoomPoint.svg</file>
+    <file>gui/ui/icons/mActionZoomToArea.svg</file>
+    <file>gui/ui/icons/mActionZoomToLayer.svg</file>
+    <file>gui/ui/icons/mActionZoomToSelected.svg</file>
+    <file>gui/ui/icons/map.svg</file>
+    <file>gui/ui/icons/mapCenterExport.svg</file>
+    <file>gui/ui/icons/mapCenterImport.svg</file>
+    <file>gui/ui/icons/mapExtentExport.svg</file>
+    <file>gui/ui/icons/mapExtentImport.svg</file>
+    <file>gui/ui/icons/mapview.svg</file>
+    <file>gui/ui/icons/mapview2.svg</file>
+    <file>gui/ui/icons/mapviewHidden.svg</file>
+    <file>gui/ui/icons/metadata.svg</file>
+    <file>gui/ui/icons/mIconClear.svg</file>
+    <file>gui/ui/icons/mIconClearText.svg</file>
+    <file>gui/ui/icons/mIconClose.svg</file>
+    <file>gui/ui/icons/mIconCollapse.svg</file>
+    <file>gui/ui/icons/mIconExpand.svg</file>
+    <file>gui/ui/icons/mIconFieldTime.svg</file>
+    <file>gui/ui/icons/mIconLineLayer.svg</file>
+    <file>gui/ui/icons/mIconModelFile.svg</file>
+    <file>gui/ui/icons/mIconPointLayer.svg</file>
+    <file>gui/ui/icons/mIconPolygonLayer.svg</file>
+    <file>gui/ui/icons/mIconRaster.svg</file>
+    <file>gui/ui/icons/mIconRasterClassification.svg</file>
+    <file>gui/ui/icons/mIconRasterImage.svg</file>
+    <file>gui/ui/icons/mIconRasterLayer.svg</file>
+    <file>gui/ui/icons/mIconRasterMask.svg</file>
+    <file>gui/ui/icons/mIconRasterRegression.svg</file>
+    <file>gui/ui/icons/mIconTemporalProfile.svg</file>
+    <file>gui/ui/icons/mIconTemporalProfile2D.svg</file>
+    <file>gui/ui/icons/mIconTemporalProfile3D.svg</file>
+    <file>gui/ui/icons/mIconTemporalProfileRefresh.svg</file>
+    <file>gui/ui/icons/mIconVirtualRaster.svg</file>
+    <file>gui/ui/icons/mIconVirtualRaster2.svg</file>
+    <file>gui/ui/icons/processingAlgorithm.svg</file>
+    <file>gui/ui/icons/processingModel.svg</file>
+    <file>gui/ui/icons/qgis_icon.svg</file>
+    <file>gui/ui/icons/remove_class.svg</file>
+    <file>gui/ui/icons/render.svg</file>
+    <file>gui/ui/icons/settings.svg</file>
+    <file>gui/ui/icons/spectralprofile.svg</file>
+    <file>gui/ui/icons/stylepreset.svg</file>
+    <file>gui/ui/icons/symbology.svg</file>
+    <file>gui/ui/icons/system.svg</file>
+    <file>gui/ui/icons/viewlist_dock.svg</file>
+    <file>gui/ui/icons/viewlist_mapdock.svg</file>
+    <file>gui/ui/icons/viewlist_spectrumdock.svg</file>
+    <file>gui/ui/icons/viewlist_textview.svg</file>
+    <file>gui/ui/icons/zoomToFullExtent.svg</file>
+  </qresource>
+</RCC>
diff --git a/enmapbox/gui/enmapboxgui.py b/enmapbox/gui/enmapboxgui.py
@@ -64,11 +64,10 @@
 from qgis.PyQt.QtCore import QUrl
 from qgis.PyQt.QtCore import pyqtSignal, Qt, QObject, QModelIndex, pyqtSlot, QEventLoop, QRect, QSize, QFile
 from qgis.PyQt.QtGui import QDesktopServices
-from qgis.PyQt.QtGui import QDragEnterEvent, QDragMoveEvent, QDragLeaveEvent, QDropEvent, QPixmap, QColor, QIcon, \
+from qgis.PyQt.QtGui import QDragEnterEvent, QDragMoveEvent, QDragLeaveEvent, QDropEvent, QColor, QIcon, \
     QKeyEvent, \
     QCloseEvent, QGuiApplication
-from qgis.PyQt.QtWidgets import QFrame, QToolBar, QToolButton, QAction, QMenu, QSplashScreen, QGraphicsDropShadowEffect, \
-    QMainWindow, QApplication, QSizePolicy, QWidget, QDockWidget, QStyle, QFileDialog, QDialog, QStatusBar, \
+from qgis.PyQt.QtWidgets import QFrame, QToolBar, QToolButton, QAction, QMenu, QMainWindow, QApplication, QSizePolicy, QWidget, QDockWidget, QStyle, QFileDialog, QDialog, QStatusBar, \
     QProgressBar, QMessageBox
 from qgis.PyQt.QtXml import QDomDocument
 from qgis.core import QgsExpressionContextGenerator, QgsExpressionContext, QgsProcessingContext, \
@@ -89,6 +88,7 @@
 from .datasources.datasources import DataSource, RasterDataSource, VectorDataSource, SpatialDataSource
 from .dataviews.docks import DockTypes
 from .mapcanvas import MapCanvas
+from .splashscreen.splashscreen import EnMAPBoxSplashScreen
 from .utils import enmapboxUiPath
 from ..enmapboxsettings import EnMAPBoxSettings
 
@@ -123,56 +123,6 @@ def dropEvent(self, event):
         # self.sigDropEvent.emit(event)
 
 
-class EnMAPBoxSplashScreen(QSplashScreen):
-    """
-    Thr EnMAP-Box Splash Screen
-    """
-
-    def __init__(self, parent=None):
-        pm = QPixmap(':/enmapbox/gui/ui/logo/splashscreen.png')
-        super(EnMAPBoxSplashScreen, self).__init__(parent, pixmap=pm)
-
-        effect = QGraphicsDropShadowEffect()
-        effect.setBlurRadius(5)
-        effect.setColor(QColor('white'))
-        self.setGraphicsEffect(effect)
-
-        css = "" \
-              ""
-
-    def showMessage(self, text: str, alignment: Qt.Alignment = None, color: QColor = None):
-        """
-        Shows a message
-        :param text:
-        :param alignment:
-        :param color:
-        :return:
-        """
-        if alignment is None:
-            alignment = int(Qt.AlignLeft | Qt.AlignBottom)
-        if color is None:
-            color = QColor('black')
-        super(EnMAPBoxSplashScreen, self).showMessage(text, alignment, color)
-        QApplication.processEvents()
-
-    """
-    def drawContents(self, painter: QPainter) -> None:
-        # color = QColor('black')
-        color = QColor('white')
-        color.setAlpha(125)
-
-        painter.setBrush(color)
-        painter.setPen(color)
-        size = self.size()
-        h = 25
-        d = 10
-        rect = QRect(QRect(0, size.height()-h-d, size.width(), size.height()-d) )
-        painter.drawRect(rect)
-        #painter.setPen(QColor('white'))
-        super().drawContents(painter)
-    """
-
-
 class EnMAPBoxUI(QMainWindow):
     mStatusBar: QStatusBar
     mActionProcessingToolbox: QAction

diff --git a/enmapbox/gui/splashscreen/splashscreen.png b/enmapbox/gui/splashscreen/splashscreen.png