[needs-docs][processing] vectorize and improve remaining geometry too…

…ls menu icons
qgis · May 15, 2018 · 5cb8c25 · 5cb8c25
1 parent 395e864
commit 5cb8c25
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 11 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -78,22 +78,28 @@
         <file>composer/missing_image.svg</file>
         <file>themes/default/algorithms/mAlgorithmBuffer.svg</file>
         <file>themes/default/algorithms/mAlgorithmCentroids.svg</file>
+        <file>themes/default/algorithms/mAlgorithmCheckGeometry.svg</file>
         <file>themes/default/algorithms/mAlgorithmClip.svg</file>
         <file>themes/default/algorithms/mAlgorithmCollect.svg</file>
         <file>themes/default/algorithms/mAlgorithmConvexHull.svg</file>
+        <file>themes/default/algorithms/mAlgorithmDelaunay.svg</file>
         <file>themes/default/algorithms/mAlgorithmDifference.svg</file>
         <file>themes/default/algorithms/mAlgorithmDissolve.svg</file>
+        <file>themes/default/algorithms/mAlgorithmAddGeometryAttributes.svg</file>
         <file>themes/default/algorithms/mAlgorithmExtractVertices.svg</file>
         <file>themes/default/algorithms/mAlgorithmIntersect.svg</file>
         <file>themes/default/algorithms/mAlgorithmLineIntersections.svg</file>
+        <file>themes/default/algorithms/mAlgorithmLineToPolygon.svg</file>
         <file>themes/default/algorithms/mAlgorithmMeanCoordinates.svg</file>
         <file>themes/default/algorithms/mAlgorithmMergeLayers.svg</file>
         <file>themes/default/algorithms/mAlgorithmMultiToSingle.svg</file>
+        <file>themes/default/algorithms/mAlgorithmPolygonToLine.svg</file>
         <file>themes/default/algorithms/mAlgorithmSimplify.svg</file>
         <file>themes/default/algorithms/mAlgorithmSingleToMulti.svg</file>
         <file>themes/default/algorithms/mAlgorithmSplitLayer.svg</file>
         <file>themes/default/algorithms/mAlgorithmSymmetricalDifference.svg</file>
         <file>themes/default/algorithms/mAlgorithmUnion.svg</file>
+        <file>themes/default/algorithms/mAlgorithmVoronoi.svg</file>
         <file>themes/default/cap_flat.svg</file>
         <file>themes/default/cap_round.svg</file>
         <file>themes/default/cap_square.svg</file>

diff --git a/images/themes/default/algorithms/mAlgorithmAddGeometryAttributes.svg b/images/themes/default/algorithms/mAlgorithmAddGeometryAttributes.svg
diff --git a/images/themes/default/algorithms/mAlgorithmCheckGeometry.svg b/images/themes/default/algorithms/mAlgorithmCheckGeometry.svg
diff --git a/images/themes/default/algorithms/mAlgorithmDelaunay.svg b/images/themes/default/algorithms/mAlgorithmDelaunay.svg
diff --git a/images/themes/default/algorithms/mAlgorithmLineToPolygon.svg b/images/themes/default/algorithms/mAlgorithmLineToPolygon.svg
diff --git a/images/themes/default/algorithms/mAlgorithmPolygonToLine.svg b/images/themes/default/algorithms/mAlgorithmPolygonToLine.svg
diff --git a/images/themes/default/algorithms/mAlgorithmVoronoi.svg b/images/themes/default/algorithms/mAlgorithmVoronoi.svg
diff --git a/python/plugins/processing/algs/qgis/CheckValidity.py b/python/plugins/processing/algs/qgis/CheckValidity.py
@@ -30,7 +30,8 @@
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtCore import QVariant
 
-from qgis.core import (QgsSettings,
+from qgis.core import (QgsApplication,
+                       QgsSettings,
                        QgsGeometry,
                        QgsFeature,
                        QgsField,
@@ -63,7 +64,10 @@ class CheckValidity(QgisAlgorithm):
     ERROR_COUNT = 'ERROR_COUNT'
 
     def icon(self):
-        return QIcon(os.path.join(pluginPath, 'images', 'ftools', 'check_geometry.png'))
+        return QgsApplication.getThemeIcon("/algorithms/mAlgorithmCheckGeometry.svg")
+
+    def svgIconPath(self):
+        return QgsApplication.iconPath("/algorithms/mAlgorithmCheckGeometry.svg")
 
     def group(self):
         return self.tr('Vector geometry')

diff --git a/python/plugins/processing/algs/qgis/Delaunay.py b/python/plugins/processing/algs/qgis/Delaunay.py
@@ -30,7 +30,8 @@
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtCore import QVariant
 
-from qgis.core import (QgsField,
+from qgis.core import (QgsApplication,
+                       QgsField,
                        QgsFeatureRequest,
                        QgsFeatureSink,
                        QgsFeature,
@@ -56,7 +57,10 @@ class Delaunay(QgisAlgorithm):
     OUTPUT = 'OUTPUT'
 
     def icon(self):
-        return QIcon(os.path.join(pluginPath, 'images', 'ftools', 'delaunay.png'))
+        return QgsApplication.getThemeIcon("/algorithms/mAlgorithmDelaunay.svg")
+
+    def svgIconPath(self):
+        return QgsApplication.iconPath("/algorithms/mAlgorithmDelaunay.svg")
 
     def group(self):
         return self.tr('Vector geometry')

diff --git a/python/plugins/processing/algs/qgis/ExportGeometryInfo.py b/python/plugins/processing/algs/qgis/ExportGeometryInfo.py
@@ -32,6 +32,7 @@
 from qgis.PyQt.QtCore import QVariant
 
 from qgis.core import (NULL,
+                       QgsApplication,
                        QgsCoordinateTransform,
                        QgsField,
                        QgsFields,
@@ -58,7 +59,10 @@ class ExportGeometryInfo(QgisAlgorithm):
     OUTPUT = 'OUTPUT'
 
     def icon(self):
-        return QIcon(os.path.join(pluginPath, 'images', 'ftools', 'export_geometry.png'))
+        return QgsApplication.getThemeIcon("/algorithms/mAlgorithmAddGeometryAttributes.svg")
+
+    def svgIconPath(self):
+        return QgsApplication.iconPath("/algorithms/mAlgorithmAddGeometryAttributes.svg")
 
     def tags(self):
         return self.tr('export,add,information,measurements,areas,lengths,perimeters,latitudes,longitudes,x,y,z,extract,points,lines,polygons,sinuosity').split(',')

diff --git a/python/plugins/processing/algs/qgis/LinesToPolygons.py b/python/plugins/processing/algs/qgis/LinesToPolygons.py
@@ -29,7 +29,8 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import (QgsFeature,
+from qgis.core import (QgsApplication,
+                       QgsFeature,
                        QgsGeometry,
                        QgsGeometryCollection,
                        QgsPolygon,
@@ -51,7 +52,10 @@
 class LinesToPolygons(QgisFeatureBasedAlgorithm):
 
     def icon(self):
-        return QIcon(os.path.join(pluginPath, 'images', 'ftools', 'to_lines.png'))
+        return QgsApplication.getThemeIcon("/algorithms/mAlgorithmLineToPolygon.svg")
+
+    def svgIconPath(self):
+        return QgsApplication.iconPath("/algorithms/mAlgorithmLineToPolygon.svg")
 
     def tags(self):
         return self.tr('line,polygon,convert').split(',')

diff --git a/python/plugins/processing/algs/qgis/PolygonsToLines.py b/python/plugins/processing/algs/qgis/PolygonsToLines.py
@@ -29,7 +29,8 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import (QgsGeometry,
+from qgis.core import (QgsApplication,
+                       QgsGeometry,
                        QgsGeometryCollection,
                        QgsMultiLineString,
                        QgsMultiCurve,
@@ -44,7 +45,10 @@
 class PolygonsToLines(QgisFeatureBasedAlgorithm):
 
     def icon(self):
-        return QIcon(os.path.join(pluginPath, 'images', 'ftools', 'to_lines.png'))
+        return QgsApplication.getThemeIcon("/algorithms/mAlgorithmPolygonToLine.svg")
+
+    def svgIconPath(self):
+        return QgsApplication.iconPath("/algorithms/mAlgorithmPolygonToLine.svg")
 
     def tags(self):
         return self.tr('line,polygon,convert').split(',')

diff --git a/python/plugins/processing/algs/qgis/VoronoiPolygons.py b/python/plugins/processing/algs/qgis/VoronoiPolygons.py
@@ -29,7 +29,8 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import (QgsFeatureRequest,
+from qgis.core import (QgsApplication,
+                       QgsFeatureRequest,
                        QgsFeatureSink,
                        QgsFeature,
                        QgsGeometry,
@@ -56,7 +57,10 @@ class VoronoiPolygons(QgisAlgorithm):
     OUTPUT = 'OUTPUT'
 
     def icon(self):
-        return QIcon(os.path.join(pluginPath, 'images', 'ftools', 'voronoi.png'))
+        return QgsApplication.getThemeIcon("/algorithms/mAlgorithmVoronoi.svg")
+
+    def svgIconPath(self):
+        return QgsApplication.iconPath("/algorithms/mAlgorithmVoronoi.svg")
 
     def group(self):
         return self.tr('Vector geometry')