[needs-docs][processing] vectorize and improve remaining data analysi…

…s menu icons
qgis · May 15, 2018 · 9a82dbe · 9a82dbe
1 parent 97eceb1
commit 9a82dbe
Show file tree

Hide file tree

Showing 13 changed files with 48 additions and 12 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -76,6 +76,7 @@
         <file>north_arrows/gpsarrow2.svg</file>
         <file>splash/splash.png</file>
         <file>composer/missing_image.svg</file>
+        <file>themes/default/algorithms/mAlgorithmBasicStatistics.svg</file>
         <file>themes/default/algorithms/mAlgorithmBuffer.svg</file>
         <file>themes/default/algorithms/mAlgorithmCentroids.svg</file>
         <file>themes/default/algorithms/mAlgorithmCheckGeometry.svg</file>
@@ -85,6 +86,7 @@
         <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/mAlgorithmDistanceMatrix.svg</file>
         <file>themes/default/algorithms/mAlgorithmAddGeometryAttributes.svg</file>
         <file>themes/default/algorithms/mAlgorithmExtractVertices.svg</file>
         <file>themes/default/algorithms/mAlgorithmIntersect.svg</file>
@@ -93,12 +95,16 @@
         <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/mAlgorithmNearestNeighbour.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/mAlgorithmSumLengthLines.svg</file>
+        <file>themes/default/algorithms/mAlgorithmSumPoints.svg</file>
         <file>themes/default/algorithms/mAlgorithmSymmetricalDifference.svg</file>
         <file>themes/default/algorithms/mAlgorithmUnion.svg</file>
+        <file>themes/default/algorithms/mAlgorithmUniqueValues.svg</file>
         <file>themes/default/algorithms/mAlgorithmVoronoi.svg</file>
         <file>themes/default/cap_flat.svg</file>
         <file>themes/default/cap_round.svg</file>

diff --git a/images/themes/default/algorithms/mAlgorithmBasicStatistics.svg b/images/themes/default/algorithms/mAlgorithmBasicStatistics.svg
diff --git a/images/themes/default/algorithms/mAlgorithmDistanceMatrix.svg b/images/themes/default/algorithms/mAlgorithmDistanceMatrix.svg
diff --git a/images/themes/default/algorithms/mAlgorithmNearestNeighbour.svg b/images/themes/default/algorithms/mAlgorithmNearestNeighbour.svg
diff --git a/images/themes/default/algorithms/mAlgorithmSumLengthLines.svg b/images/themes/default/algorithms/mAlgorithmSumLengthLines.svg
diff --git a/images/themes/default/algorithms/mAlgorithmSumPoints.svg b/images/themes/default/algorithms/mAlgorithmSumPoints.svg
diff --git a/images/themes/default/algorithms/mAlgorithmUniqueValues.svg b/images/themes/default/algorithms/mAlgorithmUniqueValues.svg
diff --git a/python/plugins/processing/algs/qgis/BasicStatistics.py b/python/plugins/processing/algs/qgis/BasicStatistics.py
@@ -31,7 +31,8 @@
 from qgis.PyQt.QtCore import QVariant
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import (QgsStatisticalSummary,
+from qgis.core import (QgsApplication,
+                       QgsStatisticalSummary,
                        QgsStringStatisticalSummary,
                        QgsDateTimeStatisticalSummary,
                        QgsFeatureRequest,
@@ -75,7 +76,10 @@ class BasicStatisticsForField(QgisAlgorithm):
     IQR = 'IQR'
 
     def icon(self):
-        return QIcon(os.path.join(pluginPath, 'images', 'ftools', 'basic_statistics.png'))
+        return QgsApplication.getThemeIcon("/algorithms/mAlgorithmBasicStatistics.svg")
+
+    def svgIconPath(self):
+        return QgsApplication.iconPath("/algorithms/mAlgorithmBasicStatistics.svg")
 
     def tags(self):
         return self.tr('stats,statistics,date,time,datetime,string,number,text,table,layer,maximum,minimum,mean,average,standard,deviation,'

diff --git a/python/plugins/processing/algs/qgis/NearestNeighbourAnalysis.py b/python/plugins/processing/algs/qgis/NearestNeighbourAnalysis.py
@@ -31,7 +31,8 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import (QgsFeatureRequest,
+from qgis.core import (QgsApplication,
+                       QgsFeatureRequest,
                        QgsDistanceArea,
                        QgsProject,
                        QgsProcessing,
@@ -57,7 +58,10 @@ class NearestNeighbourAnalysis(QgisAlgorithm):
     Z_SCORE = 'Z_SCORE'
 
     def icon(self):
-        return QIcon(os.path.join(pluginPath, 'images', 'ftools', 'neighbour.png'))
+        return QgsApplication.getThemeIcon("/algorithms/mAlgorithmNearestNeighbour.svg")
+
+    def svgIconPath(self):
+        return QgsApplication.iconPath("/algorithms/mAlgorithmNearestNeighbour.svg")
 
     def group(self):
         return self.tr('Vector analysis')

diff --git a/python/plugins/processing/algs/qgis/PointDistance.py b/python/plugins/processing/algs/qgis/PointDistance.py
@@ -31,7 +31,8 @@
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtCore import QVariant
 
-from qgis.core import (QgsFeatureRequest,
+from qgis.core import (QgsApplication,
+                       QgsFeatureRequest,
                        QgsField,
                        QgsFields,
                        QgsProject,
@@ -64,7 +65,10 @@ class PointDistance(QgisAlgorithm):
     OUTPUT = 'OUTPUT'
 
     def icon(self):
-        return QIcon(os.path.join(pluginPath, 'images', 'ftools', 'matrix.png'))
+        return QgsApplication.getThemeIcon("/algorithms/mAlgorithmDistanceMatrix.svg")
+
+    def svgIconPath(self):
+        return QgsApplication.iconPath("/algorithms/mAlgorithmDistanceMatrix.svg")
 
     def group(self):
         return self.tr('Vector analysis')

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

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

diff --git a/python/plugins/processing/algs/qgis/UniqueValues.py b/python/plugins/processing/algs/qgis/UniqueValues.py
@@ -30,7 +30,8 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import (QgsCoordinateReferenceSystem,
+from qgis.core import (QgsApplication,
+                       QgsCoordinateReferenceSystem,
                        QgsWkbTypes,
                        QgsFeature,
                        QgsFeatureSink,
@@ -61,7 +62,10 @@ class UniqueValues(QgisAlgorithm):
     OUTPUT_HTML_FILE = 'OUTPUT_HTML_FILE'
 
     def icon(self):
-        return QIcon(os.path.join(pluginPath, 'images', 'ftools', 'unique.png'))
+        return QgsApplication.getThemeIcon("/algorithms/mAlgorithmUniqueValues.svg")
+
+    def svgIconPath(self):
+        return QgsApplication.iconPath("/algorithms/mAlgorithmUniqueValues.svg")
 
     def group(self):
         return self.tr('Vector analysis')