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

Fix imports and start test of scheduler GUI

parent 439637c5
No related branches found
No related tags found
1 merge request!78Add scheduler GUI
Pipeline #74667 passed
This commit is part of merge request !78. Comments created here will be created in the context of that merge request.
...@@ -16,7 +16,7 @@ from qtpy.QtWidgets import ( ...@@ -16,7 +16,7 @@ from qtpy.QtWidgets import (
QGraphicsSimpleTextItem, QGraphicsPolygonItem) QGraphicsSimpleTextItem, QGraphicsPolygonItem)
# B-ASIC # B-ASIC
from graphics_timeline_item import GraphicsTimelineItem from b_asic.scheduler_gui.graphics_timeline_item import GraphicsTimelineItem
......
...@@ -14,9 +14,9 @@ from qtpy.QtWidgets import ( ...@@ -14,9 +14,9 @@ from qtpy.QtWidgets import (
QGraphicsItem, QGraphicsSceneMouseEvent, QGraphicsSceneHoverEvent, QGraphicsItem, QGraphicsSceneMouseEvent, QGraphicsSceneHoverEvent,
QGraphicsSceneContextMenuEvent, QGraphicsSceneDragDropEvent, QGraphicsSceneWheelEvent) QGraphicsSceneContextMenuEvent, QGraphicsSceneDragDropEvent, QGraphicsSceneWheelEvent)
from graphics_component_item import GraphicsComponentItem from b_asic.scheduler_gui.graphics_component_item import GraphicsComponentItem
from graphics_axes_item import GraphicsAxesItem from b_asic.scheduler_gui.graphics_axes_item import GraphicsAxesItem
from graphics_timeline_item import GraphicsTimelineItem from b_asic.scheduler_gui.graphics_timeline_item import GraphicsTimelineItem
......
...@@ -17,10 +17,10 @@ from qtpy.QtCore import Qt ...@@ -17,10 +17,10 @@ from qtpy.QtCore import Qt
# B-ASIC # B-ASIC
from b_asic.schedule import Schedule from b_asic.schedule import Schedule
from graphics_component_item import GraphicsComponentItem from b_asic.scheduler_gui.graphics_component_item import GraphicsComponentItem
from graphics_axes_item import GraphicsAxesItem from b_asic.scheduler_gui.graphics_axes_item import GraphicsAxesItem
from graphics_graph_event import GraphicsGraphEvent from b_asic.scheduler_gui.graphics_graph_event import GraphicsGraphEvent
from graphics_signal import GraphicsSignal from b_asic.scheduler_gui.graphics_signal import GraphicsSignal
class GraphicsGraphItem(GraphicsGraphEvent, QGraphicsItemGroup): # PySide2 / PyQt5 class GraphicsGraphItem(GraphicsGraphEvent, QGraphicsItemGroup): # PySide2 / PyQt5
......
...@@ -6,7 +6,7 @@ from qtpy.QtCore import Qt, QPointF ...@@ -6,7 +6,7 @@ from qtpy.QtCore import Qt, QPointF
# B-ASIC # B-ASIC
from b_asic.signal import Signal from b_asic.signal import Signal
from graphics_component_item import GraphicsComponentItem from b_asic.scheduler_gui.graphics_component_item import GraphicsComponentItem
class GraphicsSignal(QGraphicsPathItem): class GraphicsSignal(QGraphicsPathItem):
_path: Optional[QPainterPath] = None _path: Optional[QPainterPath] = None
......
...@@ -30,9 +30,9 @@ from qtpy.QtWidgets import QGraphicsScene, QGraphicsItemGroup ...@@ -30,9 +30,9 @@ from qtpy.QtWidgets import QGraphicsScene, QGraphicsItemGroup
import logger import 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 graphics_graph_item import GraphicsGraphItem from b_asic.scheduler_gui.graphics_graph_item import GraphicsGraphItem
from graphics_axes_item import GraphicsAxesItem from b_asic.scheduler_gui.graphics_axes_item import GraphicsAxesItem
from graphics_component_item import GraphicsComponentItem from b_asic.scheduler_gui.graphics_component_item import GraphicsComponentItem
# if sys.version_info >= (3, 9): # if sys.version_info >= (3, 9):
# List = list # List = list
......
import pytest
try:
import b_asic.scheduler_gui.main_window as GUI
except ImportError:
pytestmark = pytest.mark.skip('Qt not setup')
def test_start(qtbot):
widget = GUI.MainWindow()
qtbot.addWidget(widget)
widget.exit_app()
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