mx/AareDAQ
0
1
Fork 0
Code Issues 52 Pull Requests 2 Actions Packages Projects Releases 64 Wiki Activity

feat: disable Reload DB params and related usage
CI / lint (push) Skipped
CI / test (3.11) (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
CI / lint (pull_request) Successful in 42s
Details
CI / test (3.11) (pull_request) Successful in 1m3s
Details
CI / test (3.13) (pull_request) Successful in 1m3s
Details
CI / test (3.12) (pull_request) Successful in 1m4s
Details
CI / test-with-beamline-plugins (pxi_bec) (pull_request) Successful in 1m14s
Details
CI / test-with-beamline-plugins (pxii_bec) (pull_request) Successful in 1m18s
Details
CI / test-with-beamline-plugins (pxiii_bec) (pull_request) Successful in 1m30s
Details
CI / test-with-coverage (pull_request) Successful in 1m36s
Details
CI / coverage-analysis (pull_request) Successful in 3s
Details

Browse Source
This commit is contained in:
duan_j
2026-08-25 13:06:59 +02:00
committed by duan_j
parent 838ae1828b
commit 96d7e82f48
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/aare/gui/panels/rotation_data_collection.py
+3 -3
View File
@@ -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};")
src/aare/gui/panels/scan_settings_panel.py
+6 -7
View File
@@ -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.