Merge pull request #2034 from Gustry/fix-lines-inter

[processing] Set the parameter table field optional in "Line intersections" algo
qgis · May 20, 2015 · 86d4a4d · 86d4a4d
2 parents f782e77 + 3e39783
commit 86d4a4d
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/python/plugins/processing/algs/qgis/LinesIntersection.py b/python/plugins/processing/algs/qgis/LinesIntersection.py
@@ -50,10 +50,16 @@ def defineCharacteristics(self):
             self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_LINE]))
         self.addParameter(ParameterVector(self.INPUT_B,
             self.tr('Intersect layer'), [ParameterVector.VECTOR_TYPE_LINE]))
-        self.addParameter(ParameterTableField(self.FIELD_A,
-            self.tr('Input unique ID field'), self.INPUT_A))
-        self.addParameter(ParameterTableField(self.FIELD_B,
-            self.tr('Intersect unique ID field'), self.INPUT_B))
+        self.addParameter(ParameterTableField(
+            self.FIELD_A,
+            self.tr('Input unique ID field'),
+            self.INPUT_A,
+            optional=True))
+        self.addParameter(ParameterTableField(
+            self.FIELD_B,
+            self.tr('Intersect unique ID field'),
+            self.INPUT_B,
+            optional=True))
 
         self.addOutput(OutputVector(self.OUTPUT, self.tr('Output layer')))