Skip to content

Commit 4fa2bc0

Browse files
committed
Keep correct order for zonal stats options, set some stats by default
1 parent 4eca20f commit 4fa2bc0

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

python/plugins/processing/algs/qgis/ZonalStatistics.py

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
__revision__ = '$Format:%H$'
2727

2828
import os
29+
from collections import OrderedDict
2930

3031
from qgis.PyQt.QtGui import QIcon
3132

@@ -61,20 +62,19 @@ def group(self):
6162

6263
def __init__(self):
6364
super().__init__()
64-
self.STATS = {self.tr('Count'): QgsZonalStatistics.Count,
65-
self.tr('Sum'): QgsZonalStatistics.Sum,
66-
self.tr('Mean'): QgsZonalStatistics.Mean,
67-
self.tr('Median'): QgsZonalStatistics.Median,
68-
self.tr('Std. dev.'): QgsZonalStatistics.StDev,
69-
self.tr('Min'): QgsZonalStatistics.Min,
70-
self.tr('Max'): QgsZonalStatistics.Max,
71-
self.tr('Range'): QgsZonalStatistics.Range,
72-
self.tr('Minority'): QgsZonalStatistics.Minority,
73-
self.tr('Majority (mode)'): QgsZonalStatistics.Majority,
74-
self.tr('Variety'): QgsZonalStatistics.Variety,
75-
self.tr('Variance'): QgsZonalStatistics.Variance,
76-
self.tr('All'): QgsZonalStatistics.All
77-
}
65+
self.STATS = OrderedDict([(self.tr('Count'), QgsZonalStatistics.Count),
66+
(self.tr('Sum'), QgsZonalStatistics.Sum),
67+
(self.tr('Mean'), QgsZonalStatistics.Mean),
68+
(self.tr('Median'), QgsZonalStatistics.Median),
69+
(self.tr('Std. dev.'), QgsZonalStatistics.StDev),
70+
(self.tr('Min'), QgsZonalStatistics.Min),
71+
(self.tr('Max'), QgsZonalStatistics.Max),
72+
(self.tr('Range'), QgsZonalStatistics.Range),
73+
(self.tr('Minority'), QgsZonalStatistics.Minority),
74+
(self.tr('Majority (mode)'), QgsZonalStatistics.Majority),
75+
(self.tr('Variety'), QgsZonalStatistics.Variety),
76+
(self.tr('Variance'), QgsZonalStatistics.Variance),
77+
(self.tr('All'), QgsZonalStatistics.All)])
7878

7979
self.addParameter(QgsProcessingParameterRasterLayer(self.INPUT_RASTER,
8080
self.tr('Raster layer')))
@@ -86,10 +86,11 @@ def __init__(self):
8686
[QgsProcessingParameterDefinition.TypeVectorPolygon]))
8787
self.addParameter(QgsProcessingParameterString(self.COLUMN_PREFIX,
8888
self.tr('Output column prefix'), '_'))
89+
keys = list(self.STATS.keys())
8990
self.addParameter(QgsProcessingParameterEnum(self.STATISTICS,
9091
self.tr('Statistics to calculate'),
91-
list(self.STATS.keys()),
92-
allowMultiple=True))
92+
keys,
93+
allowMultiple=True, defaultValue=[0,1,2]))
9394
self.addOutput(QgsProcessingOutputVectorLayer(self.INPUT_VECTOR,
9495
self.tr('Zonal statistics'),
9596
QgsProcessingParameterDefinition.TypeVectorPolygon))

0 commit comments

Comments
 (0)