Skip to content
Snippets Groups Projects
Commit 85db5737 authored by Jacob Wahlman's avatar Jacob Wahlman :ok_hand:
Browse files

Merge branch '79-refactor-operations-in-gui' into 'develop'

Resolve "Refactor Operations in GUI"

See merge request PUM_TDDD96/B-ASIC!41
parents 7ce467c5 9188ce4f
No related branches found
No related tags found
3 merge requests!67WIP: B-ASIC version 1.0.0 hotfix,!65B-ASIC version 1.0.0,!41Resolve "Refactor Operations in GUI"
Pipeline #14585 passed
Showing
with 99 additions and 419 deletions
...@@ -59,30 +59,6 @@ class Ui_main_window(object): ...@@ -59,30 +59,6 @@ class Ui_main_window(object):
self.core_operations_list.setWordWrap(False) self.core_operations_list.setWordWrap(False)
self.core_operations_list.setSelectionRectVisible(False) self.core_operations_list.setSelectionRectVisible(False)
self.core_operations_list.setObjectName("core_operations_list") self.core_operations_list.setObjectName("core_operations_list")
item = QtWidgets.QListWidgetItem()
self.core_operations_list.addItem(item)
item = QtWidgets.QListWidgetItem()
self.core_operations_list.addItem(item)
item = QtWidgets.QListWidgetItem()
self.core_operations_list.addItem(item)
item = QtWidgets.QListWidgetItem()
self.core_operations_list.addItem(item)
item = QtWidgets.QListWidgetItem()
self.core_operations_list.addItem(item)
item = QtWidgets.QListWidgetItem()
self.core_operations_list.addItem(item)
item = QtWidgets.QListWidgetItem()
self.core_operations_list.addItem(item)
item = QtWidgets.QListWidgetItem()
self.core_operations_list.addItem(item)
item = QtWidgets.QListWidgetItem()
self.core_operations_list.addItem(item)
item = QtWidgets.QListWidgetItem()
self.core_operations_list.addItem(item)
item = QtWidgets.QListWidgetItem()
self.core_operations_list.addItem(item)
item = QtWidgets.QListWidgetItem()
self.core_operations_list.addItem(item)
self.operation_list.addItem(self.core_operations_page, "") self.operation_list.addItem(self.core_operations_page, "")
self.special_operations_page = QtWidgets.QWidget() self.special_operations_page = QtWidgets.QWidget()
self.special_operations_page.setGeometry(QtCore.QRect(0, 0, 171, 217)) self.special_operations_page.setGeometry(QtCore.QRect(0, 0, 171, 217))
...@@ -90,14 +66,6 @@ class Ui_main_window(object): ...@@ -90,14 +66,6 @@ class Ui_main_window(object):
self.special_operations_list = QtWidgets.QListWidget(self.special_operations_page) self.special_operations_list = QtWidgets.QListWidget(self.special_operations_page)
self.special_operations_list.setGeometry(QtCore.QRect(10, 0, 141, 81)) self.special_operations_list.setGeometry(QtCore.QRect(10, 0, 141, 81))
self.special_operations_list.setObjectName("special_operations_list") self.special_operations_list.setObjectName("special_operations_list")
item = QtWidgets.QListWidgetItem()
self.special_operations_list.addItem(item)
item = QtWidgets.QListWidgetItem()
self.special_operations_list.addItem(item)
item = QtWidgets.QListWidgetItem()
self.special_operations_list.addItem(item)
item = QtWidgets.QListWidgetItem()
self.special_operations_list.addItem(item)
self.operation_list.addItem(self.special_operations_page, "") self.operation_list.addItem(self.special_operations_page, "")
main_window.setCentralWidget(self.centralwidget) main_window.setCentralWidget(self.centralwidget)
self.menu_bar = QtWidgets.QMenuBar(main_window) self.menu_bar = QtWidgets.QMenuBar(main_window)
...@@ -292,42 +260,10 @@ class Ui_main_window(object): ...@@ -292,42 +260,10 @@ class Ui_main_window(object):
self.core_operations_list.setSortingEnabled(False) self.core_operations_list.setSortingEnabled(False)
__sortingEnabled = self.core_operations_list.isSortingEnabled() __sortingEnabled = self.core_operations_list.isSortingEnabled()
self.core_operations_list.setSortingEnabled(False) self.core_operations_list.setSortingEnabled(False)
item = self.core_operations_list.item(0)
item.setText(_translate("main_window", "Addition"))
item = self.core_operations_list.item(1)
item.setText(_translate("main_window", "Subtraction"))
item = self.core_operations_list.item(2)
item.setText(_translate("main_window", "Multiplication"))
item = self.core_operations_list.item(3)
item.setText(_translate("main_window", "Division"))
item = self.core_operations_list.item(4)
item.setText(_translate("main_window", "Constant"))
item = self.core_operations_list.item(5)
item.setText(_translate("main_window", "Constant multiplication"))
item = self.core_operations_list.item(6)
item.setText(_translate("main_window", "Square root"))
item = self.core_operations_list.item(7)
item.setText(_translate("main_window", "Complex conjugate"))
item = self.core_operations_list.item(8)
item.setText(_translate("main_window", "Absolute"))
item = self.core_operations_list.item(9)
item.setText(_translate("main_window", "Max"))
item = self.core_operations_list.item(10)
item.setText(_translate("main_window", "Min"))
item = self.core_operations_list.item(11)
item.setText(_translate("main_window", "Butterfly"))
self.core_operations_list.setSortingEnabled(__sortingEnabled) self.core_operations_list.setSortingEnabled(__sortingEnabled)
self.operation_list.setItemText(self.operation_list.indexOf(self.core_operations_page), _translate("main_window", "Core operations")) self.operation_list.setItemText(self.operation_list.indexOf(self.core_operations_page), _translate("main_window", "Core operations"))
__sortingEnabled = self.special_operations_list.isSortingEnabled() __sortingEnabled = self.special_operations_list.isSortingEnabled()
self.special_operations_list.setSortingEnabled(False) self.special_operations_list.setSortingEnabled(False)
item = self.special_operations_list.item(0)
item.setText(_translate("main_window", "Input"))
item = self.special_operations_list.item(1)
item.setText(_translate("main_window", "Output"))
item = self.special_operations_list.item(2)
item.setText(_translate("main_window", "Register"))
item = self.special_operations_list.item(3)
item.setText(_translate("main_window", "Custom"))
self.special_operations_list.setSortingEnabled(__sortingEnabled) self.special_operations_list.setSortingEnabled(__sortingEnabled)
self.operation_list.setItemText(self.operation_list.indexOf(self.special_operations_page), _translate("main_window", "Special operations")) self.operation_list.setItemText(self.operation_list.indexOf(self.special_operations_page), _translate("main_window", "Special operations"))
self.file_menu.setTitle(_translate("main_window", "File")) self.file_menu.setTitle(_translate("main_window", "File"))
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment