Skip to content

Commit

Permalink
[processing][saga] Fix some field parameters are incorrectly defined …
Browse files Browse the repository at this point in the history 
…as feature sources

Fixes #18193
  • Loading branch information
@nyalldawson
nyalldawson committed Jun 1, 2018
1 parent f6416a1 commit 4289bcb
Show file tree
Hide file tree
Showing 13 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/saga/description/AddIndicatorFieldsforCategories.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Add Indicator Fields for Categories
table_tools
QgsProcessingParameterFeatureSource|TABLE|Table|5|None|False
QgsProcessingParameterFeatureSource|FIELD|Categories|5|None|False
QgsProcessingParameterField|FIELD|Categories|None|TABLE|-1|False|False
QgsProcessingParameterFeatureSource|OUT_TABLE|Output table with field(s) deleted|5|None|True
QgsProcessingParameterVectorDestination|OUT_SHAPES|Output shapes with field(s) deleted
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/saga/description/AngularDistanceWeighted.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Angular Distance Weighted
grid_gridding
QgsProcessingParameterFeatureSource|SHAPES|Points|-1|None|False
QgsProcessingParameterFeatureSource|FIELD|Attribute|5|None|False
QgsProcessingParameterField|FIELD|Attribute|None|SHAPES|-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
Expand Down
6 changes: 3 additions & 3 deletions python/plugins/processing/algs/saga/description/ClusterAnalysis(Shapes).txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ Cluster Analysis (Shapes)
table_calculus
QgsProcessingParameterFeatureSource|INPUT|Shapes|-1|None|False
QgsProcessingParameterVectorDestination|RESULT|Result
QgsProcessingParameterFeatureSource|FIELDS|Attributes|5|None|False
QgsProcessingParameterFeatureSource|CLUSTER|Cluster|5|None|False
QgsProcessingParameterFeatureSource|STATISTICS|Statistics|5|None|False
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
8 changes: 4 additions & 4 deletions python/plugins/processing/algs/saga/description/ClusterAnalysis.txt
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Cluster Analysis
table_calculus
QgsProcessingParameterFeatureSource|INPUT|Table|5|None|False
QgsProcessingParameterFeatureSource|RESULT|Result|5|None|True
QgsProcessingParameterFeatureSource|FIELDS|Attributes|5|None|False
QgsProcessingParameterFeatureSource|CLUSTER|Cluster|5|None|False
QgsProcessingParameterFeatureSource|STATISTICS|Statistics|5|None|False
QgsProcessingParameterVectorDestination|RESULT|Result
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
14 changes: 7 additions & 7 deletions python/plugins/processing/algs/saga/description/ConfusionMatrix(PolygonsGrid).txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ Confusion Matrix (Polygons / Grid)
imagery_classification
QgsProcessingParameterRasterLayer|GRID|Classification|None|False
QgsProcessingParameterFeatureSource|GRID_LUT|Look-up Table|5|None|True
QgsProcessingParameterFeatureSource|GRID_LUT_MIN|Value|5|None|False
QgsProcessingParameterFeatureSource|GRID_LUT_MAX|Value (Maximum)|5|None|False
QgsProcessingParameterFeatureSource|GRID_LUT_NAM|Name|5|None|False
QgsProcessingParameterField|GRID_LUT_MIN|Value|None|GRID_LUT|-1|False|False
QgsProcessingParameterField|GRID_LUT_MAX|Value (Maximum)|None|GRID_LUT|-1|False|False
QgsProcessingParameterField|GRID_LUT_NAM|Name|None|GRID_LUT|-1|False|False
QgsProcessingParameterFeatureSource|POLYGONS|Polygons|-1|None|False
QgsProcessingParameterFeatureSource|FIELD|Classes|5|None|False
QgsProcessingParameterFeatureSource|CONFUSION|Confusion Matrix|5|None|False
QgsProcessingParameterFeatureSource|CLASSES|Class Values|5|None|False
QgsProcessingParameterFeatureSource|SUMMARY|Summary|5|None|False
QgsProcessingParameterField|FIELD|Class Values|None|POLYGONS|-1|False|False
QgsProcessingParameterVectorDestination|CONFUSION|Confusion Matrix
QgsProcessingParameterVectorDestination|CLASSES|Class Values
QgsProcessingParameterVectorDestination|SUMMARY|Summary
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/saga/description/EnumerateTableField.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Enumerate Table Field
table_tools
QgsProcessingParameterFeatureSource|INPUT|Input|5|None|False
QgsProcessingParameterFeatureSource|FIELD|Attribute|5|None|False
QgsProcessingParameterFeatureSource|OUTPUT|Output|5|None|True
QgsProcessingParameterField|FIELD|Attribute|None|INPUT|-1|False|True
QgsProcessingParameterVectorDestination|OUTPUT|Output
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/saga/description/FieldStatistics.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Field Statistics
table_calculus
QgsProcessingParameterFeatureSource|TABLE|Table|5|None|False
QgsProcessingParameterFeatureSource|FIELDS|Attributes|5|None|False
QgsProcessingParameterFeatureSource|STATISTICS|Statistics|5|None|False
QgsProcessingParameterField|FIELDS|Attributes|None|TABLE|-1|False|True
QgsProcessingParameterVectorDestination|STATISTICS|Statistics
10 changes: 5 additions & 5 deletions python/plugins/processing/algs/saga/description/FindFieldofExtremeValue.txt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Find Field of Extreme Value
table_calculus
QgsProcessingParameterFeatureSource|INPUT|Input|5|None|False
QgsProcessingParameterFeatureSource|FIELDS|Attributes|5|None|False
QgsProcessingParameterFeatureSource|EXTREME_ID|Attribute|5|None|False
QgsProcessingParameterFeatureSource|EXTREME_VALUE|Value|5|None|False
QgsProcessingParameterFeatureSource|OUTPUT|Output|5|None|True
QgsProcessingParameterField|FIELDS|Attributes|None|INPUT|-1|False|False
QgsProcessingParameterField|EXTREME_ID|Attribute|None|INPUT|-1|False|False
QgsProcessingParameterField|EXTREME_VALUE|Value|None|INPUT|-1|False|False
QgsProcessingParameterEnum|TYPE|TYPE|[0] minimum;[1] maximum|False|1
QgsProcessingParameterEnum|IDENTIFY|Attribute Identification|[0] name;[1] index|False|0
QgsProcessingParameterEnum|IDENTIFY|Attribute Identification|[0] name;[1] index|False|0
QgsProcessingParameterVectorDestination|OUTPUT|Output
6 changes: 3 additions & 3 deletions python/plugins/processing/algs/saga/description/GenerateShapes.txt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Generate Shapes
shapes_tools
QgsProcessingParameterFeatureSource|INPUT|Input|5|None|False
QgsProcessingParameterFeatureSource|FIELD_ID|ID|5|None|False
QgsProcessingParameterFeatureSource|FIELD_X|X|5|None|False
QgsProcessingParameterFeatureSource|FIELD_Y|Y|5|None|False
QgsProcessingParameterField|FIELD_ID|ID|None|INPUT|-1|False|False
QgsProcessingParameterField|FIELD_X|X|None|INPUT|-1|False|False
QgsProcessingParameterField|FIELD_Y|Y|None|INPUT|-1|False|False
QgsProcessingParameterEnum|SHAPE_TYPE|Shape Type|[0] Point(s);[1] Line(s);[2] Polygon(s)|False|0
QgsProcessingParameterVectorDestination|OUTPUT|Output
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/saga/description/ModifedQuadraticShepard.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Modifed Quadratic Shepard
grid_gridding
QgsProcessingParameterFeatureSource|SHAPES|Points|-1|None|False
QgsProcessingParameterFeatureSource|FIELD|Attribute|5|None|False
QgsProcessingParameterField|FIELD|Attribute|None|SHAPES|-1|False|False
Hardcoded|-TARGET_DEFINITION 0
QgsProcessingParameterExtent|TARGET_USER_XMIN TARGET_USER_XMAX TARGET_USER_YMIN TARGET_USER_YMAX|Output extent|None|True
QgsProcessingParameterNumber|TARGET_USER_SIZE|Cellsize|QgsProcessingParameterNumber.Double|1.000000|False|0.000000|None
Expand Down
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/saga/description/MonthlyGlobalbyLatitude.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Monthly Global by Latitude
climate_tools
QgsProcessingParameterFeatureSource|SOLARRAD|Solar Radiation|5|None|False
QgsProcessingParameterFeatureSource|ALBEDO|Albedo|5|None|True
QgsProcessingParameterFeatureSource|FIELD|Field|5|None|False
QgsProcessingParameterField|FIELD|Field|None|ALBEDO|-1|False|True
QgsProcessingParameterNumber|YEAR|Year [ka]|QgsProcessingParameterNumber.Double|2.000000|False|None|None
QgsProcessingParameterNumber|DLAT|Latitude Increment [Degree]|QgsProcessingParameterNumber.Integer|5|False|1|90
QgsProcessingParameterVectorDestination|SOLARRAD|Solar Radiation
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/saga/description/RegressionKriging.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Regression Kriging
statistics_kriging
QgsProcessingParameterFeatureSource|POINTS|Points|-1|None|False
QgsProcessingParameterFeatureSource|FIELD|Attribute|5|None|False
QgsProcessingParameterField|FIELD|Attribute|None|POINTS|-1|False|False
QgsProcessingParameterMultipleLayers|PREDICTORS|Predictors|3|None|False
QgsProcessingParameterRasterDestination|REGRESSION|Regression
QgsProcessingParameterRasterDestination|PREDICTION|Prediction
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/saga/description/SimpleKriging.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Simple Kriging
statistics_kriging
QgsProcessingParameterFeatureSource|POINTS|Points|0|None|False
QgsProcessingParameterFeatureSource|FIELD|Attribute|5|None|False
QgsProcessingParameterField|FIELD|Attribute|None|POINTS|-1|False|False
QgsProcessingParameterEnum|TQUALITY|Type of Quality Measure|[0] standard deviation;[1] variance|False|0
QgsProcessingParameterBoolean|LOG|Logarithmic Transformation|False
QgsProcessingParameterBoolean|BLOCK|Block Kriging|False
Expand Down

0 comments on commit 4289bcb

Please sign in to comment.