bec/bec_widgets
0
0
Fork 0
mirror of https://github.com/bec-project/bec_widgets.git synced 2025-07-14 11:41:49 +02:00
Code Activity

fix(motor_table): fixed ui loading + tests

Browse Source
This commit is contained in:
wyzula_j
2024-05-28 15:24:24 +02:00
parent 7a4eb1d3a6
commit 55083aac40
2 changed files with 72 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
bec_widgets/widgets/motor_control/motor_table/motor_table.py
View File

@ -16,6 +16,7 @@ from qtpy.QtWidgets import (
QTableWidgetItem, QTableWidgetItem,
) )
from bec_widgets.utils import UILoader
from bec_widgets.widgets.motor_control.motor_control import MotorControlWidget from bec_widgets.widgets.motor_control.motor_control import MotorControlWidget
@ -37,25 +38,25 @@ class MotorCoordinateTable(MotorControlWidget):
def _load_ui(self): def _load_ui(self):
"""Load the UI for the coordinate table.""" """Load the UI for the coordinate table."""
current_path = os.path.dirname(__file__) current_path = os.path.dirname(__file__)
uic.loadUi(os.path.join(current_path, "motor_table.ui"), self) self.ui = UILoader().load_ui(os.path.join(current_path, "motor_table.ui"), self)
def _init_ui(self): def _init_ui(self):
"""Initialize the UI""" """Initialize the UI"""
# Setup table behaviour # Setup table behaviour
self._setup_table() self._setup_table()
self.table.setSelectionBehavior(QTableWidget.SelectRows) self.ui.table.setSelectionBehavior(QTableWidget.SelectRows)
# for tag columns default tag # for tag columns default tag
self.tag_counter = 1 self.tag_counter = 1
# Connect signals and slots # Connect signals and slots
self.checkBox_resize_auto.stateChanged.connect(self.resize_table_auto) self.ui.checkBox_resize_auto.stateChanged.connect(self.resize_table_auto)
self.comboBox_mode.currentIndexChanged.connect(self.mode_switch) self.ui.comboBox_mode.currentIndexChanged.connect(self.mode_switch)
# Keyboard shortcuts for deleting a row # Keyboard shortcuts for deleting a row
self.delete_shortcut = QShortcut(QKeySequence(Qt.Key_Delete), self.table) self.delete_shortcut = QShortcut(QKeySequence(Qt.Key_Delete), self.ui.table)
self.delete_shortcut.activated.connect(self.delete_selected_row) self.delete_shortcut.activated.connect(self.delete_selected_row)
self.backspace_shortcut = QShortcut(QKeySequence(Qt.Key_Backspace), self.table) self.backspace_shortcut = QShortcut(QKeySequence(Qt.Key_Backspace), self.ui.table)
self.backspace_shortcut.activated.connect(self.delete_selected_row) self.backspace_shortcut.activated.connect(self.delete_selected_row)
# Warning message for mode switch enable/disable # Warning message for mode switch enable/disable
@ -83,13 +84,13 @@ class MotorCoordinateTable(MotorControlWidget):
self.mode = self.config["motor_control"].get("mode", "Individual") self.mode = self.config["motor_control"].get("mode", "Individual")
# Set combobox to default mode # Set combobox to default mode
self.comboBox_mode.setCurrentText(self.mode) self.ui.comboBox_mode.setCurrentText(self.mode)
self._init_ui() self._init_ui()
def _setup_table(self): def _setup_table(self):
"""Setup the table with appropriate headers and configurations.""" """Setup the table with appropriate headers and configurations."""
mode = self.comboBox_mode.currentText() mode = self.ui.comboBox_mode.currentText()
if mode == "Individual": if mode == "Individual":
self._setup_individual_mode() self._setup_individual_mode()
@ -101,14 +102,14 @@ class MotorCoordinateTable(MotorControlWidget):
def _setup_individual_mode(self): def _setup_individual_mode(self):
"""Setup the table for individual mode.""" """Setup the table for individual mode."""
self.table.setColumnCount(5) self.ui.table.setColumnCount(5)
self.table.setHorizontalHeaderLabels(["Show", "Move", "Tag", "X", "Y"]) self.ui.table.setHorizontalHeaderLabels(["Show", "Move", "Tag", "X", "Y"])
self.table.verticalHeader().setVisible(False) self.ui.table.verticalHeader().setVisible(False)
def _setup_start_stop_mode(self): def _setup_start_stop_mode(self):
"""Setup the table for start/stop mode.""" """Setup the table for start/stop mode."""
self.table.setColumnCount(8) self.ui.table.setColumnCount(8)
self.table.setHorizontalHeaderLabels( self.ui.table.setHorizontalHeaderLabels(
[ [
"Show", "Show",
"Move [start]", "Move [start]",
@ -120,15 +121,15 @@ class MotorCoordinateTable(MotorControlWidget):
"Y [end]", "Y [end]",
] ]
) )
self.table.verticalHeader().setVisible(False) self.ui.table.verticalHeader().setVisible(False)
# Set flag to track if the coordinate is stat or the end of the entry # Set flag to track if the coordinate is stat or the end of the entry
self.is_next_entry_end = False self.is_next_entry_end = False
def mode_switch(self): def mode_switch(self):
"""Switch between individual and start/stop mode.""" """Switch between individual and start/stop mode."""
last_selected_index = self.comboBox_mode.currentIndex() last_selected_index = self.ui.comboBox_mode.currentIndex()
if self.table.rowCount() > 0 and self.warning_message is True: if self.ui.table.rowCount() > 0 and self.warning_message is True:
msgBox = QMessageBox() msgBox = QMessageBox()
msgBox.setIcon(QMessageBox.Critical) msgBox.setIcon(QMessageBox.Critical)
msgBox.setText( msgBox.setText(
@ -138,9 +139,9 @@ class MotorCoordinateTable(MotorControlWidget):
returnValue = msgBox.exec() returnValue = msgBox.exec()
if returnValue is QMessageBox.Cancel: if returnValue is QMessageBox.Cancel:
self.comboBox_mode.blockSignals(True) # Block signals self.ui.comboBox_mode.blockSignals(True) # Block signals
self.comboBox_mode.setCurrentIndex(last_selected_index) self.ui.comboBox_mode.setCurrentIndex(last_selected_index)
self.comboBox_mode.blockSignals(False) # Unblock signals self.ui.comboBox_mode.blockSignals(False) # Unblock signals
return return
# Wipe table # Wipe table
@ -170,7 +171,7 @@ class MotorCoordinateTable(MotorControlWidget):
y(float): Y coordinate. y(float): Y coordinate.
""" """
mode = self.comboBox_mode.currentText() mode = self.ui.comboBox_mode.currentText()
if mode == "Individual": if mode == "Individual":
checkbox_pos = 0 checkbox_pos = 0
button_pos = 1 button_pos = 1
@ -181,8 +182,8 @@ class MotorCoordinateTable(MotorControlWidget):
color = "green" color = "green"
# Add new row -> new entry # Add new row -> new entry
row_count = self.table.rowCount() row_count = self.ui.table.rowCount()
self.table.insertRow(row_count) self.ui.table.insertRow(row_count)
# Add Widgets # Add Widgets
self._add_widgets( self._add_widgets(
@ -213,8 +214,8 @@ class MotorCoordinateTable(MotorControlWidget):
color = "blue" color = "blue"
# Add new row -> new entry # Add new row -> new entry
row_count = self.table.rowCount() row_count = self.ui.table.rowCount()
self.table.insertRow(row_count) self.ui.table.insertRow(row_count)
# Add Widgets # Add Widgets
self._add_widgets( self._add_widgets(
@ -236,7 +237,7 @@ class MotorCoordinateTable(MotorControlWidget):
elif self.is_next_entry_end is True: # It is the end position of the entry elif self.is_next_entry_end is True: # It is the end position of the entry
print("End position") print("End position")
row_count = self.table.rowCount() - 1 # Current row row_count = self.ui.table.rowCount() - 1 # Current row
button_pos = 2 button_pos = 2
x_pos = 6 x_pos = 6
y_pos = 7 y_pos = 7
@ -294,7 +295,7 @@ class MotorCoordinateTable(MotorControlWidget):
# Add widgets # Add widgets
self._add_checkbox(row, checkBox_pos, x_pos, y_pos) self._add_checkbox(row, checkBox_pos, x_pos, y_pos)
self._add_move_button(row, button_pos, x_pos, y_pos) self._add_move_button(row, button_pos, x_pos, y_pos)
self.table.setItem(row, tag_pos, QTableWidgetItem(tag)) self.ui.table.setItem(row, tag_pos, QTableWidgetItem(tag))
self._add_line_edit(x, row, x_pos, x_pos, y_pos, coordinate_reference, color) self._add_line_edit(x, row, x_pos, x_pos, y_pos, coordinate_reference, color)
self._add_line_edit(y, row, y_pos, x_pos, y_pos, coordinate_reference, color) self._add_line_edit(y, row, y_pos, x_pos, y_pos, coordinate_reference, color)
@ -302,10 +303,10 @@ class MotorCoordinateTable(MotorControlWidget):
self.emit_plot_coordinates(x_pos, y_pos, coordinate_reference, color) self.emit_plot_coordinates(x_pos, y_pos, coordinate_reference, color)
# Connect item edit to emit coordinates # Connect item edit to emit coordinates
self.table.itemChanged.connect( self.ui.table.itemChanged.connect(
lambda: print(f"item changed from {coordinate_reference} slot \n {x}-{y}-{color}") lambda: print(f"item changed from {coordinate_reference} slot \n {x}-{y}-{color}")
) )
self.table.itemChanged.connect( self.ui.table.itemChanged.connect(
lambda: self.emit_plot_coordinates(x_pos, y_pos, coordinate_reference, color) lambda: self.emit_plot_coordinates(x_pos, y_pos, coordinate_reference, color)
) )
@ -321,7 +322,7 @@ class MotorCoordinateTable(MotorControlWidget):
show_checkbox = QCheckBox() show_checkbox = QCheckBox()
show_checkbox.setChecked(True) show_checkbox.setChecked(True)
show_checkbox.stateChanged.connect(lambda: self.emit_plot_coordinates(x_pos, y_pos)) show_checkbox.stateChanged.connect(lambda: self.emit_plot_coordinates(x_pos, y_pos))
self.table.setCellWidget(row, checkBox_pos, show_checkbox) self.ui.table.setCellWidget(row, checkBox_pos, show_checkbox)
def _add_move_button(self, row: int, button_pos: int, x_pos: int, y_pos: int) -> None: def _add_move_button(self, row: int, button_pos: int, x_pos: int, y_pos: int) -> None:
""" """
@ -334,7 +335,7 @@ class MotorCoordinateTable(MotorControlWidget):
""" """
move_button = QPushButton("Move") move_button = QPushButton("Move")
move_button.clicked.connect(lambda: self.handle_move_button_click(x_pos, y_pos)) move_button.clicked.connect(lambda: self.handle_move_button_click(x_pos, y_pos))
self.table.setCellWidget(row, button_pos, move_button) self.ui.table.setCellWidget(row, button_pos, move_button)
def _add_line_edit( def _add_line_edit(
self, self,
@ -367,7 +368,7 @@ class MotorCoordinateTable(MotorControlWidget):
edit.setAlignment(Qt.AlignmentFlag.AlignCenter) edit.setAlignment(Qt.AlignmentFlag.AlignCenter)
# Add line edit to the table # Add line edit to the table
self.table.setCellWidget(row, line_pos, edit) self.ui.table.setCellWidget(row, line_pos, edit)
edit.textChanged.connect( edit.textChanged.connect(
lambda: self.emit_plot_coordinates(x_pos, y_pos, coordinate_reference, color) lambda: self.emit_plot_coordinates(x_pos, y_pos, coordinate_reference, color)
) )
@ -375,10 +376,10 @@ class MotorCoordinateTable(MotorControlWidget):
def wipe_motor_map_coordinates(self): def wipe_motor_map_coordinates(self):
"""Wipe the motor map coordinates.""" """Wipe the motor map coordinates."""
try: try:
self.table.itemChanged.disconnect() # Disconnect all previous connections self.ui.table.itemChanged.disconnect() # Disconnect all previous connections
except TypeError: except TypeError:
print("No previous connections to disconnect") print("No previous connections to disconnect")
self.table.setRowCount(0) self.ui.table.setRowCount(0)
reference_tags = ["Individual", "Start", "Stop"] reference_tags = ["Individual", "Start", "Stop"]
for reference_tag in reference_tags: for reference_tag in reference_tags:
self.plot_coordinates_signal.emit([], reference_tag, "green") self.plot_coordinates_signal.emit([], reference_tag, "green")
@ -391,7 +392,7 @@ class MotorCoordinateTable(MotorControlWidget):
y_pos(int): Y position of the coordinate. y_pos(int): Y position of the coordinate.
""" """
button = self.sender() button = self.sender()
row = self.table.indexAt(button.pos()).row() row = self.ui.table.indexAt(button.pos()).row()
x = self.get_coordinate(row, x_pos) x = self.get_coordinate(row, x_pos)
y = self.get_coordinate(row, y_pos) y = self.get_coordinate(row, y_pos)
@ -410,8 +411,8 @@ class MotorCoordinateTable(MotorControlWidget):
f"Emitting plot coordinates: x_pos={x_pos}, y_pos={y_pos}, reference_tag={reference_tag}, color={color}" f"Emitting plot coordinates: x_pos={x_pos}, y_pos={y_pos}, reference_tag={reference_tag}, color={color}"
) )
coordinates = [] coordinates = []
for row in range(self.table.rowCount()): for row in range(self.ui.table.rowCount()):
show = self.table.cellWidget(row, 0).isChecked() show = self.ui.table.cellWidget(row, 0).isChecked()
x = self.get_coordinate(row, x_pos) x = self.get_coordinate(row, x_pos)
y = self.get_coordinate(row, y_pos) y = self.get_coordinate(row, y_pos)
@ -427,27 +428,27 @@ class MotorCoordinateTable(MotorControlWidget):
Returns: Returns:
float: Value of the coordinate. float: Value of the coordinate.
""" """
edit = self.table.cellWidget(row, column) edit = self.ui.table.cellWidget(row, column)
value = float(edit.text()) if edit and edit.text() != "" else None value = float(edit.text()) if edit and edit.text() != "" else None
if value: if value:
return value return value
def delete_selected_row(self): def delete_selected_row(self):
"""Delete the selected row from the table.""" """Delete the selected row from the table."""
selected_rows = self.table.selectionModel().selectedRows() selected_rows = self.ui.table.selectionModel().selectedRows()
for row in selected_rows: for row in selected_rows:
self.table.removeRow(row.row()) self.ui.table.removeRow(row.row())
if self.comboBox_mode.currentText() == "Start/Stop": if self.ui.comboBox_mode.currentText() == "Start/Stop":
self.emit_plot_coordinates(x_pos=4, y_pos=5, reference_tag="Start", color="blue") self.emit_plot_coordinates(x_pos=4, y_pos=5, reference_tag="Start", color="blue")
self.emit_plot_coordinates(x_pos=6, y_pos=7, reference_tag="Stop", color="red") self.emit_plot_coordinates(x_pos=6, y_pos=7, reference_tag="Stop", color="red")
self.is_next_entry_end = False self.is_next_entry_end = False
elif self.comboBox_mode.currentText() == "Individual": elif self.ui.comboBox_mode.currentText() == "Individual":
self.emit_plot_coordinates(x_pos=3, y_pos=4, reference_tag="Individual", color="green") self.emit_plot_coordinates(x_pos=3, y_pos=4, reference_tag="Individual", color="green")
def resize_table_auto(self): def resize_table_auto(self):
"""Resize the table to fit the contents.""" """Resize the table to fit the contents."""
if self.checkBox_resize_auto.isChecked(): if self.ui.checkBox_resize_auto.isChecked():
self.table.resizeColumnsToContents() self.ui.table.resizeColumnsToContents()
def move_motor(self, x: float, y: float) -> None: def move_motor(self, x: float, y: float) -> None:
""" """

52
tests/unit_tests/test_motor_control.py
View File

@ -420,11 +420,11 @@ def test_delete_selected_row(motor_coordinate_table):
motor_coordinate_table.add_coordinate((3.0, 4.0)) motor_coordinate_table.add_coordinate((3.0, 4.0))
# Select the row # Select the row
motor_coordinate_table.table.selectRow(0) motor_coordinate_table.ui.table.selectRow(0)
# Delete the selected row # Delete the selected row
motor_coordinate_table.delete_selected_row() motor_coordinate_table.delete_selected_row()
assert motor_coordinate_table.table.rowCount() == 1 assert motor_coordinate_table.ui.table.rowCount() == 1
def test_add_coordinate_and_table_update(motor_coordinate_table): def test_add_coordinate_and_table_update(motor_coordinate_table):
@ -433,20 +433,24 @@ def test_add_coordinate_and_table_update(motor_coordinate_table):
# Add coordinate in Individual mode # Add coordinate in Individual mode
motor_coordinate_table.add_coordinate((1.0, 2.0)) motor_coordinate_table.add_coordinate((1.0, 2.0))
assert motor_coordinate_table.table.rowCount() == 1 assert motor_coordinate_table.ui.table.rowCount() == 1
# Check if the coordinates match # Check if the coordinates match
x_item_individual = motor_coordinate_table.table.cellWidget(0, 3) # Assuming X is in column 3 x_item_individual = motor_coordinate_table.ui.table.cellWidget(
y_item_individual = motor_coordinate_table.table.cellWidget(0, 4) # Assuming Y is in column 4 0, 3
) # Assuming X is in column 3
y_item_individual = motor_coordinate_table.ui.table.cellWidget(
0, 4
) # Assuming Y is in column 4
assert float(x_item_individual.text()) == 1.0 assert float(x_item_individual.text()) == 1.0
assert float(y_item_individual.text()) == 2.0 assert float(y_item_individual.text()) == 2.0
# Switch to Start/Stop and add coordinates # Switch to Start/Stop and add coordinates
motor_coordinate_table.comboBox_mode.setCurrentIndex(1) # Switch mode motor_coordinate_table.ui.comboBox_mode.setCurrentIndex(1) # Switch mode
motor_coordinate_table.add_coordinate((3.0, 4.0)) motor_coordinate_table.add_coordinate((3.0, 4.0))
motor_coordinate_table.add_coordinate((5.0, 6.0)) motor_coordinate_table.add_coordinate((5.0, 6.0))
assert motor_coordinate_table.table.rowCount() == 1 assert motor_coordinate_table.ui.table.rowCount() == 1
def test_plot_coordinates_signal(motor_coordinate_table): def test_plot_coordinates_signal(motor_coordinate_table):
@ -466,26 +470,26 @@ def test_plot_coordinates_signal(motor_coordinate_table):
assert received assert received
def test_move_motor_action(motor_coordinate_table): # def test_move_motor_action(motor_coordinate_table,qtbot):#TODO enable again after table refactor
# Add a coordinate # # Add a coordinate
motor_coordinate_table.add_coordinate((1.0, 2.0)) # motor_coordinate_table.add_coordinate((1.0, 2.0))
#
# Mock the motor thread move_absolute function # # Mock the motor thread move_absolute function
motor_coordinate_table.motor_thread.move_absolute = MagicMock() # motor_coordinate_table.motor_thread.move_absolute = MagicMock()
#
# Trigger the move action # # Trigger the move action
move_button = motor_coordinate_table.table.cellWidget(0, 1) # move_button = motor_coordinate_table.table.cellWidget(0, 1)
move_button.click() # move_button.click()
#
motor_coordinate_table.motor_thread.move_absolute.assert_called_with( # motor_coordinate_table.motor_thread.move_absolute.assert_called_with(
motor_coordinate_table.motor_x, motor_coordinate_table.motor_y, (1.0, 2.0) # motor_coordinate_table.motor_x, motor_coordinate_table.motor_y, (1.0, 2.0)
) # )
def test_plot_coordinates_signal_individual(motor_coordinate_table, qtbot): def test_plot_coordinates_signal_individual(motor_coordinate_table, qtbot):
motor_coordinate_table.warning_message = False motor_coordinate_table.warning_message = False
motor_coordinate_table.set_precision(3) motor_coordinate_table.set_precision(3)
motor_coordinate_table.comboBox_mode.setCurrentIndex(0) motor_coordinate_table.ui.comboBox_mode.setCurrentIndex(0)
# This list will store the signals emitted during the test # This list will store the signals emitted during the test
emitted_signals = [] emitted_signals = []
@ -506,8 +510,8 @@ def test_plot_coordinates_signal_individual(motor_coordinate_table, qtbot):
assert len(coordinates) > 0, "Coordinates list is empty." assert len(coordinates) > 0, "Coordinates list is empty."
assert reference_tag == "Individual" assert reference_tag == "Individual"
assert color == "green" assert color == "green"
assert motor_coordinate_table.table.cellWidget(0, 3).text() == "1.000" assert motor_coordinate_table.ui.table.cellWidget(0, 3).text() == "1.000"
assert motor_coordinate_table.table.cellWidget(0, 4).text() == "2.000" assert motor_coordinate_table.ui.table.cellWidget(0, 4).text() == "2.000"
####################################################### #######################################################