diff --git a/debye_bec/bec_ipython_client/plugins/digital_twin_core/__init__.py b/debye_bec/bec_ipython_client/plugins/digital_twin_core/__init__.py index b5d8096..e69de29 100644 --- a/debye_bec/bec_ipython_client/plugins/digital_twin_core/__init__.py +++ b/debye_bec/bec_ipython_client/plugins/digital_twin_core/__init__.py @@ -1,3 +0,0 @@ -from .digital_twin_core import get_parameters - -parameters = get_parameters() diff --git a/debye_bec/bec_ipython_client/plugins/digital_twin_core/digital_twin_core.py b/debye_bec/bec_ipython_client/plugins/digital_twin_core/digital_twin_core.py index 9390cb5..7bb9280 100644 --- a/debye_bec/bec_ipython_client/plugins/digital_twin_core/digital_twin_core.py +++ b/debye_bec/bec_ipython_client/plugins/digital_twin_core/digital_twin_core.py @@ -11,7 +11,6 @@ from scipy.interpolate import UnivariateSpline from xrt.backends.raycing.physconsts import AVOGADRO, CHeVcm from ..beamline import get_beamline_id -from . import parameters as bl from .motion_worker import MotionOutcome, MotionWorker from .types import BeamlineId, ConfigDict, DataDict, SurfaceDict @@ -37,6 +36,9 @@ def get_parameters(): return parameters +bl = get_parameters() + + class _ExclusiveGroupManager: def __init__(self): self._cond = threading.Condition() diff --git a/debye_bec/bec_widgets/widgets/digital_twin/widgets/move_widget.py b/debye_bec/bec_widgets/widgets/digital_twin/widgets/move_widget.py index a7f6354..9279a18 100644 --- a/debye_bec/bec_widgets/widgets/digital_twin/widgets/move_widget.py +++ b/debye_bec/bec_widgets/widgets/digital_twin/widgets/move_widget.py @@ -169,6 +169,7 @@ class MoveWidget(QWidget): # Checkbox self.checkbox = QCheckBox() + self.checkbox.setFixedWidth(30) self.checkbox.setChecked(True) layout.addWidget(self.checkbox) diff --git a/debye_bec/bec_widgets/widgets/digital_twin/widgets/qt_widgets.py b/debye_bec/bec_widgets/widgets/digital_twin/widgets/qt_widgets.py index 95c8d46..6067b90 100644 --- a/debye_bec/bec_widgets/widgets/digital_twin/widgets/qt_widgets.py +++ b/debye_bec/bec_widgets/widgets/digital_twin/widgets/qt_widgets.py @@ -167,6 +167,7 @@ class ComboBox(QWidget): func, identifier=self.identifier, value_obj=self.value, + index=lambda: self.value.currentIndex(), value=lambda: self.value.currentText(), ) ) @@ -191,9 +192,9 @@ class Button(QWidget): self.label.setFixedWidth(LABEL_WIDTH) layout.addWidget(self.label) self.button = QPushButton(label_button) - self.setEnabled(enabled) layout.addWidget(self.button) self.color = color + self.setEnabled(enabled) def clicked_connect(self, func): """Connect a function to the button press."""