diff --git a/base.py b/base.py index 80144d7..7794f4b 100644 --- a/base.py +++ b/base.py @@ -110,8 +110,8 @@ class BaseWindow(QMainWindow): print("date_str", date_str, flush=True) - def extract_and_attach(i, nfig, name): - canvas = 'Canvas {0}'.format(i+1) + def extract_and_attach(i, nfig, name, canvas_base="Canvas"): + canvas = '{0} {0}'.format(canvas_base, i+1) name_base = name.replace(' ', '_').lower() if self.all_data['Figure data'][canvas] is not None: @@ -163,7 +163,7 @@ class BaseWindow(QMainWindow): resultsSeq = self.settings.data["GUI2"]["resultsSeq"] titleSeq = self.settings.data["GUI2"]["subResultsTabTitle"] for i, (nfig, name) in enumerate(zip(resultsSeq, titleSeq)): - extract_and_attach(i, nfig, name) + extract_and_attach(i, nfig, name, "CanvasB") except KeyError as ex: pass