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

feat: scan_control.py added option to limit scan selection from list of strings as init parameter

Browse Source
This commit is contained in:
wyzula-jan
2023-11-06 13:31:14 +01:00
parent 27f6a89a29
commit 0fe06ade5b
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
bec_widgets/widgets/scan_control/scan_control.py
View File

@ -34,7 +34,7 @@ class ScanControl(QWidget):
ScanArgType.BOOL: QCheckBox, ScanArgType.BOOL: QCheckBox,
} }
def __init__(self, parent=None, client=None): def __init__(self, parent=None, client=None, allowed_scans=None):
super().__init__(parent) super().__init__(parent)
# Client from BEC + shortcuts to device manager and scans # Client from BEC + shortcuts to device manager and scans
@ -42,12 +42,12 @@ class ScanControl(QWidget):
self.dev = self.client.device_manager.devices self.dev = self.client.device_manager.devices
self.scans = self.client.scans self.scans = self.client.scans
# Scan list - allowed scans for the GUI
self.allowed_scans = allowed_scans
# Create and set main layout # Create and set main layout
self._init_UI() self._init_UI()
# Populate scans to ComboBox for scan selection
self.populate_scans()
def _init_UI(self): def _init_UI(self):
self.verticalLayout = QVBoxLayout(self) self.verticalLayout = QVBoxLayout(self)
@ -96,7 +96,6 @@ class ScanControl(QWidget):
Adds a horizontal separator to the given layout Adds a horizontal separator to the given layout
Args: Args:
layout: Layout to add the separator to layout: Layout to add the separator to
""" """
separator = QFrame(self.scan_control_group) separator = QFrame(self.scan_control_group)
separator.setFrameShape(QFrame.HLine) separator.setFrameShape(QFrame.HLine)
@ -106,7 +105,12 @@ class ScanControl(QWidget):
def populate_scans(self): def populate_scans(self):
msg = self.client.producer.get(MessageEndpoints.available_scans()) msg = self.client.producer.get(MessageEndpoints.available_scans())
self.available_scans = msgpack.loads(msg) self.available_scans = msgpack.loads(msg)
self.comboBox_scan_selection.addItems(self.available_scans.keys()) if self.allowed_scans is None:
allowed_scans = self.available_scans.keys()
else:
allowed_scans = self.allowed_scans
# TODO check parent class is ScanBase -> filter out the scans not relevant for GUI
self.comboBox_scan_selection.addItems(allowed_scans)
def on_scan_selected(self): def on_scan_selected(self):
selected_scan_name = self.comboBox_scan_selection.currentText() selected_scan_name = self.comboBox_scan_selection.currentText()
@ -183,7 +187,9 @@ class ScanControl(QWidget):
widget_class = self.WIDGET_HANDLER.get(item_type, None) widget_class = self.WIDGET_HANDLER.get(item_type, None)
if widget_class is None: if widget_class is None:
print(f"Unsupported annotation '{item_type}' for parameter '{item_name}'") print(
f"Unsupported annotation '{item_type}' for parameter '{item_name}'"
) # TODO add type hinting!!!
continue continue
# Generated widget by HANDLER # Generated widget by HANDLER
@ -238,7 +244,7 @@ if __name__ == "__main__":
client.start() client.start()
app = QApplication([]) app = QApplication([])
scan_control = ScanControl(client=client) scan_control = ScanControl(client=client, allowed_scans=["line_scan", "grid_scan"])
window = scan_control window = scan_control
window.show() window.show()