[processing] restore TIN / IDW interpolation algorithms

qgis · Apr 19, 2018 · a463858 · a463858 · nirvn · Apr 19, 2018
1 parent 7d43e7b
commit a463858
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/python/plugins/processing/algs/qgis/IdwInterpolation.py b/python/plugins/processing/algs/qgis/IdwInterpolation.py
@@ -76,10 +76,10 @@ def parseValue(value):
     def dataToString(data):
         s = ''
         for c in data:
-            s += '{}, {}, {:d}, {:d};'.format(c[0],
-                                              c[1],
-                                              c[2],
-                                              c[3])
+            s += '{}::~:: {}::~:: {:d}::~:: {:d};'.format(c[0],
+                                                          c[1],
+                                                          c[2],
+                                                          c[3])
         return s[:-1]
 
 
@@ -144,7 +144,7 @@ def processAlgorithm(self, parameters, context, feedback):
         layerData = []
         layers = []
         for row in interpolationData.split(';'):
-            v = row.split(',')
+            v = row.split('::~::')
             data = QgsInterpolator.LayerData()
 
             # need to keep a reference until interpolation is complete

diff --git a/python/plugins/processing/algs/qgis/TinInterpolation.py b/python/plugins/processing/algs/qgis/TinInterpolation.py
@@ -80,10 +80,10 @@ def parseValue(value):
     def dataToString(data):
         s = ''
         for c in data:
-            s += '{}, {}, {:d}, {:d};'.format(c[0],
-                                              c[1],
-                                              c[2],
-                                              c[3])
+            s += '{}::~:: {}::~:: {:d}::~:: {:d};'.format(c[0],
+                                                          c[1],
+                                                          c[2],
+                                                          c[3])
         return s[:-1]
 
 
@@ -160,7 +160,7 @@ def processAlgorithm(self, parameters, context, feedback):
         layers = []
         crs = QgsCoordinateReferenceSystem()
         for row in interpolationData.split(';'):
-            v = row.split(',')
+            v = row.split('::~::')
             data = QgsInterpolator.LayerData()
 
             # need to keep a reference until interpolation is complete

diff --git a/python/plugins/processing/algs/qgis/ui/InterpolationDataWidget.py b/python/plugins/processing/algs/qgis/ui/InterpolationDataWidget.py
@@ -152,10 +152,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]