Skip to content

Commit 5b86407

Browse files
author
Médéric RIBREUX
committed
Fix parameters and support empty default values for Enums
1 parent a8afd12 commit 5b86407

File tree

8 files changed

+18
-15
lines changed

8 files changed

+18
-15
lines changed

python/plugins/processing/algs/grass7/description/r.sim.sediment.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ QgsProcessingParameterRasterLayer|transport_coeff|Name of the transport capacity
1010
QgsProcessingParameterRasterLayer|shear_stress|Name of the critical shear stress raster map [Pa]|None|False
1111
QgsProcessingParameterRasterLayer|man|Name of the Mannings n raster map|None|True
1212
QgsProcessingParameterNumber|man_value|Name of the Mannings n value|QgsProcessingParameterNumber.Double|0.1|True|None|None
13-
QgsProcessingParameterVectorLayer|observation|Sampling locations vector points|None|True
13+
QgsProcessingParameterVectorLayer|observation|Sampling locations vector points|0|None|True
1414
QgsProcessingParameterNumber|nwalkers|Number of walkers|QgsProcessingParameterNumber.Integer|1|True|None|None
1515
QgsProcessingParameterNumber|niterations|Time used for iterations [minutes]|QgsProcessingParameterNumber.Integer|10|True|None|None
1616
QgsProcessingParameterNumber|output_step|Time interval for creating output maps [minutes]|QgsProcessingParameterNumber.Integer|2|True|None|None

python/plugins/processing/algs/grass7/description/r.sim.water.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ QgsProcessingParameterNumber|infil_value|Runoff infiltration rate unique value [
1111
QgsProcessingParameterRasterLayer|man|Name of the Mannings n raster map|None|True
1212
QgsProcessingParameterNumber|man_value|Manning's n unique value|QgsProcessingParameterNumber.Double|0.1|True|None|None
1313
QgsProcessingParameterRasterLayer|flow_control|Name of the flow controls raster map (permeability ratio 0-1)|None|False
14-
QgsProcessingParameterVectorLayer|observation|Sampling locations vector points|None|True
14+
QgsProcessingParameterVectorLayer|observation|Sampling locations vector points|0|None|True
1515
QgsProcessingParameterNumber|nwalkers|Number of walkers, default is twice the number of cells|QgsProcessingParameterNumber.Integer|None|True|None|None
1616
QgsProcessingParameterNumber|niterations|Time used for iterations [minutes]|QgsProcessingParameterNumber.Integer|10|True|None|None
1717
QgsProcessingParameterNumber|output_step|Time interval for creating output maps [minutes]|QgsProcessingParameterNumber.Integer|2|True|None|None

python/plugins/processing/algs/grass7/description/v.in.lidar.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ Vector (v.*)
44
QgsProcessingParameterFile|input|LiDAR input files in LAS format (*.las or *.laz)|0|las|None|False
55
QgsProcessingParameterExtent|spatial|Import subregion only|None|True
66
QgsProcessingParameterRange|zrange|Filter range for z data|QgsProcessingParameterNumber.Double|None|True
7-
QgsProcessingParameterEnum|return_filter|first;last;mid|True|None|True
8-
QgsProcessingParameterString|return_filter|Only import points of selected return type (Options: first, last, mid)|None|False|True
7+
QgsProcessingParameterEnum|return_filter|Only import points of selected return type|first;last;mid|True|None|True
98
QgsProcessingParameterString|class_filter|Only import points of selected class(es) (comma separated integers)|None|False|True
109
QgsProcessingParameterNumber|skip|Do not import every n-th point|QgsProcessingParameterNumber.Integer|0|True|1|None
1110
QgsProcessingParameterNumber|preserve|Import only every n-th point|QgsProcessingParameterNumber.Integer|0|True|1|None
1211
QgsProcessingParameterNumber|offset|Skip first n points|QgsProcessingParameterNumber.Integer|0|True|1|None
1312
QgsProcessingParameterNumber|limit|Import only n points|QgsProcessingParameterNumber.Integer|1|True|1|None
1413
*QgsProcessingParameterBoolean|-t|Do not create attribute table|False
14+
*QgsProcessingParameterBoolean|-c|Do not automatically add unique ID as category to each point|False
15+
*QgsProcessingParameterBoolean|-b|Do not build topology|False
1516
Hardcoded|-o
1617
QgsProcessingParameterVectorDestination|output|Lidar

python/plugins/processing/algs/grass7/description/v.lrs.create.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ QgsProcessingParameterField|start_off|Column containing offset from milepost for
1010
QgsProcessingParameterField|end_mp|Column containing milepost position for the end of previous segment|None|points|0|False|False
1111
QgsProcessingParameterField|end_off|Column containing offset from milepost for the end of previous segment|None|points|0|False|False
1212
QgsProcessingParameterNumber|threshold|Maximum distance of point to line allowed|QgsProcessingParameterNumber.Double|1.0|True|0.0|None
13-
QgsProcessingParameterVectorDestination|out_lines|LRS lines|-1|None|False
14-
QgsProcessingParameterVectorDestination|err|LRS Errors|-1|None|False
15-
QgsProcessingParameterVectorDestination|rstable|RS Table|4|None|False
13+
QgsProcessingParameterVectorDestination|out_lines|LRS lines|QgsProcessing.TypeVectorAnyGeometry|None|False
14+
QgsProcessingParameterVectorDestination|err|LRS Errors|QgsProcessing.TypeVectorAnyGeometry|None|False
15+
QgsProcessingParameterVectorDestination|rstable|RS Table|QgsProcessing.TypeFile|None|False

python/plugins/processing/algs/grass7/description/v.out.ascii.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ v.out.ascii
22
Exports a vector map to a GRASS ASCII vector representation.
33
Vector (v.*)
44
QgsProcessingParameterVectorLayer|input|Name of input vector map|-1|None|False
5-
QgsProcessingParameterEnum|type|Input feature type|point;line;boundary;centroid;area;face;kernel|False|0,1,2,3,4,5,6|True
5+
QgsProcessingParameterEnum|type|Input feature type|point;line;boundary;centroid;area;face;kernel|True|0,1,2,3,4,5,6|True
66
QgsProcessingParameterField|columns|Name of attribute column(s) to be exported|None|input|-1|True|True
77
QgsProcessingParameterString|where|WHERE conditions of SQL statement without 'where' keyword|None|True|True
88
QgsProcessingParameterEnum|format|Output format|point;standard;wkt|False|0|False

python/plugins/processing/algs/grass7/description/v.surf.bspline.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ QgsProcessingParameterEnum|solver|Type of solver which should solve the symmetri
1212
QgsProcessingParameterNumber|maxit|Maximum number of iteration used to solve the linear equation system|QgsProcessingParameterNumber.Integer|10000|True|1|None
1313
QgsProcessingParameterNumber|error|Error break criteria for iterative solver|QgsProcessingParameterNumber.Double|0.000001|True|0.0|None
1414
QgsProcessingParameterNumber|memory|Maximum memory to be used (in MB)|QgsProcessingParameterNumber.Integer|300|True|1|None
15-
QgsProcessingParameterVectorDestination|output|Output vector|-1|None|True
15+
QgsProcessingParameterVectorDestination|output|Output vector|QgsProcessing.TypeVectorAnyGeometry|None|True
1616
QgsProcessingParameterRasterDestination|raster_output|Interpolated spline|None|True

python/plugins/processing/algs/grass7/description/v.surf.rst.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ QgsProcessingParameterRasterDestination|aspect|Aspect|None|True
2424
QgsProcessingParameterRasterDestination|pcurvature|Profile curvature|None|True
2525
QgsProcessingParameterRasterDestination|tcurvature|Tangential curvature|None|True
2626
QgsProcessingParameterRasterDestination|mcurvature|Mean curvature|None|True
27-
QgsProcessingParameterVectorDestination|deviations|Deviations|-1|None|True
28-
QgsProcessingParameterVectorDestination|cvdev|Cross Validation Errors|-1|None|True
29-
QgsProcessingParameterVectorDestination|treeseg|Quadtree Segmentation|-1|None|True
30-
QgsProcessingParameterVectorDestination|overwin|Overlapping Windows|-1|None|True
27+
QgsProcessingParameterVectorDestination|deviations|Deviations|QgsProcessing.TypeVectorAnyGeometry|None|True
28+
QgsProcessingParameterVectorDestination|cvdev|Cross Validation Errors|QgsProcessing.TypeVectorAnyGeometry|None|True
29+
QgsProcessingParameterVectorDestination|treeseg|Quadtree Segmentation|QgsProcessing.TypeVectorAnyGeometry|None|True
30+
QgsProcessingParameterVectorDestination|overwin|Overlapping Windows|QgsProcessing.TypeVectorAnyGeometry|None|True

python/plugins/processing/core/parameters.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ def getParameterFromString(s):
108108
if len(params) > 4:
109109
# For multiple values; default value is a list of int
110110
if params[3] == True:
111-
params[4] = [int(v) for v in params[4].split(',')]
111+
params[4] = [int(v) for v in params[4].split(',')] if params[4] is not None else None
112112
else:
113-
params[4] = int(params[4])
113+
params[4] = int(params[4]) if params[4] is not None else None
114114
if len(params) > 5:
115115
params[5] = True if params[5].lower() == 'true' else False
116116
elif clazz == QgsProcessingParameterFeatureSource:
@@ -179,6 +179,8 @@ def getParameterFromString(s):
179179
params[2] = QgsProcessing.TypeVectorAnyGeometry
180180
elif params[2].lower().endswith('vector'):
181181
params[2] = QgsProcessing.TypeVector
182+
elif params[2].lower().endswith('file'):
183+
params[2] = QgsProcessing.TypeFile
182184
if len(params) > 4:
183185
params[4] = True if params[4].lower() == 'true' else False
184186

0 commit comments

Comments
 (0)