From 0fc40d4676c77c781d91709dfb37b369a1357f68 Mon Sep 17 00:00:00 2001
From: Oscar Gustafsson <oscar.gustafsson@gmail.com>
Date: Tue, 24 Jan 2023 16:57:35 +0100
Subject: [PATCH] Fix loading of arbitrary SFGs from file
---
b_asic/GUI/main_window.py | 4 ++--
b_asic/save_load_structure.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/b_asic/GUI/main_window.py b/b_asic/GUI/main_window.py
index f8956dd1..843a4c93 100644
--- a/b_asic/GUI/main_window.py
+++ b/b_asic/GUI/main_window.py
@@ -449,7 +449,7 @@ class MainWindow(QMainWindow):
self.sfg_dict[sfg.name] = sfg
- def _show_precedence_graph(self):
+ def _show_precedence_graph(self, event=None):
self.dialog = ShowPCWindow(self)
self.dialog.add_sfg_to_dialog()
self.dialog.show()
@@ -729,7 +729,7 @@ class MainWindow(QMainWindow):
self.plot = Plot(simulation, sfg, self)
self.plot.show()
- def simulate_sfg(self):
+ def simulate_sfg(self, event=None):
self.dialog = SimulateSFGWindow(self)
for _, sfg in self.sfg_dict.items():
diff --git a/b_asic/save_load_structure.py b/b_asic/save_load_structure.py
index 4320fb35..d0193e5d 100644
--- a/b_asic/save_load_structure.py
+++ b/b_asic/save_load_structure.py
@@ -119,6 +119,6 @@ def python_to_sfg(path: str) -> SFG:
exec(code, globals(), locals())
return (
- locals()["prop"]["name"] if "prop" in locals() else {},
+ locals()["prop"]["name"] if "prop" in locals() else [v for k, v in locals().items() if isinstance(v, SFG)][0],
locals()["positions"] if "positions" in locals() else {},
)
--
GitLab