bec-widgets 1.24.5__py3-none-any.whl → 1.25.1__py3-none-any.whl

.gitlab-ci.yml

@@ -197,7 +197,13 @@ end-2-end-conda:
   script:
     - *clone-repos
     - *install-os-packages
-    - conda config --prepend channels conda-forge
+    - conda config --show-sources
+    - conda config --add channels conda-forge
+    - conda config --system --remove channels https://repo.anaconda.com/pkgs/main
+    - conda config --system --remove channels https://repo.anaconda.com/pkgs/r
+    - conda config --remove channels https://repo.anaconda.com/pkgs/main
+    - conda config --remove channels https://repo.anaconda.com/pkgs/r
+    - conda config --show-sources
     - conda config --set channel_priority strict
     - conda config --set always_yes yes --set changeps1 no
     - conda create -q -n test-environment python=3.11
@@ -227,6 +233,7 @@ end-2-end-conda:
     - if: '$CI_PIPELINE_SOURCE == "parent_pipeline"'
     - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"'
     - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "production"'
+    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^pre_release.*$/'
 
 semver:
   stage: Deploy

CHANGELOG.md

@@ -1,6 +1,33 @@
 # CHANGELOG
 
 
+## v1.25.1 (2025-03-24)
+
+### Bug Fixes
+
+- **positioner_box**: Fixed motor moving flags for spinner
+  ([`be274a1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/be274a10fc76528e1e5d6b309678c7fb4e9b890e))
+
+- **positioner_box**: If possible tweak should use the current setpoint instead of the readback
+  ([`e5c9dd2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e5c9dd288c571d29722497a2d40b000d1cffb475))
+
+### Continuous Integration
+
+- Add e2e job for pre_release branches
+  ([`d86ef4e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d86ef4e763b321b1c82be71c9f275abb610fed06))
+
+- Fix conda channels for PSI policy change
+  ([`6cf39b3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6cf39b3796f850294705465adfaf6ad25a71461f))
+
+
+## v1.25.0 (2025-03-07)
+
+### Features
+
+- **waveform**: Add slice handling and reset functionality for async updates
+  ([`7cbebbb`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7cbebbb1f00ea2e2b3678c96b183a877e59c5240))
+
+
 ## v1.24.5 (2025-03-06)
 
 ### Bug Fixes

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bec_widgets
-Version: 1.24.5
+Version: 1.25.1
 Summary: BEC Widgets
 Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec_widgets/issues
 Project-URL: Homepage, https://gitlab.psi.ch/bec/bec_widgets

bec_widgets/widgets/containers/figure/plots/waveform/waveform.py

@@ -126,6 +126,8 @@ class BECWaveform(BECPlotBase):
             "label_suffix": "",
         }
 
+        self._slice_index = None
+
         # Scan segment update proxy
         self.proxy_update_plot = pg.SignalProxy(
             self.scan_signal_update, rateLimit=25, slot=self._update_scan_curves
@@ -1252,7 +1254,9 @@ class BECWaveform(BECPlotBase):
         x_data = None
         instruction = metadata.get("async_update", {}).get("type")
         max_shape = metadata.get("async_update", {}).get("max_shape", [])
-        for curve in self._curves_data["async"].values():
+        all_async_curves = self._curves_data["async"].values()
+        # for curve in self._curves_data["async"].values():
+        for curve in all_async_curves:
             y_entry = curve.config.signals.y.entry
             x_name = self._x_axis_mode["name"]
             for device, async_data in msg["signals"].items():
@@ -1276,6 +1280,18 @@ class BECWaveform(BECPlotBase):
                             curve.setData(x_data, new_data)
                         else:
                             curve.setData(new_data)
+                    elif instruction == "add_slice":
+                        current_slice_id = metadata.get("async_update", {}).get("index")
+                        data_plot = async_data["value"]
+                        if current_slice_id != self._slice_index:
+                            self._slice_index = current_slice_id
+                            new_data = data_plot
+                        else:
+                            x_data, y_data = curve.get_data()
+                            new_data = np.hstack((y_data, data_plot))
+
+                        curve.setData(new_data)
+
                     elif instruction == "replace":
                         if x_name == "timestamp":
                             x_data = async_data["timestamp"]
@@ -1524,6 +1540,10 @@ class BECWaveform(BECPlotBase):
         for curve_id in curve_ids_to_remove:
             self.remove_curve(curve_id)
 
+    def reset(self):
+        self._slice_index = None
+        super().reset()
+
     def clear_all(self):
         sources = list(self._curves_data.keys())
         for source in sources:

bec_widgets/widgets/control/device_control/positioner_box/_base/positioner_box_base.py

@@ -1,6 +1,5 @@
 import uuid
 from abc import abstractmethod
-from ast import Tuple
 from typing import Callable, TypedDict
 
 from bec_lib.device import Positioner
@@ -140,10 +139,12 @@ class PositionerBoxBase(BECWidget, CompactPopupWidget):
             if setpoint_val is not None:
                 break
 
-        for moving_signal in ["motor_done_move", "motor_is_moving"]:
-            is_moving = signals.get(f"{device}_{moving_signal}", {}).get("value")
-            if is_moving is not None:
-                break
+        if f"{device}_motor_done_move" in signals:
+            is_moving = not signals[f"{device}_motor_done_move"].get("value")
+        elif f"{device}_motor_is_moving" in signals:
+            is_moving = signals[f"{device}_motor_is_moving"].get("value")
+        else:
+            is_moving = None
 
         if is_moving is not None:
             spinner.setVisible(True)

bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box.py

@@ -1,4 +1,4 @@
-""" Module for a PositionerBox widget to control a positioner device."""
+"""Module for a PositionerBox widget to control a positioner device."""
 
 from __future__ import annotations
 
@@ -212,12 +212,34 @@ class PositionerBox(PositionerBoxBase):
     @SafeSlot()
     def on_tweak_right(self):
         """Tweak motor right"""
-        self.dev[self.device].move(self.step_size, relative=True)
+        setpoint = self._get_setpoint()
+        if setpoint is None:
+            self.dev[self.device].move(self.step_size, relative=True)
+            return
+        target = setpoint + self.step_size
+        self.dev[self.device].move(target, relative=False)
 
     @SafeSlot()
     def on_tweak_left(self):
         """Tweak motor left"""
-        self.dev[self.device].move(-self.step_size, relative=True)
+        setpoint = self._get_setpoint()
+        if setpoint is None:
+            self.dev[self.device].move(-self.step_size, relative=True)
+            return
+        target = setpoint - self.step_size
+        self.dev[self.device].move(target, relative=False)
+
+    def _get_setpoint(self) -> float | None:
+        """Get the setpoint of the motor"""
+        setpoint = getattr(self.dev[self.device], "setpoint", None)
+        if not setpoint:
+            setpoint = getattr(self.dev[self.device], "user_setpoint", None)
+        if not setpoint:
+            return None
+        try:
+            return float(setpoint.get())
+        except Exception:
+            return None
 
     @SafeSlot()
     def on_setpoint_change(self):

bec_widgets/widgets/utility/spinner/spinner.py

@@ -23,8 +23,8 @@ class SpinnerWidget(QWidget):
         self.timer = QTimer(self)
         self.timer.timeout.connect(self.rotate)
         self.time = 0
-        self.duration = 50
-        self.speed = 50
+        self.duration = 40
+        self.speed = 40
         self._started = False
 
     def start(self):

{bec_widgets-1.24.5.dist-info → bec_widgets-1.25.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bec_widgets
-Version: 1.24.5
+Version: 1.25.1
 Summary: BEC Widgets
 Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec_widgets/issues
 Project-URL: Homepage, https://gitlab.psi.ch/bec/bec_widgets

{bec_widgets-1.24.5.dist-info → bec_widgets-1.25.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
 .gitignore,sha256=cMQ1MLmnoR88aMCCJwUyfoTnufzl4-ckmHtlFUqHcT4,3253
-.gitlab-ci.yml,sha256=PuL-FmkTHm7qs467Mh9D8quWcEj4tgEA-UUGDieMuWk,8774
+.gitlab-ci.yml,sha256=s8RDN8XxVKa1Rq_MyeZgrYq7-qXKlvoOSfb9krqbl5s,9212
 .pylintrc,sha256=eeY8YwSI74oFfq6IYIbCqnx3Vk8ZncKaatv96n_Y8Rs,18544
 .readthedocs.yaml,sha256=aSOc277LqXcsTI6lgvm_JY80lMlr69GbPKgivua2cS0,603
-CHANGELOG.md,sha256=qu6q-QB1UAzXW1TvW34P8Fxg7z4qzgzPj64GcNOUutY,233498
+CHANGELOG.md,sha256=VWqpvRWolUlmlouilk1SoQ4dnKFxsvKnXsjD-cWIDZc,234451
 LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-PKG-INFO,sha256=4P4wQ_dTjPtB0j6ztaBcGPWVyYeDvbPo0EvMEXHvOok,1173
+PKG-INFO,sha256=VVTJOK3kRpwUGUHQfeeix3900I_av8A6fInPxLLBWjo,1173
 README.md,sha256=KgdKusjlvEvFtdNZCeDMO91y77MWK2iDcYMDziksOr4,2553
-pyproject.toml,sha256=jFjyDlhvbrT_dHbirfA8WZLT_zvL0DQNmMpFiJQ8vZs,2540
+pyproject.toml,sha256=QPMn5S9kX0_kmFnGPk0G6-h4Lj0o71bHhsmDi3sJ4rY,2540
 .git_hooks/pre-commit,sha256=n3RofIZHJl8zfJJIUomcMyYGFi_rwq4CC19z0snz3FI,286
 .gitlab/issue_templates/bug_report_template.md,sha256=gAuyEwl7XlnebBrkiJ9AqffSNOywmr8vygUFWKTuQeI,386
 .gitlab/issue_templates/documentation_update_template.md,sha256=FHLdb3TS_D9aL4CYZCjyXSulbaW5mrN2CmwTaeLPbNw,860
@@ -111,7 +111,7 @@ bec_widgets/widgets/containers/figure/plots/motor_map/motor_map.py,sha256=G59EmA
 bec_widgets/widgets/containers/figure/plots/multi_waveform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/containers/figure/plots/multi_waveform/multi_waveform.py,sha256=NBVC9mWmeleTfLsfBl1yyMx8L4EgHFcdM9kX20QOJ00,11766
 bec_widgets/widgets/containers/figure/plots/waveform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/containers/figure/plots/waveform/waveform.py,sha256=Xs3f0W8XE4-z2Zz5S6b7YTgikSloVo7G3c38ygk2ylo,57913
+bec_widgets/widgets/containers/figure/plots/waveform/waveform.py,sha256=ih1UQ_CT2ab7CFs0L36qyWrOyidoFCnXue48150f7Do,58720
 bec_widgets/widgets/containers/figure/plots/waveform/waveform_curve.py,sha256=YctH0W8ns03BzYNaG9CR18_2HaNVbzyr7ua5226He2Y,8735
 bec_widgets/widgets/containers/layout_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/containers/layout_manager/layout_manager.py,sha256=mPKLWp1ZJtr1K59jJWbpDaWUjGr47QG3-nNrEqo6a0E,33811
@@ -147,9 +147,9 @@ bec_widgets/widgets/control/device_control/position_indicator/position_indicator
 bec_widgets/widgets/control/device_control/position_indicator/register_position_indicator.py,sha256=ZbN5wPv4dhWEAgX9QD1HL7k7y1O5qZHAgj-xZjwFSho,539
 bec_widgets/widgets/control/device_control/positioner_box/__init__.py,sha256=0vO7JjxKsO6bbxUjdCGYKELFTY0n4Cv8u4Z1i-MhwL0,476
 bec_widgets/widgets/control/device_control/positioner_box/_base/__init__.py,sha256=IiOglwEwd908gs10ZRF6PHGdbRHw0B-ScAmebtQKhXc,84
-bec_widgets/widgets/control/device_control/positioner_box/_base/positioner_box_base.py,sha256=bxZNAN2hXAdTnQBpQiDrBMaRviMqPmO_UAoyTK94ESE,8775
+bec_widgets/widgets/control/device_control/positioner_box/_base/positioner_box_base.py,sha256=ZsAY5mJMHZpjLgaa_z9INJknbZEVmD8jQ30u-C7uLXQ,8841
 bec_widgets/widgets/control/device_control/positioner_box/positioner_box/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box.py,sha256=HDRNbS1w2Do4WHs3VmYI-jEbmkpEEeo85UBjVdT-oos,8035
+bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box.py,sha256=2nwosz-rsDRaf7gUDxNfydT5e5siiTBo7nVlDotIc5c,8835
 bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box.pyproject,sha256=7966pHdDseaHciaPNEKgdQgbUThSZf5wEDCeAEJh9po,32
 bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box.ui,sha256=7LZlM9smIqmkvS2KAIDkBamn04mBAkXeG9T1fpKRQe8,6093
 bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box_plugin.py,sha256=CKtz61p5uYUh_l30APyhsV3uwJuLFBiBeFZfaOdT0Do,1421
@@ -333,7 +333,7 @@ bec_widgets/widgets/utility/spinbox/decimal_spinbox.py,sha256=cfq6SSATI-Mu7ix6hH
 bec_widgets/widgets/utility/spinbox/register_bec_spin_box.py,sha256=_whARPM42TCYV_rUBtThGUK7XC1VoIwRn8fVHzxI2pc,476
 bec_widgets/widgets/utility/spinner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/utility/spinner/register_spinner_widget.py,sha256=96A13dEcyTgXfc9G0sTdlXYCDcVav8Z2P2eDC95bESQ,484
-bec_widgets/widgets/utility/spinner/spinner.py,sha256=6c0fN7mdGzELg4mf_yG08ubses3svb6w0EqMeHDFkIw,2651
+bec_widgets/widgets/utility/spinner/spinner.py,sha256=PvckwA3oWO_QYUI2SFG7gNhAHqvVqrm1rkXWR6UJ_Mk,2651
 bec_widgets/widgets/utility/spinner/spinner_widget.pyproject,sha256=zzLajGB3DTgVnrSqMey2jRpBlxTq9cBXZL9tWJCKe-I,25
 bec_widgets/widgets/utility/spinner/spinner_widget_plugin.py,sha256=kRQCOwxPQsFOrJIkSoqq7xdF_VtoRo_b2vOZEr5eXrA,1363
 bec_widgets/widgets/utility/toggle/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -362,8 +362,8 @@ bec_widgets/widgets/utility/visual/dark_mode_button/dark_mode_button.py,sha256=c
 bec_widgets/widgets/utility/visual/dark_mode_button/dark_mode_button.pyproject,sha256=Lbi9zb6HNlIq14k6hlzR-oz6PIFShBuF7QxE6d87d64,34
 bec_widgets/widgets/utility/visual/dark_mode_button/dark_mode_button_plugin.py,sha256=CzChz2SSETYsR8-36meqWnsXCT-FIy_J_xeU5coWDY8,1350
 bec_widgets/widgets/utility/visual/dark_mode_button/register_dark_mode_button.py,sha256=rMpZ1CaoucwobgPj1FuKTnt07W82bV1GaSYdoqcdMb8,521
-bec_widgets-1.24.5.dist-info/METADATA,sha256=4P4wQ_dTjPtB0j6ztaBcGPWVyYeDvbPo0EvMEXHvOok,1173
-bec_widgets-1.24.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-bec_widgets-1.24.5.dist-info/entry_points.txt,sha256=dItMzmwA1wizJ1Itx15qnfJ0ZzKVYFLVJ1voxT7K7D4,214
-bec_widgets-1.24.5.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-bec_widgets-1.24.5.dist-info/RECORD,,
+bec_widgets-1.25.1.dist-info/METADATA,sha256=VVTJOK3kRpwUGUHQfeeix3900I_av8A6fInPxLLBWjo,1173
+bec_widgets-1.25.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+bec_widgets-1.25.1.dist-info/entry_points.txt,sha256=dItMzmwA1wizJ1Itx15qnfJ0ZzKVYFLVJ1voxT7K7D4,214
+bec_widgets-1.25.1.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
+bec_widgets-1.25.1.dist-info/RECORD,,

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_widgets"
-version = "1.24.5"
+version = "1.25.1"
 description = "BEC Widgets"
 requires-python = ">=3.10"
 classifiers = [