Merge pull request #8947 from alexbruy/interpolation-backport

alexbruy · web-flow · commit 3da3103ee959 · 2019-01-22T18:41:34.000+02:00
[processing] use complex delimiter for interpolation data (fix #20490)
diff --git a/python/plugins/processing/algs/qgis/IdwInterpolation.py b/python/plugins/processing/algs/qgis/IdwInterpolation.py
@@ -129,7 +129,7 @@ def processAlgorithm(self, parameters, context, feedback):
 
         layerData = []
         layers = []
-        for row in interpolationData.split(';'):
+        for row in interpolationData.split('::|::'):
             v = row.split('::~::')
             data = QgsInterpolator.LayerData()
 
diff --git a/python/plugins/processing/algs/qgis/TinInterpolation.py b/python/plugins/processing/algs/qgis/TinInterpolation.py
@@ -145,7 +145,7 @@ def processAlgorithm(self, parameters, context, feedback):
         layerData = []
         layers = []
         crs = QgsCoordinateReferenceSystem()
-        for row in interpolationData.split(';'):
+        for row in interpolationData.split('::|::'):
             v = row.split('::~::')
             data = QgsInterpolator.LayerData()
 
diff --git a/python/plugins/processing/algs/qgis/ui/InterpolationWidgets.py b/python/plugins/processing/algs/qgis/ui/InterpolationWidgets.py
@@ -203,10 +203,10 @@ def value(self):
                 else:
                     inputType = QgsInterpolator.SourceBreakLines
 
-            layers += '{}::~::{:d}::~::{:d}::~::{:d};'.format(layer.source(),
-                                                              interpolationSource,
-                                                              fieldIndex,
-                                                              inputType)
+            layers += '{}::~::{:d}::~::{:d}::~::{:d}::|::'.format(layer.source(),
+                                                                  interpolationSource,
+                                                                  fieldIndex,
+                                                                  inputType)
         return layers[:-1]
 
 
