Skip to content

Commit a463858

Browse files
committed
[processing] restore TIN / IDW interpolation algorithms
1 parent 7d43e7b commit a463858

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ def parseValue(value):
7676
def dataToString(data):
7777
s = ''
7878
for c in data:
79-
s += '{}, {}, {:d}, {:d};'.format(c[0],
80-
c[1],
81-
c[2],
82-
c[3])
79+
s += '{}::~:: {}::~:: {:d}::~:: {:d};'.format(c[0],
80+
c[1],
81+
c[2],
82+
c[3])
8383
return s[:-1]
8484

8585

@@ -144,7 +144,7 @@ def processAlgorithm(self, parameters, context, feedback):
144144
layerData = []
145145
layers = []
146146
for row in interpolationData.split(';'):
147-
v = row.split(',')
147+
v = row.split('::~::')
148148
data = QgsInterpolator.LayerData()
149149

150150
# need to keep a reference until interpolation is complete

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ def parseValue(value):
8080
def dataToString(data):
8181
s = ''
8282
for c in data:
83-
s += '{}, {}, {:d}, {:d};'.format(c[0],
84-
c[1],
85-
c[2],
86-
c[3])
83+
s += '{}::~:: {}::~:: {:d}::~:: {:d};'.format(c[0],
84+
c[1],
85+
c[2],
86+
c[3])
8787
return s[:-1]
8888

8989

@@ -160,7 +160,7 @@ def processAlgorithm(self, parameters, context, feedback):
160160
layers = []
161161
crs = QgsCoordinateReferenceSystem()
162162
for row in interpolationData.split(';'):
163-
v = row.split(',')
163+
v = row.split('::~::')
164164
data = QgsInterpolator.LayerData()
165165

166166
# need to keep a reference until interpolation is complete

python/plugins/processing/algs/qgis/ui/InterpolationDataWidget.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,10 @@ def value(self):
152152
else:
153153
inputType = QgsInterpolator.SourceBreakLines
154154

155-
layers += '{},{:d},{:d},{:d};'.format(layer.source(),
156-
interpolationSource,
157-
fieldIndex,
158-
inputType)
155+
layers += '{}::~::{:d}::~::{:d}::~::{:d};'.format(layer.source(),
156+
interpolationSource,
157+
fieldIndex,
158+
inputType)
159159
return layers[:-1]
160160

161161

0 commit comments

Comments
 (0)