[processing][saga] Remove duplicate GWR algs, fix params

qgis · Jun 15, 2018 · d04fee6 · d04fee6
1 parent 0a2c856
commit d04fee6
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 69 deletions.
diff --git a/python/plugins/processing/algs/saga/description/GWRforMultiplePredictors.txt b/python/plugins/processing/algs/saga/description/GWRforMultiplePredictors.txt
@@ -1,8 +1,8 @@
 GWR for Multiple Predictors
 statistics_regression
 QgsProcessingParameterFeatureSource|POINTS|Points|0|None|False
-QgsProcessingParameterFeatureSource|DEPENDENT|Dependent Variable|5|None|False
+QgsProcessingParameterField|DEPENDENT|Dependent Variable|None|POINTS|-1|False|False
-QgsProcessingParameterFeatureSource|PREDICTORS|Predictors|5|None|False
+QgsProcessingParameterField|PREDICTORS|Predictor|None|POINTS|-1|False|False
 QgsProcessingParameterVectorDestination|REGRESSION|Regression
 QgsProcessingParameterEnum|DW_WEIGHTING|Weighting Function|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting|False|3
 QgsProcessingParameterNumber|DW_IDW_POWER|Inverse Distance Weighting Power|QgsProcessingParameterNumber.Double|1.000000|False|0.000000|None

diff --git a/...on/plugins/processing/algs/saga/description/GWRforSinglePredictor(GriddedModelOutput).txt b/...on/plugins/processing/algs/saga/description/GWRforSinglePredictor(GriddedModelOutput).txt
@@ -1,8 +1,8 @@
 GWR for Single Predictor (Gridded Model Output)
 statistics_regression
 QgsProcessingParameterFeatureSource|POINTS|Points|0|None|False
-QgsProcessingParameterFeatureSource|DEPENDENT|Dependent Variable|5|None|False
+QgsProcessingParameterField|DEPENDENT|Dependent Variable|None|POINTS|-1|False|False
-QgsProcessingParameterFeatureSource|PREDICTOR|Predictor|5|None|False
+QgsProcessingParameterField|PREDICTOR|Predictor|None|POINTS|-1|False|False
 QgsProcessingParameterEnum|TARGET_DEFINITION|Target Grid System|[0] user defined;[1] grid or grid system|False|0
 QgsProcessingParameterNumber|TARGET_USER_SIZE|Cellsize|QgsProcessingParameterNumber.Double|1.000000|False|0.000000|None
 QgsProcessingParameterNumber|TARGET_USER_XMIN|Left|QgsProcessingParameterNumber.Double|0.000000|False|None|None

diff --git a/python/plugins/processing/algs/saga/description/GWRforSinglePredictorGrid.txt b/python/plugins/processing/algs/saga/description/GWRforSinglePredictorGrid.txt
@@ -1,13 +1,8 @@
 GWR for Single Predictor Grid
 statistics_regression
 QgsProcessingParameterFeatureSource|POINTS|Points|0|None|False
-QgsProcessingParameterFeatureSource|DEPENDENT|Dependent Variable|5|None|False
-QgsProcessingParameterVectorDestination|RESIDUALS|Residuals
 QgsProcessingParameterRasterLayer|PREDICTOR|Predictor|None|False
-QgsProcessingParameterRasterDestination|REGRESSION|Regression
+QgsProcessingParameterField|DEPENDENT|Dependent Variable|None|POINTS|-1|False|False
-QgsProcessingParameterRasterDestination|QUALITY|Coefficient of Determination
-QgsProcessingParameterRasterDestination|INTERCEPT|Intercept
-QgsProcessingParameterRasterDestination|SLOPE|Slope
 QgsProcessingParameterEnum|DW_WEIGHTING|Weighting Function|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting|False|3
 QgsProcessingParameterNumber|DW_IDW_POWER|Inverse Distance Weighting Power|QgsProcessingParameterNumber.Double|1.000000|False|0.000000|None
 QgsProcessingParameterBoolean|DW_IDW_OFFSET|Inverse Distance Offset|True
@@ -18,3 +13,8 @@ QgsProcessingParameterEnum|SEARCH_POINTS_ALL|Number of Points|[0] maximum number
 QgsProcessingParameterNumber|SEARCH_POINTS_MIN|Minimum|QgsProcessingParameterNumber.Integer|16|False|1|None
 QgsProcessingParameterNumber|SEARCH_POINTS_MAX|Maximum|QgsProcessingParameterNumber.Integer|20|False|1|None
 QgsProcessingParameterEnum|SEARCH_DIRECTION|Direction|[0] all directions;[1] quadrants|False|0
+QgsProcessingParameterVectorDestination|RESIDUALS|Residuals|-1|None|True
+QgsProcessingParameterRasterDestination|REGRESSION|Regression
+QgsProcessingParameterRasterDestination|QUALITY|Coefficient of Determination|None|True
+QgsProcessingParameterRasterDestination|INTERCEPT|Intercept|None|True
+QgsProcessingParameterRasterDestination|SLOPE|Slope|None|True
diff --git a/...ins/processing/algs/saga/description/GeographicallyWeightedMultipleRegression(Points).txt b/...ins/processing/algs/saga/description/GeographicallyWeightedMultipleRegression(Points).txt
diff --git a/...plugins/processing/algs/saga/description/GeographicallyWeightedRegression(PointsGrid).txt b/...plugins/processing/algs/saga/description/GeographicallyWeightedRegression(PointsGrid).txt
diff --git a/python/plugins/processing/algs/saga/description/GeographicallyWeightedRegression.txt b/python/plugins/processing/algs/saga/description/GeographicallyWeightedRegression.txt