@@ -61,20 +61,19 @@ def defineCharacteristics(self):
61
61
class ParameterRasterCalculatorExpression (ParameterString ):
62
62
63
63
def evaluateForModeler (self , value , model ):
64
- # print value
65
64
for i in list (model .inputs .values ()):
66
65
param = i .param
67
66
if isinstance (param , ParameterRaster ):
68
- new = "%s@" % os .path .basename (param .value )
69
- old = "%s@" % param .name
67
+ new = "{}@" . format ( os .path .basename (param .value ) )
68
+ old = "{}@" . format ( param .name )
70
69
value = value .replace (old , new )
71
70
72
71
for alg in list (model .algs .values ()):
73
72
for out in alg .algorithm .outputs :
74
73
if isinstance (out , OutputRaster ):
75
74
if out .value :
76
- new = "%s@" % os .path .basename (out .value )
77
- old = "%s:%s@" % (alg .name , out .name )
75
+ new = "{}@" . format ( os .path .basename (out .value ) )
76
+ old = "{}:{}@" . format (alg .name , out .name )
78
77
value = value .replace (old , new )
79
78
return value
80
79
@@ -106,7 +105,7 @@ def processAlgorithm(self, progress):
106
105
for name , lyr in layersDict .items ():
107
106
for n in xrange (lyr .bandCount ()):
108
107
entry = QgsRasterCalculatorEntry ()
109
- entry .ref = '%s@%i' % (name , n + 1 )
108
+ entry .ref = '{:s}@{:d}' . format (name , n + 1 )
110
109
entry .raster = lyr
111
110
entry .bandNumber = n + 1
112
111
entries .append (entry )
@@ -149,7 +148,7 @@ def processBeforeAddingToModeler(self, algorithm, model):
149
148
expression = algorithm .params [self .EXPRESSION ]
150
149
for i in list (model .inputs .values ()):
151
150
param = i .param
152
- if isinstance (param , ParameterRaster ) and "%s@" % param .name in expression :
151
+ if isinstance (param , ParameterRaster ) and "{}@" . format ( param .name ) in expression :
153
152
values .append (ValueFromInput (param .name ))
154
153
155
154
if algorithm .name :
@@ -160,7 +159,7 @@ def processBeforeAddingToModeler(self, algorithm, model):
160
159
if alg .name not in dependent :
161
160
for out in alg .algorithm .outputs :
162
161
if (isinstance (out , OutputRaster )
163
- and "%s:%s@" % (alg .name , out .name ) in expression ):
162
+ and "{}:{}@" . format (alg .name , out .name ) in expression ):
164
163
values .append (ValueFromOutput (alg .name , out .name ))
165
164
166
165
algorithm .params [self .LAYERS ] = values
0 commit comments