diff --git a/.gitignore b/.gitignore index eddcfd56ffcd71e328ecd167381285cf6972d07b..6d5a7954d6090e11a7e8a76d383aa628a16a10d1 100644 --- a/.gitignore +++ b/.gitignore @@ -111,4 +111,4 @@ _b_asic_debug_log.txt .qt_for_python/ *.pyproject.user *.pyproject -*/schedule-gui/ui/ \ No newline at end of file +*/scheduler-gui/ui/ \ No newline at end of file diff --git a/b_asic/scheduler-gui/main_window.py b/b_asic/scheduler-gui/main_window.py index 48546dc62379c029abc5f70996acaab147297617..7d74f5044765de27bbe5a249e486e00d16de61e8 100644 --- a/b_asic/scheduler-gui/main_window.py +++ b/b_asic/scheduler-gui/main_window.py @@ -46,7 +46,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): #_ui: QMainWindow # <class '__main__.Ui_MainWindow'> #_widget: QMainWindow # <class 'PyQt5.QtWidgets.QMainWindow'> - ui = Ui_MainWindow() # DEBUG, remove later + #ui = Ui_MainWindow() # DEBUG, remove later def __init__(self): """Construct a Schedule from an SFG and show it in the UI.""" @@ -70,12 +70,15 @@ class MainWindow(QMainWindow, Ui_MainWindow): # self._ui.menu_node_info.triggered.connect(self.toggle_node_info) # self._ui.show() - if __debug__: - self.ui = Ui_MainWindow() - self.ui.setupUi(self) - print(type(self.ui)) - else: - uic.loadUi("main_window.ui", self) # Load the .ui file + # if __debug__: + # #self.ui = Ui_MainWindow() + # #self.ui.setupUi(self) + # self.setupUi(self) + # #print(type(self.ui)) + # else: + # uic.loadUi("main_window.ui", self) # Load the .ui file + + self.setupUi(self) self.pushbutton_add.clicked.connect(self.callback_pushButton) self.menu_load_sfg.triggered.connect(self.load_sfg) @@ -93,7 +96,9 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.graphic_view.setRenderHint(QPainter.Antialiasing) self.graphic_view.setGeometry(20, 20, self.width(), self.height()) self.graphic_view.setDragMode(QGraphicsView.RubberBandDrag) - print(self.ui.centralwidget.baseSize()) + print(self.centralwidget.baseSize()) + + self.setupUi(self) # Need to setup ui again @Slot()