Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion ORStools/common/isochrones_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@

from typing import Any, Generator

from qgis._core import QgsMapLayer
from qgis.core import (
QgsMapLayer,
QgsPointXY,
QgsFeature,
QgsFields,
Expand Down
1 change: 0 additions & 1 deletion ORStools/gui/ORStoolsDialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import webbrowser

from qgis.PyQt import uic
from qgis._core import Qgis
from qgis.core import (
QgsProject,
QgsVectorLayer,
Expand Down
Binary file added ORStools/gui/img/icon_export.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ORStools/gui/img/icon_snap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 7 additions & 3 deletions ORStools/proc/directions_lines_proc.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down Expand Up @@ -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)
11 changes: 7 additions & 4 deletions ORStools/proc/directions_points_layer_proc.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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


Expand Down Expand Up @@ -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)
6 changes: 6 additions & 0 deletions ORStools/proc/directions_points_layers_proc.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)
7 changes: 7 additions & 0 deletions ORStools/proc/export_proc.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

from typing import Dict

from qgis.PyQt.QtGui import QIcon
from qgis.core import (
QgsWkbTypes,
QgsFeature,
Expand All @@ -43,6 +44,8 @@
)

from qgis.PyQt.QtCore import QMetaType

from ..utils.gui import GuiUtils
from ..utils.wrapper import create_qgs_field


Expand Down Expand Up @@ -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)
6 changes: 6 additions & 0 deletions ORStools/proc/isochrones_layer_proc.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

from typing import Dict

from qgis.PyQt.QtGui import QIcon
from qgis.core import (
QgsWkbTypes,
QgsCoordinateReferenceSystem,
Expand All @@ -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
Expand Down Expand Up @@ -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)
6 changes: 6 additions & 0 deletions ORStools/proc/isochrones_point_proc.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

from typing import Dict

from qgis.PyQt.QtGui import QIcon
from qgis.core import (
QgsWkbTypes,
QgsCoordinateReferenceSystem,
Expand All @@ -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
Expand Down Expand Up @@ -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)
6 changes: 6 additions & 0 deletions ORStools/proc/matrix_proc.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

from typing import Dict

from qgis.PyQt.QtGui import QIcon
from qgis.core import (
QgsWkbTypes,
QgsFeature,
Expand All @@ -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
Expand Down Expand Up @@ -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)
6 changes: 6 additions & 0 deletions ORStools/proc/snap_layer_proc.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down Expand Up @@ -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)
6 changes: 6 additions & 0 deletions ORStools/proc/snap_point_proc.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down Expand Up @@ -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)
2 changes: 1 addition & 1 deletion tests/test_gui.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down