diff --git a/b_asic/scheduler_gui/main_window.py b/b_asic/scheduler_gui/main_window.py index 4de6e4cd5464358479fb4505ebac9aa6b8bd3ef1..f4502f9908905c8579608297c366bdcb2a16c013 100644 --- a/b_asic/scheduler_gui/main_window.py +++ b/b_asic/scheduler_gui/main_window.py @@ -98,9 +98,9 @@ if __debug__: log.debug(f"Qt version (compile time): {QtCore.__version__}") log.debug(f"QT_API: {QT_API}") if QT_API.lower().startswith("pyside"): - import PySide6 + import PySide2 - log.debug(f"PySide version: {PySide6.__version__}") + log.debug(f"PySide version: {PySide2.__version__}") if QT_API.lower().startswith("pyqt"): from qtpy.QtCore import PYQT_VERSION_STR @@ -1694,8 +1694,8 @@ def start_scheduler(schedule: Optional[Schedule] = None) -> Optional[Schedule]: palette.setColor(QPalette.ColorRole.Window, QtCore.Qt.white) palette.setColor(QPalette.ColorRole.WindowText, QtCore.Qt.black) palette.setColor(QPalette.ColorRole.ButtonText, QtCore.Qt.black) - palette.setColor(QPalette.ColorRole.Base, QtCore.Qt.white) - palette.setColor(QPalette.ColorRole.AlternateBase, QtCore.Qt.lightGray) + palette.setColor(QPalette.ColorRole.Base, QtCore.Qt.white) + palette.setColor(QPalette.ColorRole.AlternateBase, QtCore.Qt.lightGray) palette.setColor(QPalette.ColorRole.Text, QtCore.Qt.black) app.setPalette(palette) else: diff --git a/b_asic/scheduler_gui/ui_main_window.py b/b_asic/scheduler_gui/ui_main_window.py index 7def5879dc6080b417517a74654a7987f7af2522..ad3fa898840bd8511fc62700272e4018ca22e926 100644 --- a/b_asic/scheduler_gui/ui_main_window.py +++ b/b_asic/scheduler_gui/ui_main_window.py @@ -9,23 +9,35 @@ from qtpy import QtCore, QtGui, QtWidgets -class Ui_MainWindow(object): +class Ui_MainWindow: def setupUi(self, MainWindow): MainWindow.setObjectName("MainWindow") MainWindow.resize(800, 600) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) + sizePolicy = QtWidgets.QSizePolicy( + QtWidgets.QSizePolicy.Policy.Preferred, + QtWidgets.QSizePolicy.Policy.Preferred, + ) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(MainWindow.sizePolicy().hasHeightForWidth()) MainWindow.setSizePolicy(sizePolicy) icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap(":/icons/basic/small_logo.png"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) + icon.addPixmap( + QtGui.QPixmap(":/icons/basic/small_logo.png"), + QtGui.QIcon.Mode.Normal, + QtGui.QIcon.State.Off, + ) MainWindow.setWindowIcon(icon) self.centralwidget = QtWidgets.QWidget(parent=MainWindow) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Preferred) + sizePolicy = QtWidgets.QSizePolicy( + QtWidgets.QSizePolicy.Policy.Preferred, + QtWidgets.QSizePolicy.Policy.Preferred, + ) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.centralwidget.sizePolicy().hasHeightForWidth()) + sizePolicy.setHeightForWidth( + self.centralwidget.sizePolicy().hasHeightForWidth() + ) self.centralwidget.setSizePolicy(sizePolicy) self.centralwidget.setObjectName("centralwidget") self.horizontalLayout = QtWidgets.QHBoxLayout(self.centralwidget) @@ -37,15 +49,30 @@ class Ui_MainWindow(object): self.splitter.setHandleWidth(0) self.splitter.setObjectName("splitter") self.view = QtWidgets.QGraphicsView(parent=self.splitter) - self.view.setAlignment(QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignLeft|QtCore.Qt.AlignmentFlag.AlignTop) - self.view.setRenderHints(QtGui.QPainter.RenderHint.Antialiasing|QtGui.QPainter.RenderHint.TextAntialiasing) - self.view.setViewportUpdateMode(QtWidgets.QGraphicsView.ViewportUpdateMode.FullViewportUpdate) + self.view.setAlignment( + QtCore.Qt.AlignmentFlag.AlignLeading + | QtCore.Qt.AlignmentFlag.AlignLeft + | QtCore.Qt.AlignmentFlag.AlignTop + ) + self.view.setRenderHints( + QtGui.QPainter.RenderHint.Antialiasing + | QtGui.QPainter.RenderHint.TextAntialiasing + ) + self.view.setViewportUpdateMode( + QtWidgets.QGraphicsView.ViewportUpdateMode.FullViewportUpdate + ) self.view.setObjectName("view") self.info_table = QtWidgets.QTableWidget(parent=self.splitter) - self.info_table.setStyleSheet("alternate-background-color: #fadefb;background-color: #ebebeb;") - self.info_table.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers) + self.info_table.setStyleSheet( + "alternate-background-color: #fadefb;background-color: #ebebeb;" + ) + self.info_table.setEditTriggers( + QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers + ) self.info_table.setAlternatingRowColors(True) - self.info_table.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows) + self.info_table.setSelectionBehavior( + QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows + ) self.info_table.setRowCount(2) self.info_table.setColumnCount(2) self.info_table.setObjectName("info_table") @@ -54,14 +81,18 @@ class Ui_MainWindow(object): item = QtWidgets.QTableWidgetItem() self.info_table.setVerticalHeaderItem(1, item) item = QtWidgets.QTableWidgetItem() - item.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignVCenter) + item.setTextAlignment( + QtCore.Qt.AlignmentFlag.AlignLeading | QtCore.Qt.AlignmentFlag.AlignVCenter + ) font = QtGui.QFont() font.setBold(False) font.setWeight(50) item.setFont(font) self.info_table.setHorizontalHeaderItem(0, item) item = QtWidgets.QTableWidgetItem() - item.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignLeading|QtCore.Qt.AlignmentFlag.AlignVCenter) + item.setTextAlignment( + QtCore.Qt.AlignmentFlag.AlignLeading | QtCore.Qt.AlignmentFlag.AlignVCenter + ) self.info_table.setHorizontalHeaderItem(1, item) item = QtWidgets.QTableWidgetItem() font = QtGui.QFont() @@ -75,7 +106,13 @@ class Ui_MainWindow(object): brush = QtGui.QBrush(QtGui.QColor(255, 255, 255)) brush.setStyle(QtCore.Qt.BrushStyle.SolidPattern) item.setForeground(brush) - item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable|QtCore.Qt.ItemFlag.ItemIsEditable|QtCore.Qt.ItemFlag.ItemIsDragEnabled|QtCore.Qt.ItemFlag.ItemIsDropEnabled|QtCore.Qt.ItemFlag.ItemIsUserCheckable) + item.setFlags( + QtCore.Qt.ItemFlag.ItemIsSelectable + | QtCore.Qt.ItemFlag.ItemIsEditable + | QtCore.Qt.ItemFlag.ItemIsDragEnabled + | QtCore.Qt.ItemFlag.ItemIsDropEnabled + | QtCore.Qt.ItemFlag.ItemIsUserCheckable + ) self.info_table.setItem(0, 0, item) item = QtWidgets.QTableWidgetItem() font = QtGui.QFont() @@ -88,7 +125,13 @@ class Ui_MainWindow(object): brush = QtGui.QBrush(QtGui.QColor(255, 255, 255)) brush.setStyle(QtCore.Qt.BrushStyle.SolidPattern) item.setForeground(brush) - item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable|QtCore.Qt.ItemFlag.ItemIsEditable|QtCore.Qt.ItemFlag.ItemIsDragEnabled|QtCore.Qt.ItemFlag.ItemIsDropEnabled|QtCore.Qt.ItemFlag.ItemIsUserCheckable) + item.setFlags( + QtCore.Qt.ItemFlag.ItemIsSelectable + | QtCore.Qt.ItemFlag.ItemIsEditable + | QtCore.Qt.ItemFlag.ItemIsDragEnabled + | QtCore.Qt.ItemFlag.ItemIsDropEnabled + | QtCore.Qt.ItemFlag.ItemIsUserCheckable + ) self.info_table.setItem(1, 0, item) self.info_table.horizontalHeader().setHighlightSections(False) self.info_table.horizontalHeader().setStretchLastSection(True) @@ -135,8 +178,16 @@ class Ui_MainWindow(object): self.menu_node_info.setCheckable(True) self.menu_node_info.setChecked(True) icon1 = QtGui.QIcon() - icon1.addPixmap(QtGui.QPixmap(":/icons/misc/right_panel.svg"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.Off) - icon1.addPixmap(QtGui.QPixmap(":/icons/misc/right_filled_panel.svg"), QtGui.QIcon.Mode.Normal, QtGui.QIcon.State.On) + icon1.addPixmap( + QtGui.QPixmap(":/icons/misc/right_panel.svg"), + QtGui.QIcon.Mode.Normal, + QtGui.QIcon.State.Off, + ) + icon1.addPixmap( + QtGui.QPixmap(":/icons/misc/right_filled_panel.svg"), + QtGui.QIcon.Mode.Normal, + QtGui.QIcon.State.On, + ) self.menu_node_info.setIcon(icon1) self.menu_node_info.setIconVisibleInMenu(False) self.menu_node_info.setObjectName("menu_node_info") @@ -181,9 +232,13 @@ class Ui_MainWindow(object): self.actionRedo.setEnabled(False) self.actionRedo.setObjectName("actionRedo") self.actionIncrease_time_resolution = QtGui.QAction(parent=MainWindow) - self.actionIncrease_time_resolution.setObjectName("actionIncrease_time_resolution") + self.actionIncrease_time_resolution.setObjectName( + "actionIncrease_time_resolution" + ) self.actionDecrease_time_resolution = QtGui.QAction(parent=MainWindow) - self.actionDecrease_time_resolution.setObjectName("actionDecrease_time_resolution") + self.actionDecrease_time_resolution.setObjectName( + "actionDecrease_time_resolution" + ) self.actionZoom_to_fit = QtGui.QAction(parent=MainWindow) self.actionZoom_to_fit.setObjectName("actionZoom_to_fit") self.actionStatus_bar = QtGui.QAction(parent=MainWindow) @@ -203,7 +258,9 @@ class Ui_MainWindow(object): self.action_incorrect_execution_time.setCheckable(True) self.action_incorrect_execution_time.setChecked(True) self.action_incorrect_execution_time.setIconVisibleInMenu(False) - self.action_incorrect_execution_time.setObjectName("action_incorrect_execution_time") + self.action_incorrect_execution_time.setObjectName( + "action_incorrect_execution_time" + ) self.menu_open = QtGui.QAction(parent=MainWindow) icon = QtGui.QIcon.fromTheme("personal") self.menu_open.setIcon(icon) @@ -289,24 +346,34 @@ class Ui_MainWindow(object): self.menuFile.setTitle(_translate("MainWindow", "&File")) self.menu_Recent_Schedule.setTitle(_translate("MainWindow", "Open &recent")) self.menuView.setTitle(_translate("MainWindow", "&View")) - self.menu_view_execution_times.setTitle(_translate("MainWindow", "View execution times of type")) + self.menu_view_execution_times.setTitle( + _translate("MainWindow", "View execution times of type") + ) self.menu_Edit.setTitle(_translate("MainWindow", "&Edit")) self.menuWindow.setTitle(_translate("MainWindow", "&Window")) self.menuHelp.setTitle(_translate("MainWindow", "&Help")) self.toolBar.setWindowTitle(_translate("MainWindow", "toolBar")) - self.menu_load_from_file.setText(_translate("MainWindow", "&Import schedule from file...")) - self.menu_load_from_file.setToolTip(_translate("MainWindow", "Import schedule from python script")) + self.menu_load_from_file.setText( + _translate("MainWindow", "&Import schedule from file...") + ) + self.menu_load_from_file.setToolTip( + _translate("MainWindow", "Import schedule from python script") + ) self.menu_load_from_file.setShortcut(_translate("MainWindow", "Ctrl+I")) self.menu_save.setText(_translate("MainWindow", "&Save")) self.menu_save.setToolTip(_translate("MainWindow", "Save schedule")) self.menu_save.setShortcut(_translate("MainWindow", "Ctrl+S")) self.menu_node_info.setText(_translate("MainWindow", "&Node info")) - self.menu_node_info.setToolTip(_translate("MainWindow", "Show/hide node information")) + self.menu_node_info.setToolTip( + _translate("MainWindow", "Show/hide node information") + ) self.menu_node_info.setShortcut(_translate("MainWindow", "Ctrl+N")) self.menu_quit.setText(_translate("MainWindow", "&Quit")) self.menu_quit.setShortcut(_translate("MainWindow", "Ctrl+Q")) self.menu_save_as.setText(_translate("MainWindow", "Save &as...")) - self.menu_save_as.setToolTip(_translate("MainWindow", "Save schedule with new file name")) + self.menu_save_as.setToolTip( + _translate("MainWindow", "Save schedule with new file name") + ) self.menu_save_as.setShortcut(_translate("MainWindow", "Ctrl+Shift+S")) self.menu_exit_dialog.setText(_translate("MainWindow", "&Hide exit dialog")) self.menu_exit_dialog.setToolTip(_translate("MainWindow", "Hide exit dialog")) @@ -315,35 +382,68 @@ class Ui_MainWindow(object): self.actionAbout.setText(_translate("MainWindow", "&About")) self.actionAbout.setToolTip(_translate("MainWindow", "Open about window")) self.actionDocumentation.setText(_translate("MainWindow", "&Documentation")) - self.actionDocumentation.setToolTip(_translate("MainWindow", "Open documentation")) + self.actionDocumentation.setToolTip( + _translate("MainWindow", "Open documentation") + ) self.actionReorder.setText(_translate("MainWindow", "Reorder")) - self.actionReorder.setToolTip(_translate("MainWindow", "Reorder schedule based on start time")) + self.actionReorder.setToolTip( + _translate("MainWindow", "Reorder schedule based on start time") + ) self.actionReorder.setShortcut(_translate("MainWindow", "Ctrl+R")) self.actionPlot_schedule.setText(_translate("MainWindow", "&Plot schedule")) self.actionPlot_schedule.setToolTip(_translate("MainWindow", "Plot schedule")) - self.action_view_variables.setText(_translate("MainWindow", "View execution times of variables")) - self.action_view_variables.setToolTip(_translate("MainWindow", "View all variables")) - self.action_view_port_accesses.setText(_translate("MainWindow", "View port access statistics")) - self.action_view_port_accesses.setToolTip(_translate("MainWindow", "View port access statistics for storage")) + self.action_view_variables.setText( + _translate("MainWindow", "View execution times of variables") + ) + self.action_view_variables.setToolTip( + _translate("MainWindow", "View all variables") + ) + self.action_view_port_accesses.setText( + _translate("MainWindow", "View port access statistics") + ) + self.action_view_port_accesses.setToolTip( + _translate("MainWindow", "View port access statistics for storage") + ) self.actionUndo.setText(_translate("MainWindow", "Undo")) self.actionUndo.setShortcut(_translate("MainWindow", "Ctrl+Z")) self.actionRedo.setText(_translate("MainWindow", "Redo")) self.actionRedo.setShortcut(_translate("MainWindow", "Ctrl+Y, Ctrl+Shift+Z")) - self.actionIncrease_time_resolution.setText(_translate("MainWindow", "Increase time resolution...")) - self.actionDecrease_time_resolution.setText(_translate("MainWindow", "Decrease time resolution...")) + self.actionIncrease_time_resolution.setText( + _translate("MainWindow", "Increase time resolution...") + ) + self.actionDecrease_time_resolution.setText( + _translate("MainWindow", "Decrease time resolution...") + ) self.actionZoom_to_fit.setText(_translate("MainWindow", "Zoom to &fit")) self.actionStatus_bar.setText(_translate("MainWindow", "&Status bar")) - self.actionStatus_bar.setToolTip(_translate("MainWindow", "Show/hide status bar")) + self.actionStatus_bar.setToolTip( + _translate("MainWindow", "Show/hide status bar") + ) self.actionToolbar.setText(_translate("MainWindow", "&Toolbar")) self.actionToolbar.setToolTip(_translate("MainWindow", "Show/hide toolbar")) - self.action_show_port_numbers.setText(_translate("MainWindow", "S&how port numbers")) - self.action_show_port_numbers.setToolTip(_translate("MainWindow", "Show port numbers of operation")) - self.action_incorrect_execution_time.setText(_translate("MainWindow", "&Incorrect execution time")) - self.action_incorrect_execution_time.setToolTip(_translate("MainWindow", "Highlight processes with execution time longer than schedule time")) + self.action_show_port_numbers.setText( + _translate("MainWindow", "S&how port numbers") + ) + self.action_show_port_numbers.setToolTip( + _translate("MainWindow", "Show port numbers of operation") + ) + self.action_incorrect_execution_time.setText( + _translate("MainWindow", "&Incorrect execution time") + ) + self.action_incorrect_execution_time.setToolTip( + _translate( + "MainWindow", + "Highlight processes with execution time longer than schedule time", + ) + ) self.menu_open.setText(_translate("MainWindow", "&Open...")) - self.menu_open.setToolTip(_translate("MainWindow", "Open previously saved schedule")) + self.menu_open.setToolTip( + _translate("MainWindow", "Open previously saved schedule") + ) self.menu_open.setShortcut(_translate("MainWindow", "Ctrl+O")) - self.actionToggle_full_screen.setText(_translate("MainWindow", "Toggle f&ull screen")) + self.actionToggle_full_screen.setText( + _translate("MainWindow", "Toggle f&ull screen") + ) self.actionToggle_full_screen.setShortcut(_translate("MainWindow", "F11")) self.actionPreferences.setText(_translate("MainWindow", "Preferences")) self.actionPreferences.setToolTip(_translate("MainWindow", "Color and Fonts"))