From 07676aaa76504846448e1477c0f869936cbd42ed Mon Sep 17 00:00:00 2001
From: Oscar Gustafsson <oscar.gustafsson@gmail.com>
Date: Mon, 3 Apr 2023 20:50:36 +0200
Subject: [PATCH] Move GUI decorators to gui_utils
---
b_asic/GUI/drag_button.py | 2 +-
b_asic/GUI/main_window.py | 2 +-
b_asic/{GUI/utils.py => gui_utils/decorators.py} | 4 +---
docs_sphinx/GUI.rst | 8 --------
docs_sphinx/gui_utils.rst | 8 ++++++++
5 files changed, 11 insertions(+), 13 deletions(-)
rename b_asic/{GUI/utils.py => gui_utils/decorators.py} (82%)
diff --git a/b_asic/GUI/drag_button.py b/b_asic/GUI/drag_button.py
index 163a12ec..b63ca2fc 100644
--- a/b_asic/GUI/drag_button.py
+++ b/b_asic/GUI/drag_button.py
@@ -14,7 +14,7 @@ from qtpy.QtWidgets import QAction, QMenu, QPushButton
from b_asic.GUI._preferences import GAP, GRID, MINBUTTONSIZE, PORTHEIGHT, PORTWIDTH
from b_asic.GUI.port_button import PortButton
from b_asic.GUI.properties_window import PropertiesWindow
-from b_asic.GUI.utils import decorate_class, handle_error
+from b_asic.gui_utils.decorators import decorate_class, handle_error
from b_asic.operation import Operation
from b_asic.port import InputPort
diff --git a/b_asic/GUI/main_window.py b/b_asic/GUI/main_window.py
index 292c4cc7..698dc612 100644
--- a/b_asic/GUI/main_window.py
+++ b/b_asic/GUI/main_window.py
@@ -43,8 +43,8 @@ from b_asic.GUI.show_pc_window import ShowPCWindow
# from b_asic.GUI.simulate_sfg_window import Plot, SimulateSFGWindow
from b_asic.GUI.simulate_sfg_window import SimulateSFGWindow
from b_asic.GUI.util_dialogs import FaqWindow, KeybindingsWindow
-from b_asic.GUI.utils import decorate_class, handle_error
from b_asic.gui_utils.about_window import AboutWindow
+from b_asic.gui_utils.decorators import decorate_class, handle_error
from b_asic.gui_utils.plot_window import PlotWindow
from b_asic.operation import Operation
from b_asic.port import InputPort, OutputPort
diff --git a/b_asic/GUI/utils.py b/b_asic/gui_utils/decorators.py
similarity index 82%
rename from b_asic/GUI/utils.py
rename to b_asic/gui_utils/decorators.py
index e44ddba5..2606c0ad 100644
--- a/b_asic/GUI/utils.py
+++ b/b_asic/gui_utils/decorators.py
@@ -9,9 +9,7 @@ def handle_error(fn):
return fn(self, *args, **kwargs)
except Exception:
self._window.logger.error(f"Unexpected error: {format_exc()}")
- QErrorMessage(self._window).showMessage(
- f"Unexpected error: {format_exc()}"
- )
+ QErrorMessage(self._window).showMessage(f"Unexpected error: {format_exc()}")
return wrapper
diff --git a/docs_sphinx/GUI.rst b/docs_sphinx/GUI.rst
index 83b24cd9..a7d21089 100644
--- a/docs_sphinx/GUI.rst
+++ b/docs_sphinx/GUI.rst
@@ -103,11 +103,3 @@ GUI.util\_dialogs module
:members:
:undoc-members:
:show-inheritance:
-
-GUI.utils module
-----------------
-
-.. automodule:: b_asic.GUI.utils
- :members:
- :undoc-members:
- :show-inheritance:
diff --git a/docs_sphinx/gui_utils.rst b/docs_sphinx/gui_utils.rst
index f7bedf2d..e550868f 100644
--- a/docs_sphinx/gui_utils.rst
+++ b/docs_sphinx/gui_utils.rst
@@ -5,6 +5,14 @@ GUI Utilities
:members:
:undoc-members:
+
+gui\_utils.decorators module
+----------------------------
+
+.. automodule:: b_asic.gui_utils.decorators
+ :members:
+ :undoc-members:
+
gui\_utils.about\_window module
-------------------------------
--
GitLab