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)

src/aare/gui/panels/scan_settings_panel.py

@@ -7,7 +7,6 @@ from PySide6.QtWidgets import (
     QGridLayout,
     QHBoxLayout,
     QLabel,
-    QPushButton,
     QRadioButton,
     QVBoxLayout,
     QWidget,
@@ -108,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 -----------------------------------------------------
@@ -193,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:
@@ -207,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.

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":