diff --git a/backend/filereaders/svg_tag_reader.py b/backend/filereaders/svg_tag_reader.py index fd3e0507..dfec58a6 100644 --- a/backend/filereaders/svg_tag_reader.py +++ b/backend/filereaders/svg_tag_reader.py @@ -37,7 +37,7 @@ def __init__(self, svgreader): 'text': True # text is special, see read_tag func } - self.re_findall_lasertags = re.compile('=pass([0-9]+):([0-9]*)(mm\/min)?:([0-9]*)(%)?(:#[a-fA-F0-9]{6})?(:#[a-fA-F0-9]{6})?(:#[a-fA-F0-9]{6})?(:#[a-fA-F0-9]{6})?(:#[a-fA-F0-9]{6})?(:#[a-fA-F0-9]{6})?=').findall + self.re_findall_lasertags = re.compile('=pass([0-9]+):([0-9]*)(mm\/min)?:([0-9]*)(%)?(:#[a-f0-9]{6})?(:#[a-f0-9]{6})?(:#[a-f0-9]{6})?(:#[a-f0-9]{6})?(:#[a-f0-9]{6})?(:#[a-f0-9]{6})?=').findall def read_tag(self, tag, node): @@ -227,7 +227,7 @@ def find_cut_settings_tags(self, tag, node): # # search one level deep for child in tag: text_accum.append(child.text or '') - text_accum = ' '.join(text_accum) + text_accum = ' '.join(text_accum).lower() matches = self.re_findall_lasertags(text_accum) # Something like: =pass12:2550:100%:#fff000:#ababab:#ccc999= # Results in: [('12', '2550', '', '100', '%', ':#fff000', ':#ababab', ':#ccc999', '', '', '')] diff --git a/frontend/js/app_laserjobs.js b/frontend/js/app_laserjobs.js index 9750ce17..1293900c 100644 --- a/frontend/js/app_laserjobs.js +++ b/frontend/js/app_laserjobs.js @@ -1,7 +1,7 @@ var minNumPassWidgets = 3; -var maxNumPassWidgets = 32; +var maxNumPassWidgets = 256; var preview_canvas_obj = null;