From 4c271a61a5630d6358a1787971425cfd5b5d6fe2 Mon Sep 17 00:00:00 2001
From: Oscar Gustafsson <oscar.gustafsson@gmail.com>
Date: Fri, 2 Sep 2022 17:40:47 +0200
Subject: [PATCH] Update imports
---
b_asic/__init__.py | 2 +-
b_asic/scheduler_gui/__init__.py | 16 ++++++++--------
b_asic/scheduler_gui/main_window.py | 6 +++---
b_asic/scheduler_gui/main_window.ui | 4 ++--
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/b_asic/__init__.py b/b_asic/__init__.py
index 7f4b9555..8e40646f 100644
--- a/b_asic/__init__.py
+++ b/b_asic/__init__.py
@@ -5,7 +5,7 @@ ASIC toolbox that simplifies circuit design and optimization.
# NOTE: If this import gives an error,
# make sure the C++ module has been compiled and installed properly.
# See the included README.md for more information on how to build/install.
-from _b_asic import *
+#from _b_asic import *
# Python modules.
from b_asic.core_operations import *
from b_asic.graph_component import *
diff --git a/b_asic/scheduler_gui/__init__.py b/b_asic/scheduler_gui/__init__.py
index d8ebf208..02715f2f 100644
--- a/b_asic/scheduler_gui/__init__.py
+++ b/b_asic/scheduler_gui/__init__.py
@@ -3,14 +3,14 @@
Graphical user interface for B-ASIC scheduler.
"""
-from logger import *
-from main_window import *
-from graphics_graph_item import *
-from graphics_graph_event import *
-from graphics_component_item import *
-from graphics_axes_item import *
-from graphics_signal import *
-from graphics_timeline_item import *
+from b_asic.scheduler_gui.logger import *
+from b_asic.scheduler_gui.main_window import *
+from b_asic.scheduler_gui.graphics_graph_item import *
+from b_asic.scheduler_gui.graphics_graph_event import *
+from b_asic.scheduler_gui.graphics_component_item import *
+from b_asic.scheduler_gui.graphics_axes_item import *
+from b_asic.scheduler_gui.graphics_signal import *
+from b_asic.scheduler_gui.graphics_timeline_item import *
# __all__ = ['main_window', 'graphics_graph', 'component_item', 'graphics_axes', 'graphics_timeline_item']
__version__ = '0.1'
diff --git a/b_asic/scheduler_gui/main_window.py b/b_asic/scheduler_gui/main_window.py
index 328305bc..af0e79c0 100644
--- a/b_asic/scheduler_gui/main_window.py
+++ b/b_asic/scheduler_gui/main_window.py
@@ -27,7 +27,7 @@ from qtpy.QtCore import QRectF, QByteArray
from qtpy.QtWidgets import QGraphicsScene, QGraphicsItemGroup
# B-ASIC
-import logger
+import b_asic.scheduler_gui.logger as logger
from b_asic.schedule import Schedule
from b_asic.graph_component import GraphComponent
from b_asic.scheduler_gui.graphics_graph_item import GraphicsGraphItem
@@ -78,7 +78,7 @@ if __debug__:
raise SystemExit
except: # Compile failed, look for pre-compiled file
try:
- from ui_main_window import Ui_MainWindow
+ from b_asic.scheduler_gui.ui_main_window import Ui_MainWindow
except: # Everything failed, exit
log.exception("Could not import 'Ui_MainWindow'.")
log.exception("Can't autocompile under", QT_API, "eviroment. Try to manual compile 'main_window.ui' to 'ui/main_window_ui.py'")
@@ -86,7 +86,7 @@ if __debug__:
sys.path.insert(0, 'icons/') # Needed for the compiled '*_rc.py' files in 'ui_*.py' files
-from ui_main_window import Ui_MainWindow # Only availible when the form (.ui) is compiled
+from b_asic.scheduler_gui.ui_main_window import Ui_MainWindow # Only availible when the form (.ui) is compiled
# The following QCoreApplication values is used for QSettings among others
diff --git a/b_asic/scheduler_gui/main_window.ui b/b_asic/scheduler_gui/main_window.ui
index 0db78110..1e33de7c 100644
--- a/b_asic/scheduler_gui/main_window.ui
+++ b/b_asic/scheduler_gui/main_window.ui
@@ -368,8 +368,8 @@
</action>
</widget>
<resources>
- <include location="icons/basic.qrc"/>
- <include location="icons/misc.qrc"/>
+ <include location="b_asic/scheduler_gui/icons/basic.qrc"/>
+ <include location="b_asic/scheduler_gui/icons/misc.qrc"/>
</resources>
<connections/>
</ui>
--
GitLab