@@ -229,7 +229,9 @@ def fromScriptCode(self, line):
229
229
isOptional , name , definition = _splitParameterOptions (line )
230
230
if definition .startswith ("boolean" ):
231
231
descName = _createDescriptiveName (name )
232
- default = definition .strip ()[len ('boolean' ) + 1 :]
232
+ default = definition .strip ()[len ('boolean' ) + 1 :] or None
233
+ if default == 'None' :
234
+ default = None
233
235
if default :
234
236
param = ParameterBoolean (name , descName , default )
235
237
else :
@@ -292,6 +294,8 @@ def fromScriptCode(self, line):
292
294
if definition .startswith ("crs" ):
293
295
descName = _createDescriptiveName (name )
294
296
default = definition .strip ()[len ('crs' ) + 1 :]
297
+ if default == 'None' :
298
+ default = None
295
299
if default :
296
300
return ParameterCrs (name , descName , default , isOptional )
297
301
else :
@@ -574,7 +578,7 @@ def fromScriptCode(self, line):
574
578
if definition .startswith ("fixedtable" ):
575
579
descName = _createDescriptiveName (name )
576
580
default = definition .strip ()[len ('fixedtable' ) + 1 :] or None
577
- return ParameterFixedTable (name , descName , default , isOptional )
581
+ return ParameterFixedTable (name , descName , optional = isOptional )
578
582
579
583
580
584
class ParameterMultipleInput (ParameterDataObject ):
@@ -1186,15 +1190,19 @@ def getAsScriptCode(self):
1186
1190
param_type = ''
1187
1191
if self .optional :
1188
1192
param_type += 'optional '
1189
- param_type += 'string'
1190
- return '##' + self .name + '=' + param_type + self .default
1193
+ param_type += 'string '
1194
+ return '##' + self .name + '=' + param_type + repr ( self .default )
1191
1195
1192
1196
@classmethod
1193
1197
def fromScriptCode (self , line ):
1194
1198
isOptional , name , definition = _splitParameterOptions (line )
1195
1199
descName = _createDescriptiveName (name )
1196
1200
if definition .lower ().strip ().startswith ('string' ):
1197
- default = definition .strip ()[len ('string' ) + 1 :]
1201
+ default = definition .strip ()[len ('string' ) + 1 :] or None
1202
+ if default == 'None' :
1203
+ default = None
1204
+ elif default .startswith ('"' ) or default .startswith ('\' ' ):
1205
+ default = eval (default )
1198
1206
if default :
1199
1207
return ParameterString (name , descName , default , optional = isOptional )
1200
1208
else :
@@ -1255,15 +1263,17 @@ def getAsScriptCode(self):
1255
1263
param_type = ''
1256
1264
if self .optional :
1257
1265
param_type += 'optional '
1258
- param_type += 'expression'
1259
- return '##' + self .name + '=' + param_type + self .default
1266
+ param_type += 'expression '
1267
+ return '##' + self .name + '=' + param_type + str ( self .default )
1260
1268
1261
1269
@classmethod
1262
1270
def fromScriptCode (self , line ):
1263
1271
isOptional , name , definition = _splitParameterOptions (line )
1264
1272
if definition .lower ().strip ().startswith ('expression' ):
1265
1273
descName = _createDescriptiveName (name )
1266
- default = definition .strip ()[len ('expression' ) + 1 :]
1274
+ default = definition .strip ()[len ('expression' ) + 1 :] or None
1275
+ if default == 'None' :
1276
+ default = None
1267
1277
if default :
1268
1278
return ParameterExpression (name , descName , default , optional = isOptional )
1269
1279
else :
@@ -1413,7 +1423,7 @@ def getAsScriptCode(self):
1413
1423
if self .optional :
1414
1424
param_type += 'optional '
1415
1425
param_type += 'field'
1416
- return '##' + self .name + '=' + param_type + self .parent
1426
+ return '##' + self .name + '=' + param_type + str ( self .parent )
1417
1427
1418
1428
@classmethod
1419
1429
def fromScriptCode (self , line ):
0 commit comments