From 7f33bc46f9f63e076afd8b45723b7b24ed1c2a7b Mon Sep 17 00:00:00 2001
From: Oscar Gustafsson <oscar.gustafsson@gmail.com>
Date: Thu, 1 Sep 2022 14:05:40 +0200
Subject: [PATCH] Fix code for 3.8 and import cleanups
---
b_asic/__init__.py | 2 +-
b_asic/scheduler-gui/graphics_axes_item.py | 87 +++++++-----------
b_asic/scheduler-gui/graphics_graph_item.py | 61 ++++---------
.../scheduler-gui/graphics_timeline_item.py | 86 +++++++-----------
b_asic/scheduler-gui/icons/basic_rc.py | 2 +-
b_asic/scheduler-gui/icons/breeze_dark_rc.py | 3 +-
b_asic/scheduler-gui/icons/breeze_rc.py | 3 +-
b_asic/scheduler-gui/icons/misc_rc.py | 2 +-
b_asic/scheduler-gui/logger.py | 24 ++---
b_asic/scheduler-gui/main_window.py | 89 +++++++++----------
10 files changed, 146 insertions(+), 213 deletions(-)
diff --git a/b_asic/__init__.py b/b_asic/__init__.py
index 7f4b9555..51bebc26 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/graphics_axes_item.py b/b_asic/scheduler-gui/graphics_axes_item.py
index 000f9f24..eadb6041 100644
--- a/b_asic/scheduler-gui/graphics_axes_item.py
+++ b/b_asic/scheduler-gui/graphics_axes_item.py
@@ -4,38 +4,17 @@
Contains the scheduler-gui GraphicsAxesItem class for drawing and maintain the axes in a graph.
"""
-from operator import contains
-import os
-import sys
-from typing import Any, Optional
-from pprint import pprint
-from typing import Any, Union, Optional, overload, Dict, List, TypeAlias
-# from typing_extensions import Self
-import numpy as np
-from copy import deepcopy
-from math import cos, sin, pi
-
-import qtpy
-from qtpy import QtCore
-from qtpy import QtGui
-from qtpy import QtWidgets
+from typing import Union, Optional, List
+from math import sin, pi
# QGraphics and QPainter imports
-from qtpy.QtCore import (
- Qt, QObject, QRect, QRectF, QPoint, QSize, QSizeF, QByteArray, qAbs)
-from qtpy.QtGui import (
- QPaintEvent, QPainter, QPainterPath, QColor, QBrush, QPen, QFont, QPolygon, QIcon, QPixmap,
- QLinearGradient, QTransform, QPolygonF)
+from qtpy.QtCore import Qt, QPoint, QPointF
+from qtpy.QtGui import QBrush, QPen, QPolygonF
from qtpy.QtWidgets import (
- QGraphicsView, QGraphicsScene, QGraphicsWidget,
- QGraphicsLayout, QGraphicsLinearLayout, QGraphicsGridLayout, QGraphicsLayoutItem, QGraphicsAnchorLayout,
- QGraphicsItem, QGraphicsItemGroup, QGraphicsPathItem, QGraphicsLineItem, QGraphicsTextItem, QGraphicsRectItem,
- QStyleOptionGraphicsItem, QWidget, QGraphicsObject, QGraphicsSimpleTextItem, QGraphicsPolygonItem)
-from qtpy.QtCore import (
- QPoint, QPointF)
+ QGraphicsItem, QGraphicsItemGroup, QGraphicsLineItem,
+ QGraphicsSimpleTextItem, QGraphicsPolygonItem)
# B-ASIC
-import logger
from graphics_timeline_item import GraphicsTimelineItem
@@ -62,7 +41,7 @@ class GraphicsAxesItem(QGraphicsItemGroup):
_base_pen: QPen
_ledger_pen: QPen
_timeline_pen: QPen
-
+
def __init__(self, width: int, height: int,
width_indent: Optional[float] = 0.2, height_indent: Optional[float] = 0.2,
@@ -88,7 +67,7 @@ class GraphicsAxesItem(QGraphicsItemGroup):
self._x_label_offset = 0.2
self._y_axis = QGraphicsLineItem()
self._event_items = []
-
+
self._base_pen = QPen()
self._base_pen.setWidthF(2/self._scale)
self._base_pen.setJoinStyle(Qt.MiterJoin)
@@ -97,7 +76,7 @@ class GraphicsAxesItem(QGraphicsItemGroup):
self._timeline_pen = QPen(Qt.black)
self._timeline_pen.setWidthF(2/self._scale)
self._timeline_pen.setStyle(Qt.DashLine)
-
+
self._make_base()
@@ -110,7 +89,7 @@ class GraphicsAxesItem(QGraphicsItemGroup):
for key in keys:
self._axes[key].setParentItem(None)
del self._axes[key]
-
+
@property
def width(self) -> int:
@@ -131,7 +110,7 @@ class GraphicsAxesItem(QGraphicsItemGroup):
# def height(self, height: int) -> None:
# if self._height != height:
# self.update_axes(height = height)
-
+
# @property
# def width_indent(self) -> float:
# """Get or set the current x-axis indent. Setting the indent to a new
@@ -141,26 +120,26 @@ class GraphicsAxesItem(QGraphicsItemGroup):
# def width_indent(self, width_indent: float) -> None:
# if self._width_indent != width_indent:
# self.update_axes(width_indent = width_indent)
-
+
@property
def event_items(self) -> List[QGraphicsItem]:
"""Returnes a list of objects, that receives events."""
return [self._x_ledger[-1]]
-
+
def _register_event_item(self, item: QGraphicsItem) -> None:
"""Register an object that receives events."""
self._event_items.append(item)
def set_height(self, height: int) -> "GraphicsAxesItem":
# TODO: implement, docstring
- raise NotImplemented
+ raise NotImplementedError
return self
-
+
def set_width(self, width: int) -> "GraphicsAxesItem":
# TODO: docstring
assert width >= 0, f"'width' greater or equal to 0 expected, got: {width}."
delta_width = width - self._width
-
+
if delta_width > 0:
for _ in range(delta_width):
self._append_x_tick()
@@ -169,12 +148,12 @@ class GraphicsAxesItem(QGraphicsItemGroup):
for _ in range(abs(delta_width)):
self._pop_x_tick()
self._width -= 1
-
+
return self
-
+
def _pop_x_tick(self) -> None:
# TODO: docstring
-
+
# remove the next to last x_scale, x_scale_labels and x_ledger
x_scale = self._x_scale.pop(-2)
x_scale_labels = self._x_scale_labels.pop(-2)
@@ -185,7 +164,7 @@ class GraphicsAxesItem(QGraphicsItemGroup):
del x_scale
del x_scale_labels
del x_ledger
-
+
# move timeline x_scale and x_scale_labels (timeline already moved by event)
self._x_scale[-1].setX(self._x_scale[-1].x() - 1)
self._x_scale_labels[-1].setX(self._x_scale_labels[-1].x() - 1)
@@ -195,9 +174,9 @@ class GraphicsAxesItem(QGraphicsItemGroup):
self._x_arrow.setX(self._x_arrow.x() - 1)
self._x_label.setX(self._x_label.x() - 1)
self._x_axis.setLine(0, 0, self._width_indent + self._width-1 + self._width_padding, 0)
-
-
-
+
+
+
def _append_x_tick(self) -> None:
# TODO: docstring
@@ -206,7 +185,7 @@ class GraphicsAxesItem(QGraphicsItemGroup):
if index != 0:
index -= 1
is_timeline = False
-
+
## make a new x-tick
# x-axis scale line
self._x_scale.insert(index, QGraphicsLineItem(0, 0, 0, 0.05))
@@ -214,7 +193,7 @@ class GraphicsAxesItem(QGraphicsItemGroup):
pos = self.mapToScene(QPointF(self._width_indent + index, 0))
self._x_scale[index].setPos(pos)
self.addToGroup(self._x_scale[index])
-
+
# x-axis scale number
self._x_scale_labels.insert(index, QGraphicsSimpleTextItem(str(index)))
self._x_scale_labels[index].setScale(1 / self._scale)
@@ -223,7 +202,7 @@ class GraphicsAxesItem(QGraphicsItemGroup):
pos = self.mapToScene(QPointF(x_pos, self._x_label_offset))
self._x_scale_labels[index].setPos(pos)
self.addToGroup(self._x_scale_labels[index])
-
+
# x-axis vertical ledger
if is_timeline: # last line is a timeline
self._x_ledger.insert(index, GraphicsTimelineItem(0, 0, 0, -(self._height_indent + self._height + self._height_padding)))
@@ -237,7 +216,7 @@ class GraphicsAxesItem(QGraphicsItemGroup):
self._x_ledger[index].setPos(pos)
self.addToGroup(self._x_ledger[index])
self._x_ledger[index].stackBefore(self._x_axis)
-
+
## expand x-axis and move arrow,x-axis label, last x-scale, last x-scale-label
if not is_timeline:
# expand x-axis, move arrow and x-axis label
@@ -248,15 +227,15 @@ class GraphicsAxesItem(QGraphicsItemGroup):
self._x_scale_labels[index + 1].setX(self._x_scale_labels[index + 1].x() + 1)
self._x_scale_labels[index + 1].setText(str(index + 1))
self._x_scale[index + 1].setX(self._x_scale[index + 1].x() + 1)
-
+
def _make_base(self) -> None:
-
+
# x axis
self._x_axis.setLine(0, 0, self._width_indent + self._width_padding, 0)
self._x_axis.setPen(self._base_pen)
self.addToGroup(self._x_axis)
-
+
# x-axis arrow
arrow_size = 8/self._scale
p0 = QPointF(0, sin(pi/6) * arrow_size)
@@ -268,7 +247,7 @@ class GraphicsAxesItem(QGraphicsItemGroup):
self._x_arrow.setBrush(QBrush(Qt.SolidPattern))
self._x_arrow.setPos(self._width_indent + self._width_padding, 0)
self.addToGroup(self._x_arrow)
-
+
# x-axis label
self._x_label.setText('time')
self._x_label.setScale(1 / self._scale)
@@ -277,14 +256,14 @@ class GraphicsAxesItem(QGraphicsItemGroup):
x_pos -= self.mapRectFromItem(self._x_label, self._x_label.boundingRect()).width()/2 # - center of label
self._x_label.setPos(x_pos, self._x_label_offset)
self.addToGroup(self._x_label)
-
+
# x-axis timeline
self._append_x_tick()
for _ in range(self._width):
self._append_x_tick()
pos = self._x_ledger[-1].pos()
self._x_ledger[-1].setPos(pos + QPoint(self._width, 0)) # move timeline
-
+
# y-axis
self._y_axis.setLine(0, 0, 0, -(self._height_indent + self._height + self._height_padding + 0.05))
self._y_axis.setPen(self._base_pen)
diff --git a/b_asic/scheduler-gui/graphics_graph_item.py b/b_asic/scheduler-gui/graphics_graph_item.py
index 415b2c3f..c6708cab 100644
--- a/b_asic/scheduler-gui/graphics_graph_item.py
+++ b/b_asic/scheduler-gui/graphics_graph_item.py
@@ -6,41 +6,14 @@ Contains the scheduler-gui GraphicsGraphItem class for drawing and
maintain a component in a graph.
"""
from math import floor
-import os
-import sys
-from typing import Any, Optional
from pprint import pprint
-from typing import Any, AnyStr, Generic, Protocol, TypeVar, Union, Optional, overload, Final, final, List
-# from typing_extensions import Self, Final, Literal, LiteralString, TypeAlias, final
-import numpy as np
-from copy import deepcopy
-from itertools import combinations
-
-import qtpy
-from qtpy import QtCore
-from qtpy import QtGui
-from qtpy import QtWidgets
+from typing import Optional, List
# QGraphics and QPainter imports
-from qtpy.QtCore import (
- Qt, QObject, QRect, QRectF, QPoint, QSize, QSizeF, QByteArray, Slot)
-from qtpy.QtGui import (
- QPaintEvent, QPainter, QPainterPath, QColor, QBrush, QPen, QFont, QPolygon, QIcon, QPixmap,
- QLinearGradient, QTransform)
-from qtpy.QtWidgets import (
- QApplication,
- QGraphicsView, QGraphicsScene, QGraphicsWidget,
- QGraphicsLayout, QGraphicsLinearLayout, QGraphicsGridLayout, QGraphicsLayoutItem, QGraphicsAnchorLayout,
- QGraphicsItem, QGraphicsItemGroup, QGraphicsPathItem, QGraphicsLineItem, QGraphicsRectItem,
- QStyleOptionGraphicsItem, QWidget, QGraphicsObject,
- QGraphicsSceneContextMenuEvent, QGraphicsSceneHoverEvent)
-from qtpy.QtCore import (
- QPoint, QPointF, QEvent)
+from qtpy.QtWidgets import QGraphicsItem, QGraphicsItemGroup
# B-ASIC
-import logger
from b_asic.schedule import Schedule
-from b_asic.graph_component import GraphComponent
from b_asic.special_operations import Input, Output
from graphics_component_item import GraphicsComponentItem
from graphics_axes_item import GraphicsAxesItem
@@ -61,7 +34,7 @@ class GraphicsGraphItem(GraphicsGraphEvent, QGraphicsItemGroup): # PySide2 /
_x_axis_indent: float
_event_items: List[QGraphicsItem]
-
+
def __init__(self, schedule: Schedule, parent: Optional[QGraphicsItem] = None):
"""Constructs a GraphicsGraphItem. 'parent' is passed to QGraphicsItemGroup's constructor."""
# QGraphicsItemGroup.__init__(self, self)
@@ -79,14 +52,14 @@ class GraphicsGraphItem(GraphicsGraphEvent, QGraphicsItemGroup): # PySide2 /
self._event_items = []
self._make_graph()
-
+
def clear(self) -> None:
"""Sets all children's parent to 'None' and delete the children objects."""
self._event_items = []
for item in self.childItems():
item.setParentItem(None)
del item
-
+
def is_component_valid_pos(self, pos: float, end_time: int) -> bool:
"""Takes in a component position and returns true if the component's new
position is valid, false otherwise."""
@@ -101,7 +74,7 @@ class GraphicsGraphItem(GraphicsGraphEvent, QGraphicsItemGroup): # PySide2 /
elif (not self.schedule.cyclic
and start_time + end_time > self.schedule.schedule_time):
return False
-
+
return True
def is_valid_delta_time(self, delta_time: int) -> bool:
@@ -111,32 +84,32 @@ class GraphicsGraphItem(GraphicsGraphEvent, QGraphicsItemGroup): # PySide2 /
# item = self.scene().mouseGrabberItem()
assert self.schedule is not None , "No schedule installed."
return self.schedule.schedule_time + delta_time >= self.schedule.get_max_end_time()
-
-
+
+
def set_schedule_time(self, delta_time: int) -> None:
"""Set the schedule time and redraw the graph."""
assert self.schedule is not None , "No schedule installed."
self.schedule.set_schedule_time(self.schedule.schedule_time + delta_time)
self._axes.set_width(self._axes.width + delta_time)
-
-
+
+
@property
def schedule(self) -> Schedule:
return self._schedule
-
+
@property
def axes(self) -> GraphicsAxesItem:
return self._axes
-
+
@property
- def components(self) -> list[GraphicsComponentItem]:
+ def components(self) -> List[GraphicsComponentItem]:
return self._components
-
+
@property
def event_items(self) -> List[QGraphicsItem]:
"""Returnes a list of objects, that receives events."""
return self._event_items
-
+
def _make_graph(self) -> None:
"""Makes a new graph out of the stored attributes."""
# build components
@@ -144,7 +117,7 @@ class GraphicsGraphItem(GraphicsGraphEvent, QGraphicsItemGroup): # PySide2 /
# print('Start times:')
for op_id, op_start_time in self.schedule.start_times.items():
op = self.schedule.sfg.find_by_id(op_id)
-
+
if not isinstance(op, (Input, Output)):
self._components_height += spacing
component = GraphicsComponentItem(op_id, op.latency_offsets, op.execution_time)
@@ -168,4 +141,4 @@ class GraphicsGraphItem(GraphicsGraphEvent, QGraphicsItemGroup): # PySide2 /
self.addToGroup(component)
# self.addToGroup(self._components)
-pprint(GraphicsGraphItem.__mro__)
\ No newline at end of file
+pprint(GraphicsGraphItem.__mro__)
diff --git a/b_asic/scheduler-gui/graphics_timeline_item.py b/b_asic/scheduler-gui/graphics_timeline_item.py
index 63eed214..b11a15bb 100644
--- a/b_asic/scheduler-gui/graphics_timeline_item.py
+++ b/b_asic/scheduler-gui/graphics_timeline_item.py
@@ -1,73 +1,53 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
-"""B-ASIC Scheduler-gui Graphics Timeline Item Module.
+"""
+B-ASIC Scheduler-gui Graphics Timeline Item Module.
-Contains the a scheduler-gui GraphicsTimelineItem class for drawing and maintain the timeline in a graph.
+Contains the a scheduler-gui GraphicsTimelineItem class for drawing and
+maintain the timeline in a graph.
"""
-from operator import contains
-import os
-import sys
-from typing import Any, Optional
-from pprint import pprint
-from typing import Any, Union, Optional, overload, Final, final, Dict, List
-# from typing_extensions import Self, Final, Literal, LiteralString, TypeAlias, final
-import numpy as np
-from copy import deepcopy
-from math import cos, sin, pi
-
-import qtpy
-from qtpy import QtCore
-from qtpy import QtGui
-from qtpy import QtWidgets
+from typing import Optional, overload, List
# QGraphics and QPainter imports
-from qtpy.QtCore import (
- Qt, QObject, QRect, QRectF, QPoint, QSize, QSizeF, QByteArray, qAbs, QLineF)
-from qtpy.QtGui import (
- QPaintEvent, QPainter, QPainterPath, QColor, QBrush, QPen, QFont, QPolygon, QIcon, QPixmap,
- QLinearGradient, QTransform, QPolygonF, QCursor)
-from qtpy.QtWidgets import (
- QGraphicsView, QGraphicsScene, QGraphicsWidget,
- QGraphicsLayout, QGraphicsLinearLayout, QGraphicsGridLayout, QGraphicsLayoutItem, QGraphicsAnchorLayout,
- QGraphicsItem, QGraphicsItemGroup, QGraphicsPathItem, QGraphicsLineItem, QGraphicsTextItem, QGraphicsRectItem,
- QStyleOptionGraphicsItem, QWidget, QGraphicsObject, QGraphicsSimpleTextItem, QGraphicsPolygonItem)
-from qtpy.QtCore import (
- QPoint, QPointF)
-
-# B-ASIC
-import logger
-
+from qtpy.QtCore import Qt, QLineF
+from qtpy.QtGui import QCursor
+from qtpy.QtWidgets import QGraphicsItem, QGraphicsLineItem, QGraphicsTextItem
class GraphicsTimelineItem(QGraphicsLineItem):
"""A class to represent the timeline in GraphicsAxesItem."""
-
+
# _scale: float
_delta_time_label: QGraphicsTextItem
-
+
@overload
def __init__(self, line: QLineF, parent: Optional[QGraphicsItem] = None) -> None:
- """Constructs a GraphicsTimelineItem out of 'line'. 'parent' is passed to
- QGraphicsLineItem's constructor."""
- ...
+ """
+ Constructs a GraphicsTimelineItem out of 'line'. 'parent' is passed to
+ QGraphicsLineItem's constructor.
+ """
+
@overload
def __init__(self, parent: Optional[QGraphicsItem] = None) -> None:
"""Constructs a GraphicsTimelineItem. 'parent' is passed to
QGraphicsLineItem's constructor."""
- ...
+
@overload
- def __init__(self, x1: float, y1: float, x2: float, y2: float, parent: Optional[QGraphicsItem] = None) -> None:
- """Constructs a GraphicsTimelineItem from (x1, y1) to (x2, y2). 'parent' is
- passed to QGraphicsLineItem's constructor."""
- ...
+ def __init__(self, x1: float, y1: float, x2: float, y2: float,
+ parent: Optional[QGraphicsItem] = None) -> None:
+ """
+ Constructs a GraphicsTimelineItem from (x1, y1) to (x2, y2). 'parent'
+ is passed to QGraphicsLineItem's constructor.
+ """
+
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
-
+
self.setFlag(QGraphicsItem.ItemIsMovable) # mouse move events
# self.setAcceptHoverEvents(True) # mouse hover events
self.setAcceptedMouseButtons(Qt.LeftButton) # accepted buttons for movements
self.setCursor(QCursor(Qt.SizeHorCursor)) # default cursor when hovering over object
-
+
self._delta_time_label = QGraphicsTextItem()
self._delta_time_label.hide()
self._delta_time_label.setScale(1.05/75) # TODO: dont hardcode scale
@@ -77,37 +57,37 @@ class GraphicsTimelineItem(QGraphicsLineItem):
self._delta_time_label.setPos(x_pos, y_pos)
# pen = QPen(Qt.black)
# self._delta_time_label.setPen(pen)
-
-
+
+
# @property
# def label(self) -> None:
# return self._delta_time_label
-
+
def set_text(self, number: int) -> None:
"""Set the label text to 'number'."""
# self.prepareGeometryChange()
self._delta_time_label.setPlainText(f'( {number:+} )')
self._delta_time_label.setX(- self._delta_time_label.mapRectToParent(self._delta_time_label.boundingRect()).width()/2)
-
+
# def set_text_pen(self, pen: QPen) -> None:
# """Set the label pen to 'pen'."""
# self._delta_time_label.setPen(pen)
-
+
# def set_label_visible(self, visible: bool) -> None:
# """If visible is True, the item is made visible. Otherwise, the item is
# made invisible"""
# self._delta_time_label.setVisible(visible)
-
+
def show_label(self) -> None:
"""Show the label (label are not visible by default). This convenience
function is equivalent to calling set_label_visible(True)."""
self._delta_time_label.show()
-
+
def hide_label(self) -> None:
"""Hide the label (label are not visible by default). This convenience
function is equivalent to calling set_label_visible(False)."""
self._delta_time_label.hide()
-
+
def set_text_scale(self, scale: float) -> None:
self._delta_time_label.setScale(scale)
diff --git a/b_asic/scheduler-gui/icons/basic_rc.py b/b_asic/scheduler-gui/icons/basic_rc.py
index ff52c417..f7eab653 100644
--- a/b_asic/scheduler-gui/icons/basic_rc.py
+++ b/b_asic/scheduler-gui/icons/basic_rc.py
@@ -3,7 +3,7 @@
# Created by: The Resource Compiler for Qt version 5.15.3
# WARNING! All changes made in this file will be lost!
-from PySide2 import QtCore
+from qtpy import QtCore
qt_resource_data = b"\
\x00\x00'W\
diff --git a/b_asic/scheduler-gui/icons/breeze_dark_rc.py b/b_asic/scheduler-gui/icons/breeze_dark_rc.py
index cb090695..329fe014 100644
--- a/b_asic/scheduler-gui/icons/breeze_dark_rc.py
+++ b/b_asic/scheduler-gui/icons/breeze_dark_rc.py
@@ -1,9 +1,10 @@
+
# Resource object code (Python 3)
# Created by: object code
# Created by: The Resource Compiler for Qt version 5.15.3
# WARNING! All changes made in this file will be lost!
-from PySide2 import QtCore
+from qtpy import QtCore
qt_resource_data = b"\
\x00\x00\x0e\x8f\
diff --git a/b_asic/scheduler-gui/icons/breeze_rc.py b/b_asic/scheduler-gui/icons/breeze_rc.py
index 4b171dd5..c6a59f27 100644
--- a/b_asic/scheduler-gui/icons/breeze_rc.py
+++ b/b_asic/scheduler-gui/icons/breeze_rc.py
@@ -1,9 +1,10 @@
+
# Resource object code (Python 3)
# Created by: object code
# Created by: The Resource Compiler for Qt version 5.15.3
# WARNING! All changes made in this file will be lost!
-from PySide2 import QtCore
+from qtpy import QtCore
qt_resource_data = b"\
\x00\x00\x0dR\
diff --git a/b_asic/scheduler-gui/icons/misc_rc.py b/b_asic/scheduler-gui/icons/misc_rc.py
index 4dab2371..50ba53b0 100644
--- a/b_asic/scheduler-gui/icons/misc_rc.py
+++ b/b_asic/scheduler-gui/icons/misc_rc.py
@@ -3,7 +3,7 @@
# Created by: The Resource Compiler for Qt version 5.15.3
# WARNING! All changes made in this file will be lost!
-from PySide2 import QtCore
+from qtpy import QtCore
qt_resource_data = b"\
\x00\x00\x01{\
diff --git a/b_asic/scheduler-gui/logger.py b/b_asic/scheduler-gui/logger.py
index bdbc06bb..0c58d3c7 100644
--- a/b_asic/scheduler-gui/logger.py
+++ b/b_asic/scheduler-gui/logger.py
@@ -8,9 +8,9 @@ on the `logging` module and has predefined levels of logging.
Usage:
------
- >>> import logger
- >>> log = logger.getLogger()
- >>> log.info('This is a log post with level INFO')
+ >>> import logger
+ >>> log = logger.getLogger()
+ >>> log.info('This is a log post with level INFO')
| Function call | Level | Numeric value |
|----------------|-----------|---------------|
@@ -22,16 +22,16 @@ Usage:
| exception(str) | ERROR | 40 |
The last `exception(str)` is used to capture exceptions output, that normally
-won't be captured.
+won't be captured.
See https://docs.python.org/3/howto/logging.html for more information.
Log Uncaught Exceptions:
------------------------
-To log uncaught exceptions, implement the following in your program.
-Â `sys.excepthook = logger.log_exceptions`"""
+To log uncaught exceptions, implement the following in your program.
+ `sys.excepthook = logger.log_exceptions`"""
import os
import sys
-from typing import Type, Optional
+from typing import Type, Optional, Union
from types import TracebackType
from logging import Logger
import logging
@@ -64,7 +64,7 @@ def getLogger(filename: str='scheduler-gui.log', loglevel: str='INFO') -> Logger
# set logLevel to loglevel or to INFO if requested level is incorrect
loglevel = getattr(logging, loglevel.upper(), logging.INFO)
logger.setLevel(loglevel)
-
+
# setup the console logger
c_fmt_date = '%T'
c_fmt = '[%(process)d] %(asctime)s %(filename)18s:%(lineno)-4s %(funcName)20s() %(levelname)-8s: %(message)s'
@@ -73,7 +73,7 @@ def getLogger(filename: str='scheduler-gui.log', loglevel: str='INFO') -> Logger
c_handler.setFormatter(c_formatter)
c_handler.setLevel(logging.WARNING)
logger.addHandler(c_handler)
-
+
# setup the file logger
f_fmt_date = '%Y-%m-%dT%T%Z'
f_fmt = '%(asctime)s %(filename)18s:%(lineno)-4s %(funcName)20s() %(levelname)-8s: %(message)s'
@@ -87,14 +87,14 @@ def getLogger(filename: str='scheduler-gui.log', loglevel: str='INFO') -> Logger
logger.info('Running: %s %s',
os.path.basename(sys.argv[0]),
' '.join(sys.argv[1:]))
-
+
return logger
# log uncaught exceptions
-def handle_exceptions(exc_type: Type[BaseException], exc_value: BaseException, exc_traceback: TracebackType | None) -> None:
+def handle_exceptions(exc_type: Type[BaseException], exc_value: BaseException, exc_traceback: Union[TracebackType, None]) -> None:
# def log_exceptions(type, value, tb):
- """This function is a helper function to log uncaught exceptions. Install with:
+ """This function is a helper function to log uncaught exceptions. Install with:
`sys.excepthook = <module>.handle_exceptions`"""
if issubclass(exc_type, KeyboardInterrupt):
sys.__excepthook__(exc_type, exc_value, exc_traceback)
diff --git a/b_asic/scheduler-gui/main_window.py b/b_asic/scheduler-gui/main_window.py
index e6e51b32..5b09f079 100644
--- a/b_asic/scheduler-gui/main_window.py
+++ b/b_asic/scheduler-gui/main_window.py
@@ -9,7 +9,6 @@ Start main-window with start_gui().
import os
import sys
from typing import Union
-from pprint import pprint
from copy import deepcopy
from importlib.machinery import SourceFileLoader
import inspect
@@ -17,8 +16,7 @@ import inspect
# Qt/qtpy
import qtpy
-from qtpy import uic, QtCore, QtGui, QtWidgets
-from qtpy.QtCore import QCoreApplication, Qt, Slot, Signal, QSettings, QStandardPaths
+from qtpy.QtCore import QCoreApplication, Qt, Slot, QSettings, QStandardPaths
from qtpy.QtGui import QCloseEvent
from qtpy.QtWidgets import (
QApplication, QMainWindow, QMessageBox, QFileDialog, QInputDialog, QCheckBox, QAbstractButton,
@@ -51,6 +49,7 @@ if __debug__:
if __debug__:
# Print some system version information
+ from qtpy import QtCore
QT_API = os.environ.get('QT_API')
log.debug('Qt version (runtime): {}'.format(QtCore.qVersion()))
log.debug('Qt version (compiletime): {}'.format(QtCore.__version__))
@@ -62,11 +61,11 @@ if __debug__:
from qtpy.QtCore import PYQT_VERSION_STR
log.debug('PyQt version: {}'.format(PYQT_VERSION_STR))
log.debug('QtPy version: {}'.format(qtpy.__version__))
-
+
# Autocompile the .ui form to a python file.
try: # PyQt5, try autocompile
from qtpy.uic import compileUiDir
- uic.compileUiDir('.', map=(lambda dir,file: (dir, 'ui_' + file)))
+ compileUiDir('.', map=(lambda dir,file: (dir, 'ui_' + file)))
except:
try: # PySide2, try manual compile
import subprocess
@@ -110,7 +109,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
_splitter_pos: int
_splitter_min: int
-
+
def __init__(self):
"""Initialize Scheduler-gui."""
super().__init__()
@@ -118,7 +117,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self._graph = None
self._scale = 75.0
self._debug_rects = None
-
+
QIcon.setThemeName('breeze')
log.debug('themeName: \'{}\''.format(QIcon.themeName()))
log.debug('themeSearchPaths: {}'.format(QIcon.themeSearchPaths()))
@@ -126,11 +125,11 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self._read_settings()
self._init_ui()
self._init_graphics()
-
+
def _init_ui(self) -> None:
"""Initialize the ui"""
-
+
# Connect signals to slots
self.menu_load_from_file.triggered .connect(self._load_schedule_from_pyfile)
self.menu_close_schedule.triggered .connect(self.close_schedule)
@@ -144,7 +143,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
# Setup event member functions
self.closeEvent = self._close_event
-
+
# Setup info table
self.info_table.setSpan(0, 0, 1, 2) # Span 'Schedule' over 2 columns
self.info_table.setSpan(1, 0, 1, 2) # Span 'Operator' over 2 columns
@@ -166,12 +165,12 @@ class MainWindow(QMainWindow, Ui_MainWindow):
GraphicsAxesItem._scale = self._scale
self._scene.sceneRectChanged.connect(self.shrink_scene_to_min_size)
-
+
@property
def schedule(self) -> Schedule:
"""Get the current schedule."""
return self._schedule
-
+
###############
#### Slots ####
@@ -182,7 +181,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.schedule.plot_schedule()
print(f'filtersChildEvents(): {self._graph.filtersChildEvents()}')
# self._printButtonPressed('callback_pushButton()')
-
+
@Slot()
def _load_schedule_from_pyfile(self) -> None:
"""SLOT() for SIGNAL(menu_load_from_file.triggered)
@@ -199,7 +198,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.tr("Open python file"),
last_file,
self.tr("Python Files (*.py *.py3)"))
-
+
if not abs_path_filename: # return if empty filename (QFileDialog was canceled)
return
log.debug('abs_path_filename = {}.'.format(abs_path_filename))
@@ -207,8 +206,8 @@ class MainWindow(QMainWindow, Ui_MainWindow):
module_name = inspect.getmodulename(abs_path_filename)
if not module_name: # return if empty module name
log.error('Could not load module from file \'{}\'.'.format(abs_path_filename))
- return
-
+ return
+
try:
module = SourceFileLoader(module_name, abs_path_filename).load_module()
except:
@@ -216,7 +215,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
return
schedule_obj_list = dict(inspect.getmembers(module, (lambda x: isinstance(x, Schedule))))
-
+
if not schedule_obj_list: # return if no Schedule objects in script
QMessageBox.warning(self,
self.tr('File not found'),
@@ -226,7 +225,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
.format(os.path.basename(abs_path_filename)))
del module
return
-
+
ret_tuple = QInputDialog.getItem(self,
self.tr('Load object'),
self.tr('Found the following Schedule object(s) in file.\n\n'
@@ -237,7 +236,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
log.debug('Load schedule operation: user canceled')
del module
return
-
+
self.open(schedule_obj_list[ret_tuple[0]])
del module
settings.setValue("mainwindow/last_opened_file", abs_path_filename)
@@ -257,7 +256,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
del self._schedule
self._schedule = None
self.info_table_clear()
-
+
@Slot()
def save(self) -> None:
"""SLOT() for SIGNAL(menu_save.triggered)
@@ -273,7 +272,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
#TODO: all
self._printButtonPressed('save_schedule()')
self.update_statusbar(self.tr('Schedule saved successfully'))
-
+
@Slot(bool)
def show_info_table(self, checked: bool) -> None:
"""SLOT(bool) for SIGNAL(menu_node_info.triggered)
@@ -281,16 +280,16 @@ class MainWindow(QMainWindow, Ui_MainWindow):
'checked'."""
# Note: splitter handler index 0 is a hidden splitter handle far most left, use index 1
# settings = QSettings()
- _, max = self.splitter.getRange(1) # tuple(min, max)
-
+ _, max_ = self.splitter.getRange(1) # tuple(min, max)
+
if checked:
if self._splitter_pos < self._splitter_min:
- self.splitter.moveSplitter(max - self._splitter_min, 1)
+ self.splitter.moveSplitter(max_ - self._splitter_min, 1)
else:
- self.splitter.moveSplitter(max - self._splitter_pos, 1)
+ self.splitter.moveSplitter(max_ - self._splitter_pos, 1)
else:
- self.splitter.moveSplitter(max, 1)
-
+ self.splitter.moveSplitter(max_, 1)
+
@Slot(bool)
def hide_exit_dialog(self, checked: bool) -> None:
"""SLOT(bool) for SIGNAL(menu_exit_dialog.triggered)
@@ -302,10 +301,10 @@ class MainWindow(QMainWindow, Ui_MainWindow):
@Slot(int, int)
def _splitter_moved(self, pos: int, index: int) -> None:
"""SLOT(int, int) for SIGNAL(splitter.splitterMoved)
- Callback method used to check if the right widget (info window)
+ Callback method used to check if the right widget (info window)
has collapsed. Update the checkbutton accordingly."""
width = self.splitter.sizes()[1]
-
+
if width == 0:
if self.menu_node_info.isChecked() is True:
self.menu_node_info.setChecked(False)
@@ -322,13 +321,13 @@ class MainWindow(QMainWindow, Ui_MainWindow):
associated with 'op_id'."""
self.info_table_clear_component()
self._info_table_fill_component(op_id)
-
+
@Slot()
def info_table_update_schedule(self) -> None:
"""SLOT() for SIGNAL(_graph._signals.schedule_time_changed)
Updates the 'Schedule' part of the info table."""
self.info_table.item(1, 1).setText(str(self.schedule.schedule_time))
-
+
@Slot(QRectF)
def shrink_scene_to_min_size(self, rect: QRectF) -> None:
"""SLOT(QRectF) for SIGNAL(_scene.sceneRectChanged)
@@ -336,7 +335,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
it's minimum size, when the bounding rectangle signals a change in
geometry."""
self._scene.setSceneRect(self._scene.itemsBoundingRect())
-
+
################
@@ -349,7 +348,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
s = QSettings()
hide_dialog = s.value('mainwindow/hide_exit_dialog', False, bool)
ret = QMessageBox.StandardButton.Yes
-
+
if not hide_dialog:
box = QMessageBox(self)
box.setWindowTitle(self.tr('Confirm Exit'))
@@ -364,7 +363,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
checkbox = QCheckBox(self.tr('Don\'t ask again'))
box.setCheckBox(checkbox)
ret = box.exec_()
-
+
if ret == QMessageBox.StandardButton.Yes:
if not hide_dialog:
s.setValue('mainwindow/hide_exit_dialog', checkbox.isChecked())
@@ -373,19 +372,19 @@ class MainWindow(QMainWindow, Ui_MainWindow):
event.accept()
else:
event.ignore()
-
+
#################################
#### Helper member functions ####
#################################
def _printButtonPressed(self, func_name: str) -> None:
- #TODO: remove
+ #TODO: remove
alert = QMessageBox(self)
alert.setText("Called from " + func_name + '!')
alert.exec_()
-
+
def open(self, schedule: Schedule) -> None:
"""Takes in an Schedule and creates a GraphicsGraphItem object."""
self.close_schedule()
@@ -403,7 +402,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
def update_statusbar(self, msg: str) -> None:
"""Takes in an str and write 'msg' to the statusbar with temporarily policy."""
self.statusbar.showMessage(msg)
-
+
def _write_settings(self) -> None:
"""Write settings from MainWindow to Settings."""
s = QSettings()
@@ -419,7 +418,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
log.debug('Settings written to \'{}\'.'.format(s.fileName()))
else:
log.warning('Settings cant be saved to file, read-only.')
-
+
def _read_settings(self) -> None:
"""Read settings from Settings to MainWindow."""
s = QSettings()
@@ -435,7 +434,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.menu_exit_dialog.setChecked( s.value('mainwindow/hide_exit_dialog', False, bool))
log.debug('Settings read from \'{}\'.'.format(s.fileName()))
-
+
def info_table_fill_schedule(self, schedule: Schedule) -> None:
"""Takes in a Schedule and fill in the 'Schedule' part of the info table
with values from 'schedule'"""
@@ -465,19 +464,19 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.info_table.setItem(si, 0, QTableWidgetItem('Name'))
self.info_table.setItem(si, 1, QTableWidgetItem(str(op.name)))
si += 1
-
+
for key, value in op.params.items():
self.info_table.insertRow(si)
self.info_table.setItem(si, 0, QTableWidgetItem(key))
self.info_table.setItem(si, 1, QTableWidgetItem(str(value)))
si += 1
-
-
+
+
def info_table_clear(self) -> None:
"""Clears the info table."""
self.info_table_clear_component()
self.info_table_clear_schedule()
-
+
def info_table_clear_schedule(self) -> None:
"""Clears the schedule part of the info table."""
row = self.info_table.findItems('Operator', Qt.MatchExactly)
@@ -488,7 +487,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.info_table.removeRow(1)
else:
log.error("'Operator' not found in info table. It may have been renamed.")
-
+
def info_table_clear_component(self) -> None:
"""Clears the component part of the info table."""
row = self.info_table.findItems('Operator', Qt.MatchExactly)
--
GitLab