Skip to content
Snippets Groups Projects
Commit 4c271a61 authored by Oscar Gustafsson's avatar Oscar Gustafsson :bicyclist:
Browse files

Update imports

parent 90d91a14
No related branches found
No related tags found
1 merge request!78Add scheduler GUI
Pipeline #74670 failed
This commit is part of merge request !78. Comments created here will be created in the context of that merge request.
...@@ -5,7 +5,7 @@ ASIC toolbox that simplifies circuit design and optimization. ...@@ -5,7 +5,7 @@ ASIC toolbox that simplifies circuit design and optimization.
# NOTE: If this import gives an error, # NOTE: If this import gives an error,
# make sure the C++ module has been compiled and installed properly. # make sure the C++ module has been compiled and installed properly.
# See the included README.md for more information on how to build/install. # See the included README.md for more information on how to build/install.
from _b_asic import * #from _b_asic import *
# Python modules. # Python modules.
from b_asic.core_operations import * from b_asic.core_operations import *
from b_asic.graph_component import * from b_asic.graph_component import *
......
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
Graphical user interface for B-ASIC scheduler. Graphical user interface for B-ASIC scheduler.
""" """
from logger import * from b_asic.scheduler_gui.logger import *
from main_window import * from b_asic.scheduler_gui.main_window import *
from graphics_graph_item import * from b_asic.scheduler_gui.graphics_graph_item import *
from graphics_graph_event import * from b_asic.scheduler_gui.graphics_graph_event import *
from graphics_component_item import * from b_asic.scheduler_gui.graphics_component_item import *
from graphics_axes_item import * from b_asic.scheduler_gui.graphics_axes_item import *
from graphics_signal import * from b_asic.scheduler_gui.graphics_signal import *
from graphics_timeline_item import * from b_asic.scheduler_gui.graphics_timeline_item import *
# __all__ = ['main_window', 'graphics_graph', 'component_item', 'graphics_axes', 'graphics_timeline_item'] # __all__ = ['main_window', 'graphics_graph', 'component_item', 'graphics_axes', 'graphics_timeline_item']
__version__ = '0.1' __version__ = '0.1'
......
...@@ -27,7 +27,7 @@ from qtpy.QtCore import QRectF, QByteArray ...@@ -27,7 +27,7 @@ from qtpy.QtCore import QRectF, QByteArray
from qtpy.QtWidgets import QGraphicsScene, QGraphicsItemGroup from qtpy.QtWidgets import QGraphicsScene, QGraphicsItemGroup
# B-ASIC # B-ASIC
import logger import b_asic.scheduler_gui.logger as logger
from b_asic.schedule import Schedule from b_asic.schedule import Schedule
from b_asic.graph_component import GraphComponent from b_asic.graph_component import GraphComponent
from b_asic.scheduler_gui.graphics_graph_item import GraphicsGraphItem from b_asic.scheduler_gui.graphics_graph_item import GraphicsGraphItem
...@@ -78,7 +78,7 @@ if __debug__: ...@@ -78,7 +78,7 @@ if __debug__:
raise SystemExit raise SystemExit
except: # Compile failed, look for pre-compiled file except: # Compile failed, look for pre-compiled file
try: try:
from ui_main_window import Ui_MainWindow from b_asic.scheduler_gui.ui_main_window import Ui_MainWindow
except: # Everything failed, exit except: # Everything failed, exit
log.exception("Could not import 'Ui_MainWindow'.") 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'") 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__: ...@@ -86,7 +86,7 @@ if __debug__:
sys.path.insert(0, 'icons/') # Needed for the compiled '*_rc.py' files in 'ui_*.py' files 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 # The following QCoreApplication values is used for QSettings among others
......
...@@ -368,8 +368,8 @@ ...@@ -368,8 +368,8 @@
</action> </action>
</widget> </widget>
<resources> <resources>
<include location="icons/basic.qrc"/> <include location="b_asic/scheduler_gui/icons/basic.qrc"/>
<include location="icons/misc.qrc"/> <include location="b_asic/scheduler_gui/icons/misc.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment