Merge branch 'fix_saga_cluster_analysis' of https://github.com/NaturalGIS/naturalgis_qgis into fix_saga_cluster_analysis

alexbruy · alexbruy · commit 3f20650b1e3c · 2017-07-25T09:09:24.000+03:00
diff --git a/python/plugins/processing/algs/saga/SagaNameDecorator.py b/python/plugins/processing/algs/saga/SagaNameDecorator.py
@@ -96,7 +96,7 @@ def decoratedGroupName(name):
               'Add Grid Values to Shapes': 'Add raster values to features',
               'Change Grid Values': 'Reclassify values (simple)',
               'Clip Grid with Polygon': 'Clip raster with polygon',
-              'Cluster Analysis for Grids': 'Cluster Analysis',
+              'K-Means Clustering for Grid': 'Cluster Analysis',
               'Contour Lines from Grid': 'Contour Lines',
               'Cubic Spline Approximation': 'Interpolate (Cubic spline)',
               'Cut Shapes Layer': 'Cut vector Layer',
diff --git a/python/plugins/processing/algs/saga/description/ClusterAnalysisforGrids.txt b/python/plugins/processing/algs/saga/description/ClusterAnalysisforGrids.txt
@@ -1,9 +1,11 @@
-Cluster Analysis for Grids
+K-Means Clustering for Grids
 imagery_classification
 ParameterMultipleInput|GRIDS|Grids|3.0|False
 ParameterSelection|METHOD|Method|[0] Iterative Minimum Distance (Forgy 1965);[1] Hill-Climbing (Rubin 1967);[2] Combined Minimum Distance / Hillclimbing
-ParameterNumber|NCLUSTER|Clusters|None|None|5
-ParameterBoolean|NORMALISE       |Normalise|True
-ParameterBoolean|OLDVERSION      |Old Version|True
+ParameterNumber|NCLUSTER|Clusters|2|None|10
+ParameterNumber|MAXITER|Maximum Iterations|0|None|0
+ParameterBoolean|NORMALISE|Normalise|True
+ParameterBoolean|OLDVERSION|Old Version|False
+ParameterBoolean|UPDATEVIEW|Update View|False
 OutputRaster|CLUSTER|Clusters
-OutputTable|STATISTICS|Statistics
+OutputTable|STATISTICS|Statistics
