Skip to content

Commit efd73a4

Browse files
committed
[processing] fixes for new parameters architecture
includes better managing of crd and extent parameters in models, not requiring now the use of modeler-only lags
1 parent b298c76 commit efd73a4

26 files changed

+112
-507
lines changed

python/plugins/processing/algs/lidar/fusion/ClipData.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def defineCharacteristics(self):
5252
self.group, self.i18n_group = self.trAlgorithm('Points')
5353
self.addParameter(ParameterFile(
5454
self.INPUT, self.tr('Input LAS layer')))
55-
self.addParameter(ParameterExtent(self.EXTENT, self.tr('Extent')))
55+
self.addParameter(ParameterExtent(self.EXTENT, self.tr('Extent'), optional=False))
5656
self.addParameter(ParameterSelection(
5757
self.SHAPE, self.tr('Shape'), ['Rectangle', 'Circle']))
5858
self.addOutput(OutputFile(

python/plugins/processing/algs/lidar/lastools/lasquery.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def defineCharacteristics(self):
4545
self.name, self.i18n_name = self.trAlgorithm('lasquery')
4646
self.group, self.i18n_group = self.trAlgorithm('LAStools')
4747
self.addParametersVerboseGUI()
48-
self.addParameter(ParameterExtent(self.AOI, self.tr('area of interest')))
48+
self.addParameter(ParameterExtent(self.AOI, self.tr('area of interest'), optional=False))
4949
self.addParametersAdditionalGUI()
5050

5151
def processAlgorithm(self, progress):

python/plugins/processing/algs/qgis/GridLine.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def defineCharacteristics(self):
5757
self.group, self.i18n_group = self.trAlgorithm('Vector creation tools')
5858

5959
self.addParameter(ParameterExtent(self.EXTENT,
60-
self.tr('Grid extent')))
60+
self.tr('Grid extent'), optional=False))
6161
self.addParameter(ParameterNumber(self.HSPACING,
6262
self.tr('Horizontal spacing'), default=10.0))
6363
self.addParameter(ParameterNumber(self.VSPACING,

python/plugins/processing/algs/qgis/GridPolygon.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def defineCharacteristics(self):
6565
self.addParameter(ParameterSelection(self.TYPE,
6666
self.tr('Grid type'), self.types))
6767
self.addParameter(ParameterExtent(self.EXTENT,
68-
self.tr('Grid extent')))
68+
self.tr('Grid extent'), optional=False))
6969
self.addParameter(ParameterNumber(self.HSPACING,
7070
self.tr('Horizontal spacing'), default=10.0))
7171
self.addParameter(ParameterNumber(self.VSPACING,

python/plugins/processing/algs/qgis/RandomPointsExtent.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def defineCharacteristics(self):
5959
self.name, self.i18n_name = self.trAlgorithm('Random points in extent')
6060
self.group, self.i18n_group = self.trAlgorithm('Vector creation tools')
6161
self.addParameter(ParameterExtent(self.EXTENT,
62-
self.tr('Input extent')))
62+
self.tr('Input extent'), optional=False))
6363
self.addParameter(ParameterNumber(self.POINT_NUMBER,
6464
self.tr('Points number'), 1, None, 1))
6565
self.addParameter(ParameterNumber(self.MIN_DISTANCE,

python/plugins/processing/algs/qgis/RandomSelection.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ def getIcon(self):
5353
return QIcon(os.path.join(pluginPath, 'images', 'ftools', 'random_selection.png'))
5454

5555
def defineCharacteristics(self):
56-
self.allowOnlyOpenedLayers = True
5756
self.name, self.i18n_name = self.trAlgorithm('Random selection')
5857
self.group, self.i18n_group = self.trAlgorithm('Vector selection tools')
5958

python/plugins/processing/algs/qgis/RandomSelectionWithinSubsets.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ def getIcon(self):
5757
return QIcon(os.path.join(pluginPath, 'images', 'ftools', 'sub_selection.png'))
5858

5959
def defineCharacteristics(self):
60-
self.allowOnlyOpenedLayers = True
6160
self.name, self.i18n_name = self.trAlgorithm('Random selection within subsets')
6261
self.group, self.i18n_group = self.trAlgorithm('Vector selection tools')
6362

python/plugins/processing/algs/qgis/RegularPoints.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def defineCharacteristics(self):
6363
self.group, self.i18n_group = self.trAlgorithm('Vector creation tools')
6464

6565
self.addParameter(ParameterExtent(self.EXTENT,
66-
self.tr('Input extent')))
66+
self.tr('Input extent'), optional=False))
6767
self.addParameter(ParameterNumber(self.SPACING,
6868
self.tr('Point spacing/count'), 0.0001, 999999999.999999999, 0.0001))
6969
self.addParameter(ParameterNumber(self.INSET,

python/plugins/processing/algs/qgis/SetVectorStyle.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ class SetVectorStyle(GeoAlgorithm):
4141
OUTPUT = 'OUTPUT'
4242

4343
def defineCharacteristics(self):
44-
# self.allowOnlyOpenedLayers = True
4544
self.name, self.i18n_name = self.trAlgorithm('Set style for vector layer')
4645
self.group, self.i18n_group = self.trAlgorithm('Vector general tools')
4746
self.addParameter(ParameterVector(self.INPUT,

python/plugins/processing/algs/qgis/VectorGridPolygons.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def defineCharacteristics(self):
5858
self.group, self.i18n_group = self.trAlgorithm('Vector creation tools')
5959

6060
self.addParameter(ParameterExtent(self.EXTENT,
61-
self.tr('Grid extent')))
61+
self.tr('Grid extent'), optional=False))
6262
self.addParameter(ParameterNumber(self.STEP_X,
6363
self.tr('X spacing'), 0.0, 1000000000.0, 0.0001))
6464
self.addParameter(ParameterNumber(self.STEP_Y,

0 commit comments

Comments
 (0)