diff --git a/CHANGELOG.md b/CHANGELOG.md index 73891855..026739cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,10 @@ RELEASING: 14. Create new release in GitHub with tag version and release title of `vX.X.X` --> +## [Unreleased] +### Added +- Readd old icons and add new icons for processing algorithms + ## [2.0.0] - 2025-05-23 ### Added - Prepare plugin for Qt6 ([#303](github.com/GIScience/orstools-qgis-plugin/issues/303)) diff --git a/ORStools/common/isochrones_core.py b/ORStools/common/isochrones_core.py index 930b933c..70b80030 100644 --- a/ORStools/common/isochrones_core.py +++ b/ORStools/common/isochrones_core.py @@ -29,8 +29,8 @@ from typing import Any, Generator -from qgis._core import QgsMapLayer from qgis.core import ( + QgsMapLayer, QgsPointXY, QgsFeature, QgsFields, diff --git a/ORStools/gui/ORStoolsDialog.py b/ORStools/gui/ORStoolsDialog.py index 207d7626..3d651098 100644 --- a/ORStools/gui/ORStoolsDialog.py +++ b/ORStools/gui/ORStoolsDialog.py @@ -44,7 +44,6 @@ import webbrowser from qgis.PyQt import uic -from qgis._core import Qgis from qgis.core import ( QgsProject, QgsVectorLayer, diff --git a/ORStools/gui/img/icon_export.png b/ORStools/gui/img/icon_export.png new file mode 100644 index 00000000..c820624c Binary files /dev/null and b/ORStools/gui/img/icon_export.png differ diff --git a/ORStools/gui/img/icon_snap.png b/ORStools/gui/img/icon_snap.png new file mode 100644 index 00000000..07d07337 Binary files /dev/null and b/ORStools/gui/img/icon_snap.png differ diff --git a/ORStools/proc/directions_lines_proc.py b/ORStools/proc/directions_lines_proc.py index d1a05c2d..4d6436cb 100644 --- a/ORStools/proc/directions_lines_proc.py +++ b/ORStools/proc/directions_lines_proc.py @@ -29,14 +29,12 @@ from typing import List, Dict, Generator -from qgis._core import ( +from qgis.core import ( QgsFeature, QgsVectorLayer, QgsGeometry, QgsProject, QgsProcessingParameterBoolean, -) -from qgis.core import ( QgsWkbTypes, QgsCoordinateReferenceSystem, QgsProcessing, @@ -51,10 +49,12 @@ QgsProcessingFeedback, ) +from qgis.PyQt.QtGui import QIcon from ORStools.common import directions_core, PROFILES, PREFERENCES, OPTIMIZATION_MODES, EXTRA_INFOS from ORStools.utils import transform, exceptions, logger from .base_processing_algorithm import ORSBaseProcessingAlgorithm from ..utils.processing import get_params_optimize +from ..utils.gui import GuiUtils # noinspection PyPep8Naming @@ -293,3 +293,7 @@ def displayName(self) -> str: :return: """ return self.tr("Directions from 1 Polyline-Layer") + + def icon(self): + icon_path = GuiUtils.get_icon("icon_directions.png") + return QIcon(icon_path) diff --git a/ORStools/proc/directions_points_layer_proc.py b/ORStools/proc/directions_points_layer_proc.py index ce500336..41c8d5cf 100644 --- a/ORStools/proc/directions_points_layer_proc.py +++ b/ORStools/proc/directions_points_layer_proc.py @@ -29,15 +29,13 @@ from typing import Dict, List - -from qgis._core import ( +from qgis.PyQt.QtGui import QIcon +from qgis.core import ( QgsVectorLayer, QgsFeature, QgsGeometry, QgsProject, QgsProcessingParameterBoolean, -) -from qgis.core import ( QgsWkbTypes, QgsCoordinateReferenceSystem, QgsProcessing, @@ -54,6 +52,7 @@ from ORStools.common import directions_core, PROFILES, PREFERENCES, OPTIMIZATION_MODES, EXTRA_INFOS from ORStools.utils import transform, exceptions, logger from .base_processing_algorithm import ORSBaseProcessingAlgorithm +from ..utils.gui import GuiUtils from ..utils.processing import get_params_optimize @@ -302,3 +301,7 @@ def displayName(self) -> str: :return: """ return self.tr("Directions from 1 Point-Layer") + + def icon(self): + icon_path = GuiUtils.get_icon("icon_directions.png") + return QIcon(icon_path) diff --git a/ORStools/proc/directions_points_layers_proc.py b/ORStools/proc/directions_points_layers_proc.py index 67df400f..024e05ef 100644 --- a/ORStools/proc/directions_points_layers_proc.py +++ b/ORStools/proc/directions_points_layers_proc.py @@ -29,6 +29,8 @@ from typing import Dict +from qgis.PyQt.QtGui import QIcon +from ..utils.gui import GuiUtils from ..utils.wrapper import create_qgs_field from qgis.core import ( QgsWkbTypes, @@ -328,3 +330,7 @@ def displayName(self) -> str: :return: """ return self.tr("Directions from 2 Point-Layers") + + def icon(self): + icon_path = GuiUtils.get_icon("icon_directions.png") + return QIcon(icon_path) diff --git a/ORStools/proc/export_proc.py b/ORStools/proc/export_proc.py index f4c155f7..279d9f3a 100644 --- a/ORStools/proc/export_proc.py +++ b/ORStools/proc/export_proc.py @@ -29,6 +29,7 @@ from typing import Dict +from qgis.PyQt.QtGui import QIcon from qgis.core import ( QgsWkbTypes, QgsFeature, @@ -43,6 +44,8 @@ ) from qgis.PyQt.QtCore import QMetaType + +from ..utils.gui import GuiUtils from ..utils.wrapper import create_qgs_field @@ -175,3 +178,7 @@ def displayName(self) -> str: :return: """ return self.tr("Export Network from Map") + + def icon(self): + icon_path = GuiUtils.get_icon("icon_export.png") + return QIcon(icon_path) diff --git a/ORStools/proc/isochrones_layer_proc.py b/ORStools/proc/isochrones_layer_proc.py index c835aa15..0a4b60e0 100644 --- a/ORStools/proc/isochrones_layer_proc.py +++ b/ORStools/proc/isochrones_layer_proc.py @@ -29,6 +29,7 @@ from typing import Dict +from qgis.PyQt.QtGui import QIcon from qgis.core import ( QgsWkbTypes, QgsCoordinateReferenceSystem, @@ -47,6 +48,7 @@ from ORStools.common import isochrones_core, PROFILES, DIMENSIONS, LOCATION_TYPES from ORStools.proc.base_processing_algorithm import ORSBaseProcessingAlgorithm from ORStools.utils import transform, exceptions, logger +from ORStools.utils.gui import GuiUtils # noinspection PyPep8Naming @@ -249,3 +251,7 @@ def displayName(self) -> str: :return: """ return self.tr("Isochrones from Point-Layer") + + def icon(self): + icon_path = GuiUtils.get_icon("icon_isochrones.png") + return QIcon(icon_path) diff --git a/ORStools/proc/isochrones_point_proc.py b/ORStools/proc/isochrones_point_proc.py index 475c82d7..b6b29c16 100644 --- a/ORStools/proc/isochrones_point_proc.py +++ b/ORStools/proc/isochrones_point_proc.py @@ -29,6 +29,7 @@ from typing import Dict +from qgis.PyQt.QtGui import QIcon from qgis.core import ( QgsWkbTypes, QgsCoordinateReferenceSystem, @@ -44,6 +45,7 @@ from ORStools.common import isochrones_core, PROFILES, DIMENSIONS, LOCATION_TYPES from ORStools.utils import exceptions, logger from .base_processing_algorithm import ORSBaseProcessingAlgorithm +from ..utils.gui import GuiUtils # noinspection PyPep8Naming @@ -182,3 +184,7 @@ def displayName(self) -> str: :return: """ return self.tr("Isochrones from Point") + + def icon(self): + icon_path = GuiUtils.get_icon("icon_isochrones.png") + return QIcon(icon_path) diff --git a/ORStools/proc/matrix_proc.py b/ORStools/proc/matrix_proc.py index d2b80932..089347d3 100644 --- a/ORStools/proc/matrix_proc.py +++ b/ORStools/proc/matrix_proc.py @@ -29,6 +29,7 @@ from typing import Dict +from qgis.PyQt.QtGui import QIcon from qgis.core import ( QgsWkbTypes, QgsFeature, @@ -48,6 +49,7 @@ from ORStools.common import PROFILES from ORStools.utils import transform, exceptions, logger from .base_processing_algorithm import ORSBaseProcessingAlgorithm +from ..utils.gui import GuiUtils # noinspection PyPep8Naming @@ -234,3 +236,7 @@ def displayName(self) -> str: :return: """ return self.tr("Matrix from Layers") + + def icon(self): + icon_path = GuiUtils.get_icon("icon_matrix.png") + return QIcon(icon_path) diff --git a/ORStools/proc/snap_layer_proc.py b/ORStools/proc/snap_layer_proc.py index 45c2259f..edd07be5 100644 --- a/ORStools/proc/snap_layer_proc.py +++ b/ORStools/proc/snap_layer_proc.py @@ -29,6 +29,7 @@ from typing import Dict +from qgis.PyQt.QtGui import QIcon from qgis.PyQt.QtCore import QMetaType from qgis.core import ( QgsProcessingParameterFeatureSource, @@ -42,6 +43,7 @@ ) from ORStools.common import PROFILES +from ORStools.utils.gui import GuiUtils from ORStools.utils.processing import get_snapped_point_features from ORStools.proc.base_processing_algorithm import ORSBaseProcessingAlgorithm from ORStools.utils import exceptions, logger, transform @@ -141,3 +143,7 @@ def displayName(self) -> str: :return: """ return self.tr("Snap from Point Layer") + + def icon(self): + icon_path = GuiUtils.get_icon("icon_snap.png") + return QIcon(icon_path) diff --git a/ORStools/proc/snap_point_proc.py b/ORStools/proc/snap_point_proc.py index 304525e4..94fd2db1 100644 --- a/ORStools/proc/snap_point_proc.py +++ b/ORStools/proc/snap_point_proc.py @@ -29,6 +29,7 @@ from typing import Dict +from qgis.PyQt.QtGui import QIcon from qgis.PyQt.QtCore import QMetaType from qgis.core import ( QgsProcessingParameterPoint, @@ -41,6 +42,7 @@ ) from ORStools.common import PROFILES +from ORStools.utils.gui import GuiUtils from ORStools.utils.processing import get_snapped_point_features from ORStools.proc.base_processing_algorithm import ORSBaseProcessingAlgorithm from ORStools.utils import exceptions, logger @@ -126,3 +128,7 @@ def displayName(self) -> str: :return: """ return self.tr("Snap from Point") + + def icon(self): + icon_path = GuiUtils.get_icon("icon_snap.png") + return QIcon(icon_path) diff --git a/tests/test_gui.py b/tests/test_gui.py index cfce0d7b..d51a1728 100644 --- a/tests/test_gui.py +++ b/tests/test_gui.py @@ -1,5 +1,5 @@ from qgis.PyQt.QtWidgets import QLineEdit -from qgis._core import QgsSettings +from qgis.core import QgsSettings from qgis.gui import QgsCollapsibleGroupBox from qgis.testing import unittest