From 3e5f5fb7a4029b944061a1a0e14e3fd9eb54cbf5 Mon Sep 17 00:00:00 2001 From: Dawn Date: Tue, 1 Sep 2026 14:50:17 +0200 Subject: [PATCH] style: rearrange order and give more space to omega symbol --- .../gui/panels/rotation_data_collection.py | 39 ++++++++++--------- src/aare/gui/panels/smart_rotation_panel.py | 2 +- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/aare/gui/panels/rotation_data_collection.py b/src/aare/gui/panels/rotation_data_collection.py index 9abd35ec..31e23f2b 100644 --- a/src/aare/gui/panels/rotation_data_collection.py +++ b/src/aare/gui/panels/rotation_data_collection.py @@ -65,7 +65,7 @@ class RotationDataCollectionPanel(ScanSettingsPanel): self._layout.addWidget(QLabel("°", parent=self), 3, 3) self.omega_button = QPushButton("Ω") - self.omega_button.setFixedWidth(20) + self.omega_button.setFixedWidth(30) self.omega_button.clicked.connect(self.update_omega_start) self._layout.addWidget(self.omega_button, 3, 4) @@ -73,23 +73,6 @@ class RotationDataCollectionPanel(ScanSettingsPanel): QLabel("
Screening
", parent=self), 4, 0, 1, 6 ) - self._layout.addWidget(QLabel("Image angle", parent=self), 5, 0) - self.screening_image_angle = NumberLineEdit( - 0, 90.0, 0.5, decimals=3, parent=self, track_pending=True - ) - self._layout.addWidget(self.screening_image_angle, 5, 1, 1, 3) - self._layout.addWidget(QLabel("°", parent=self), 5, 4) - - self._layout.addWidget(QLabel("Image time", parent=self), 6, 0) - default_screening_exp_time = cfg_get( - "daq.data_collection_settings.default_screening_settings.exp_time_s", 0.1 - ) - self.screening_image_time_enter = NumberLineEdit( - 0.0005, 10.0, default_screening_exp_time, decimals=4, parent=self, track_pending=True - ) - self._layout.addWidget(self.screening_image_time_enter, 6, 1, 1, 3) - self._layout.addWidget(QLabel("s", parent=self), 6, 4) - self.screening_type = QComboBox(parent=self) self.screening_type.addItem("1 image", {"steps": 1, "omega_step_deg": 0}) self.screening_type.addItem("2 images every 90°", {"steps": 2, "omega_step_deg": 90}) @@ -100,7 +83,24 @@ class RotationDataCollectionPanel(ScanSettingsPanel): self.screening_type.addItem("4 images every 45°", {"steps": 4, "omega_step_deg": 45}) self.screening_type.addItem("5 images every 45°", {"steps": 5, "omega_step_deg": 45}) - self._layout.addWidget(self.screening_type, 7, 0, 1, 6) + self._layout.addWidget(self.screening_type, 5, 0, 1, 6) + + self._layout.addWidget(QLabel("Image angle", parent=self), 6, 0) + self.screening_image_angle = NumberLineEdit( + 0, 90.0, 0.5, decimals=3, parent=self, track_pending=True + ) + self._layout.addWidget(self.screening_image_angle, 6, 1, 1, 3) + self._layout.addWidget(QLabel("°", parent=self), 6, 4) + + self._layout.addWidget(QLabel("Image time", parent=self), 7, 0) + default_screening_exp_time = cfg_get( + "daq.data_collection_settings.default_screening_settings.exp_time_s", 0.1 + ) + self.screening_image_time_enter = NumberLineEdit( + 0.0005, 10.0, default_screening_exp_time, decimals=4, parent=self, track_pending=True + ) + self._layout.addWidget(self.screening_image_time_enter, 7, 1, 1, 3) + self._layout.addWidget(QLabel("s", parent=self), 7, 4) self._layout.addWidget(QLabel("Screening transmission", parent=self), 8, 0) self.screening_transmission_enter = DbOverrideLineEdit( @@ -108,6 +108,7 @@ class RotationDataCollectionPanel(ScanSettingsPanel): ) self._layout.addWidget(self.screening_transmission_enter, 8, 1, 1, 3) self.screening_transmission_enter.valueChanged.connect(self.set_screening_transmission) + self.screening_button = QPushButton("Run screening") self.screening_button.setStyleSheet(f"color: {GO_TEXT};") self.screening_button.clicked.connect(self.run_screening) diff --git a/src/aare/gui/panels/smart_rotation_panel.py b/src/aare/gui/panels/smart_rotation_panel.py index 6d6ccd9c..ff3cfae9 100644 --- a/src/aare/gui/panels/smart_rotation_panel.py +++ b/src/aare/gui/panels/smart_rotation_panel.py @@ -66,7 +66,7 @@ class SimpleRotationSettingsPanel(QWidget): self._layout.addWidget(QLabel("°", parent=self), 1, 4) self.omega_button = QPushButton("Ω") - self.omega_button.setFixedWidth(20) + self.omega_button.setFixedWidth(30) self.omega_button.clicked.connect(self.update_omega_start) self._layout.addWidget(self.omega_button, 1, 5)