From 838ae1828b6321bb59727013ddb58523052539c9 Mon Sep 17 00:00:00 2001 From: Dawn Date: Tue, 25 Aug 2026 10:49:44 +0200 Subject: [PATCH 1/4] style: reorder the position of measured tab --- src/aare/gui/panels/tell_sample_panel.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/aare/gui/panels/tell_sample_panel.py b/src/aare/gui/panels/tell_sample_panel.py index 9e640b7b..1fcfcbba 100644 --- a/src/aare/gui/panels/tell_sample_panel.py +++ b/src/aare/gui/panels/tell_sample_panel.py @@ -156,11 +156,12 @@ class TellSamplePanel(QFrame): self.status_chips.setExclusive(True) for label, key in ( ("All", None), - # Unmeasured next to All: both are "what is left" views, the - # remaining chips are hand-applied labels. - ("Unmeasured", "unmeasured"), ("Queued", "queued"), ("Flagged", "flagged"), + # Unmeasured next to All: both are "what is left" views, the + # remaining chips are hand-applied labels. + # order updated according to Vincent's preference + ("Unmeasured", "unmeasured"), ("Measured", "measured"), ): if key == "queued": -- 2.54.0 From 96d7e82f48cab8669f5bcff68a8844a7758aa13d Mon Sep 17 00:00:00 2001 From: Dawn Date: Tue, 25 Aug 2026 10:51:07 +0200 Subject: [PATCH 2/4] feat: disable Reload DB params and related usage --- src/aare/gui/panels/rotation_data_collection.py | 6 +++--- src/aare/gui/panels/scan_settings_panel.py | 13 ++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/aare/gui/panels/rotation_data_collection.py b/src/aare/gui/panels/rotation_data_collection.py index 15d5af6e..961d1dea 100644 --- a/src/aare/gui/panels/rotation_data_collection.py +++ b/src/aare/gui/panels/rotation_data_collection.py @@ -160,9 +160,9 @@ class RotationDataCollectionPanel(ScanSettingsPanel): self._layout.addWidget(self.dose, 14, 1, 1, 3) self._layout.addWidget(QLabel("MGy", parent=self), 14, 4) - self._layout.removeWidget(self.reload_params_button) - self._layout.addWidget(self.reload_params_button, 15, 0, 1, 6) - self.reload_params_button.setVisible(True) + # self._layout.removeWidget(self.reload_params_button) + # self._layout.addWidget(self.reload_params_button, 15, 0, 1, 6) + # self.reload_params_button.setVisible(True) self.measurement_button = QPushButton("Run rotation") self.measurement_button.setStyleSheet(f"color: {GO_TEXT};") diff --git a/src/aare/gui/panels/scan_settings_panel.py b/src/aare/gui/panels/scan_settings_panel.py index 3b570acd..5463e2b5 100644 --- a/src/aare/gui/panels/scan_settings_panel.py +++ b/src/aare/gui/panels/scan_settings_panel.py @@ -7,7 +7,6 @@ from PySide6.QtWidgets import ( QGridLayout, QHBoxLayout, QLabel, - QPushButton, QRadioButton, QVBoxLayout, QWidget, @@ -108,10 +107,10 @@ class ScanSettingsPanel(QWidget): self._register_override_field(self.transmission_enter) - self.reload_params_button = QPushButton("Reload DB params") - self.reload_params_button.setToolTip("Reload data collection parameters from database") - self.reload_params_button.clicked.connect(self.reload_parameters) - self.reload_params_button.setVisible(False) # Child classes should make it visible + # self.reload_params_button = QPushButton("Reload DB params") + # self.reload_params_button.setToolTip("Reload data collection parameters from database") + # self.reload_params_button.clicked.connect(self.reload_parameters) + # self.reload_params_button.setVisible(False) # Child classes should make it visible self._reset_to_defaults() @@ -193,7 +192,7 @@ class ScanSettingsPanel(QWidget): self._params = s.sample.aaredb_params if hasattr(s.sample, "aaredb_params") else None # Enable reload button only if sample has parameters self._previous_sample_was_none = False - self.reload_params_button.setEnabled(self._params is not None) + # self.reload_params_button.setEnabled(self._params is not None) # Check if this is a new sample - if so, update parameters if self._last_sample_id != s.sample.db_id: @@ -207,7 +206,7 @@ class ScanSettingsPanel(QWidget): self._sample = None self._params = None self._last_sample_id = None - self.reload_params_button.setEnabled(False) + # self.reload_params_button.setEnabled(False) def _reset_to_defaults(self): # Forget user overrides and follow the database/defaults again. -- 2.54.0 From 0a30723f6a703c0ec2732700a80e4685c2fdda7d Mon Sep 17 00:00:00 2001 From: duan_j Date: Tue, 25 Aug 2026 13:48:01 +0200 Subject: [PATCH 3/4] style:delete the commented code --- src/aare/gui/panels/rotation_data_collection.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/aare/gui/panels/rotation_data_collection.py b/src/aare/gui/panels/rotation_data_collection.py index 961d1dea..94d7fa04 100644 --- a/src/aare/gui/panels/rotation_data_collection.py +++ b/src/aare/gui/panels/rotation_data_collection.py @@ -160,10 +160,6 @@ class RotationDataCollectionPanel(ScanSettingsPanel): self._layout.addWidget(self.dose, 14, 1, 1, 3) self._layout.addWidget(QLabel("MGy", parent=self), 14, 4) - # self._layout.removeWidget(self.reload_params_button) - # self._layout.addWidget(self.reload_params_button, 15, 0, 1, 6) - # self.reload_params_button.setVisible(True) - self.measurement_button = QPushButton("Run rotation") self.measurement_button.setStyleSheet(f"color: {GO_TEXT};") self.measurement_button.clicked.connect(self.run_measurement) -- 2.54.0 From 873143d84614e319ff191149530154cc225fa4cc Mon Sep 17 00:00:00 2001 From: duan_j Date: Tue, 25 Aug 2026 13:48:37 +0200 Subject: [PATCH 4/4] style:delete the commented code --- src/aare/gui/panels/scan_settings_panel.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/aare/gui/panels/scan_settings_panel.py b/src/aare/gui/panels/scan_settings_panel.py index 5463e2b5..2a2e2ac7 100644 --- a/src/aare/gui/panels/scan_settings_panel.py +++ b/src/aare/gui/panels/scan_settings_panel.py @@ -107,11 +107,6 @@ class ScanSettingsPanel(QWidget): self._register_override_field(self.transmission_enter) - # self.reload_params_button = QPushButton("Reload DB params") - # self.reload_params_button.setToolTip("Reload data collection parameters from database") - # self.reload_params_button.clicked.connect(self.reload_parameters) - # self.reload_params_button.setVisible(False) # Child classes should make it visible - self._reset_to_defaults() # -- source toggle ----------------------------------------------------- @@ -192,7 +187,6 @@ class ScanSettingsPanel(QWidget): self._params = s.sample.aaredb_params if hasattr(s.sample, "aaredb_params") else None # Enable reload button only if sample has parameters self._previous_sample_was_none = False - # self.reload_params_button.setEnabled(self._params is not None) # Check if this is a new sample - if so, update parameters if self._last_sample_id != s.sample.db_id: @@ -206,7 +200,6 @@ class ScanSettingsPanel(QWidget): self._sample = None self._params = None self._last_sample_id = None - # self.reload_params_button.setEnabled(False) def _reset_to_defaults(self): # Forget user overrides and follow the database/defaults again. -- 2.54.0