Compare commits

...
Author SHA1 Message Date
DepFAandGitHub 5e04fb1cd7 Update xy_grid.py
split vals not 's' from tests
2022-10-06 15:22:51 +01:00
DepFAandGitHub 86241d9a52 strip() split comma delimited lines 2022-10-06 12:32:17 +01:00
DepFAandGitHub 0af1e5f8f4 use csv.reader 2022-10-06 11:55:21 +01:00
DepFAandGitHub 8dedd57b94 Allow escaping of commas in xy_grid 2022-10-06 04:04:50 +01:00
+4 -4
View File
@@ -1,8 +1,9 @@
from collections import namedtuple
from copy import copy
from itertools import permutations
from itertools import permutations, chain
import random
import csv
from io import StringIO
from PIL import Image
import numpy as np
@@ -168,7 +169,6 @@ re_range_float = re.compile(r"\s*([+-]?\s*\d+(?:.\d*)?)\s*-\s*([+-]?\s*\d+(?:.\d
re_range_count = re.compile(r"\s*([+-]?\s*\d+)\s*-\s*([+-]?\s*\d+)(?:\s*\[(\d+)\s*\])?\s*")
re_range_count_float = re.compile(r"\s*([+-]?\s*\d+(?:.\d*)?)\s*-\s*([+-]?\s*\d+(?:.\d*)?)(?:\s*\[(\d+(?:.\d*)?)\s*\])?\s*")
class Script(scripts.Script):
def title(self):
return "X/Y plot"
@@ -197,7 +197,7 @@ class Script(scripts.Script):
if opt.label == 'Nothing':
return [0]
valslist = [x.strip() for x in vals.split(",")]
valslist = list(map(str.strip,chain.from_iterable(csv.reader(StringIO(vals)))))
if opt.type == int:
valslist_ext = []