[processing][saga] Fix duplicate cluster analysis algs

qgis · Jun 15, 2018 · 37e3798 · 37e3798
1 parent a8c0cef
commit 37e3798
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 15 deletions.
diff --git a/python/plugins/processing/algs/saga/SagaNameDecorator.py b/python/plugins/processing/algs/saga/SagaNameDecorator.py
@@ -96,7 +96,6 @@ 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',
-              'K-Means Clustering for Grids': '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/ClusterAnalysis.txt b/python/plugins/processing/algs/saga/description/ClusterAnalysis.txt
@@ -2,9 +2,9 @@ Cluster Analysis
 table_calculus
 QgsProcessingParameterFeatureSource|INPUT|Table|5|None|False
 QgsProcessingParameterVectorDestination|RESULT|Result
+QgsProcessingParameterVectorDestination|STATISTICS|Statistics|-1|None|True
 QgsProcessingParameterField|FIELDS|Attributes|None|INPUT|-1|False|False
 QgsProcessingParameterField|CLUSTER|Cluster|None|INPUT|-1|False|False
-QgsProcessingParameterVectorDestination|STATISTICS|Result
 QgsProcessingParameterEnum|METHOD|Method|[0] Iterative Minimum Distance (Forgy 1965);[1] Hill-Climbing (Rubin 1967);[2] Combined Minimum Distance / Hillclimbing|False|1
 QgsProcessingParameterNumber|NCLUSTER|Clusters|QgsProcessingParameterNumber.Integer|10|False|2|None
 QgsProcessingParameterBoolean|NORMALISE|Normalise|False
diff --git a/python/plugins/processing/algs/saga/description/ClusterAnalysisforGrids.txt b/python/plugins/processing/algs/saga/description/ClusterAnalysisforGrids.txt
diff --git a/python/plugins/processing/algs/saga/description/K-MeansClusteringforGrids.txt b/python/plugins/processing/algs/saga/description/K-MeansClusteringforGrids.txt
@@ -1,11 +1,11 @@
 K-Means Clustering for Grids
 imagery_classification
 QgsProcessingParameterMultipleLayers|GRIDS|Grids|3|None|False
-QgsProcessingParameterRasterDestination|CLUSTER|Clusters
-QgsProcessingParameterFeatureSource|STATISTICS|Statistics|5|None|False
 QgsProcessingParameterEnum|METHOD|Method|[0] Iterative Minimum Distance (Forgy 1965);[1] Hill-Climbing (Rubin 1967);[2] Combined Minimum Distance / Hillclimbing|False|1
 QgsProcessingParameterNumber|NCLUSTER|Clusters|QgsProcessingParameterNumber.Integer|10|False|2|None
 QgsProcessingParameterNumber|MAXITER|Maximum Iterations|QgsProcessingParameterNumber.Integer|0|False|0|None
 QgsProcessingParameterBoolean|NORMALISE|Normalise|False
 QgsProcessingParameterBoolean|OLDVERSION|Old Version|False
 QgsProcessingParameterBoolean|UPDATEVIEW|Update View|True
+QgsProcessingParameterRasterDestination|CLUSTER|Clusters
+QgsProcessingParameterVectorDestination|STATISTICS|Statistics