From 6ece59a9246d21ffc1611208f52e92501c89faf9 Mon Sep 17 00:00:00 2001 From: appel_c Date: Thu, 10 Jul 2025 09:57:21 +0200 Subject: [PATCH] wip fix tests fixup --- .../components/scan_history_device_viewer.py | 4 ++-- .../components/scan_history_metadata_viewer.py | 4 ++-- .../components/scan_history_view.py | 10 +++++----- .../scan_history_browser/scan_history_browser.py | 6 ++++-- tests/unit_tests/test_scan_history_browser.py | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/bec_widgets/widgets/services/scan_history_browser/components/scan_history_device_viewer.py b/bec_widgets/widgets/services/scan_history_browser/components/scan_history_device_viewer.py index 87c26d47..0485942b 100644 --- a/bec_widgets/widgets/services/scan_history_browser/components/scan_history_device_viewer.py +++ b/bec_widgets/widgets/services/scan_history_browser/components/scan_history_device_viewer.py @@ -147,7 +147,7 @@ class ScanHistoryDeviceViewer(BECWidget, QtWidgets.QWidget): main_layout.addWidget(widget) main_layout.addWidget(self.request_plotting_button) - @SafeSlot() + @SafeSlot(object) def update_devices_from_scan_history(self, msg: ScanHistoryMessage) -> None: """Update the device combo box with the scan history message. @@ -192,7 +192,7 @@ class ScanHistoryDeviceViewer(BECWidget, QtWidgets.QWidget): self.signal_combo.setCurrentIndex(index) @SafeSlot() - def clear_view(self, msg: ScanHistoryMessage | None = None) -> None: + def clear_view(self) -> None: """Clear the device combo box.""" self.scan_history_msg = None self.signal_model.signals = {} diff --git a/bec_widgets/widgets/services/scan_history_browser/components/scan_history_metadata_viewer.py b/bec_widgets/widgets/services/scan_history_browser/components/scan_history_metadata_viewer.py index c320d096..1486603f 100644 --- a/bec_widgets/widgets/services/scan_history_browser/components/scan_history_metadata_viewer.py +++ b/bec_widgets/widgets/services/scan_history_browser/components/scan_history_metadata_viewer.py @@ -113,7 +113,7 @@ class ScanHistoryMetadataViewer(BECWidget, QtWidgets.QGroupBox): ) layout.addWidget(copy_button, row, 2) - @SafeSlot() + @SafeSlot(object) def update_view(self, msg: ScanHistoryMessage): """ Update the view with the given ScanHistoryMessage. @@ -155,7 +155,7 @@ class ScanHistoryMetadataViewer(BECWidget, QtWidgets.QGroupBox): layout.itemAtPosition(row, 2).widget().setToolTip("") @SafeSlot() - def clear_view(self, msg: ScanHistoryMessage | None = None): + def clear_view(self): """ Clear the view by resetting the labels and values. """ diff --git a/bec_widgets/widgets/services/scan_history_browser/components/scan_history_view.py b/bec_widgets/widgets/services/scan_history_browser/components/scan_history_view.py index f371e28e..ac6d1537 100644 --- a/bec_widgets/widgets/services/scan_history_browser/components/scan_history_view.py +++ b/bec_widgets/widgets/services/scan_history_browser/components/scan_history_view.py @@ -19,7 +19,7 @@ class ScanHistoryView(BECWidget, QtWidgets.QTreeWidget): PLUGIN = False scan_selected = QtCore.Signal(object) - scan_removed = QtCore.Signal(object) + no_scan_selected = QtCore.Signal() def __init__( self, @@ -105,7 +105,7 @@ class ScanHistoryView(BECWidget, QtWidgets.QTreeWidget): slot=self.update_history, topics=MessageEndpoints.scan_history(), from_start=True ) - @SafeSlot() + @SafeSlot(dict, dict) def update_history(self, msg_content: dict, metdata: dict): """Update the scan history with new scan data.""" # TODO directly receive ScanHistoryMessage through dispatcher @@ -162,7 +162,7 @@ class ScanHistoryView(BECWidget, QtWidgets.QTreeWidget): index = len(self.scan_history) + index try: msg = self.scan_history.pop(index) - self.scan_removed.emit(msg) + self.no_scan_selected.emit() except IndexError: logger.warning(f"Invalid index {index} for removing scan entry from history.") return @@ -199,8 +199,8 @@ if __name__ == "__main__": # pragma: no cover layout.addWidget(device_viewer) browser.scan_selected.connect(view.update_view) browser.scan_selected.connect(device_viewer.update_devices_from_scan_history) - browser.scan_removed.connect(view.clear_view) - browser.scan_removed.connect(device_viewer.clear_view) + browser.no_scan_selected.connect(view.clear_view) + browser.no_scan_selected.connect(device_viewer.clear_view) main_window.show() app.exec_() diff --git a/bec_widgets/widgets/services/scan_history_browser/scan_history_browser.py b/bec_widgets/widgets/services/scan_history_browser/scan_history_browser.py index 6abd38df..c60a9258 100644 --- a/bec_widgets/widgets/services/scan_history_browser/scan_history_browser.py +++ b/bec_widgets/widgets/services/scan_history_browser/scan_history_browser.py @@ -85,8 +85,10 @@ class ScanHistoryBrowser(BECWidget, QtWidgets.QWidget): self.scan_history_view.scan_selected.connect( self.scan_history_device_viewer.update_devices_from_scan_history ) - self.scan_history_view.scan_removed.connect(self.scan_history_metadata_viewer.clear_view) - self.scan_history_view.scan_removed.connect(self.scan_history_device_viewer.clear_view) + self.scan_history_view.no_scan_selected.connect( + self.scan_history_metadata_viewer.clear_view + ) + self.scan_history_view.no_scan_selected.connect(self.scan_history_device_viewer.clear_view) if __name__ == "__main__": # pragma: no cover diff --git a/tests/unit_tests/test_scan_history_browser.py b/tests/unit_tests/test_scan_history_browser.py index 930ece5b..b6f11546 100644 --- a/tests/unit_tests/test_scan_history_browser.py +++ b/tests/unit_tests/test_scan_history_browser.py @@ -229,7 +229,7 @@ def test_scan_history_view_add_remove_scan(qtbot, scan_history_view, scan_histor # remove scan def remove_callback(msg): - """Callback to check if the scan_removed signal is emitted.""" + """Callback to check if the no_scan_selected signal is emitted.""" assert msg == scan_history_msg scan_history_view.remove_scan(0)