bec-widgets 0.92.3__py3-none-any.whl → 0.92.4__py3-none-any.whl

CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## v0.92.4 (2024-07-31)
+
+### Fix
+
+* fix: fix missmatch of signal/slot in image and motormap ([`dcc5fd7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/dcc5fd71ee9f51767a7b2b1ed6200e89d1ef754c))
+
 ## v0.92.3 (2024-07-28)
 
 ### Fix
@@ -130,12 +136,6 @@ This reverts commit 3798714369adf4023f833b7749d2f46a0ec74eee ([`fd6ae91`](https:
 
 ## v0.88.0 (2024-07-19)
 
-### Feature
-
-* feat(waveform_widget): designer plugin added ([`1f8ef52`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1f8ef52b606283038052640849094f515a463403))
-
-* feat(waveform_widget): switch between drag and rectangle mode ([`2be009c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2be009c6477ba26c5cfb4d827534c5d5eb428999))
-
 ### Fix
 
 * fix(waveform_widget): plot API unified with BECFigure ([`2c8764a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2c8764a27de89b39b717032b58465e120ec57fbc))

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.92.3
+Version: 0.92.4
 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/figure/plots/image/image.py

@@ -500,13 +500,14 @@ class BECImageShow(BECPlotBase):
             self.update_image(device, data)
             self.update_vrange(device, self.processor.config.stats)
 
-    @Slot(dict)
-    def on_image_update(self, msg: dict):
+    @Slot(dict, dict)
+    def on_image_update(self, msg: dict, metadata: dict):
         """
         Update the image of the device monitor from bec.
 
         Args:
             msg(dict): The message from bec.
+            metadata(dict): The metadata of the message.
         """
         data = msg["data"]
         device = msg["device"]

bec_widgets/widgets/figure/plots/motor_map/motor_map.py

@@ -493,13 +493,14 @@ class BECMotorMap(BECPlotBase):
             f"Motor position: ({round(float(current_x),precision)}, {round(float(current_y),precision)})"
         )
 
-    @Slot(dict)
-    def on_device_readback(self, msg: dict) -> None:
+    @Slot(dict, dict)
+    def on_device_readback(self, msg: dict, metadata: dict) -> None:
         """
         Update the motor map plot with the new motor position.
 
         Args:
             msg(dict): Message from the device readback.
+            metadata(dict): Metadata of the message.
         """
         if self.motor_x is None or self.motor_y is None:
             return

{bec_widgets-0.92.3.dist-info → bec_widgets-0.92.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.92.3
+Version: 0.92.4
 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-0.92.3.dist-info → bec_widgets-0.92.4.dist-info}/RECORD

@@ -2,11 +2,11 @@
 .gitlab-ci.yml,sha256=BtKhZI3dhK09En1BfpglYi-ZJwG6ZdC-iJr7kXFVfCg,8346
 .pylintrc,sha256=eeY8YwSI74oFfq6IYIbCqnx3Vk8ZncKaatv96n_Y8Rs,18544
 .readthedocs.yaml,sha256=aSOc277LqXcsTI6lgvm_JY80lMlr69GbPKgivua2cS0,603
-CHANGELOG.md,sha256=vyZOt_7KVKCsdqj2BH_sHPtMO1TjlCiTxsPRANgTHeA,7011
+CHANGELOG.md,sha256=k_Qc9SJskOynb-AMHgD3xJG-keXM4MuKjXLy4wdVGyQ,6875
 LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-PKG-INFO,sha256=fwlAwMRQPcnbIvNhjZS_q-c-28z0jotZHuT4pjPbOXc,1308
+PKG-INFO,sha256=XV0Gw1L20hWv_OA290dq_2dyMJceFPXRML6EubLQgwA,1308
 README.md,sha256=Od69x-RS85Hph0-WwWACwal4yUd67XkEn4APEfHhHFw,2649
-pyproject.toml,sha256=5aqUm-W5eSaRGESqLkYAoMamCZDrRfEmwLEWm9ev4ls,2357
+pyproject.toml,sha256=0CZsuhJd44ZIok69huLV4wKss9CfqHMH4Xo0eeH8Uqg,2357
 .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
@@ -181,11 +181,11 @@ bec_widgets/widgets/figure/plots/axis_settings.py,sha256=QxRpQwgfBr1H0HTjfOpiXi_
 bec_widgets/widgets/figure/plots/axis_settings.ui,sha256=a2qIuK9lyi9HCyrSvPr6wxzmm1FymaWcpmyOhMIiFt8,11013
 bec_widgets/widgets/figure/plots/plot_base.py,sha256=AxzH2J-bLngxlWcgWWgNpLhIQxQzFz-H6yLf5Dou93Y,10921
 bec_widgets/widgets/figure/plots/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/figure/plots/image/image.py,sha256=PCuZyTpPvIgfbAzOydV0op_GM3a8hXZoAw2Ux5z4ymA,24383
+bec_widgets/widgets/figure/plots/image/image.py,sha256=o_tOWIVlsxdoTeY6qdp-6i6qnXZgaR5RWGJH_gHG-4s,24462
 bec_widgets/widgets/figure/plots/image/image_item.py,sha256=RljjbkqJEr2cKDlqj1j5GQ1h89jpqOV-OpFz1TbED8I,10937
 bec_widgets/widgets/figure/plots/image/image_processor.py,sha256=GeTtWjbldy6VejMwPGQgM-o3d6bmLglCjdoktu19xfA,5262
 bec_widgets/widgets/figure/plots/motor_map/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/figure/plots/motor_map/motor_map.py,sha256=uZKWtXcK9MU-_PleN1xKIyTCUuCHrkbqtbY9sVMgDlw,18244
+bec_widgets/widgets/figure/plots/motor_map/motor_map.py,sha256=wgARzsm98Y8SHPPwVp1LzNlXCxKEi6a8by8yYzIWsbY,18319
 bec_widgets/widgets/figure/plots/waveform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/figure/plots/waveform/waveform.py,sha256=EjKwD_pOhZYmXU2M_LdIv9A9cbVYxR1Y9lH0tbMNuJE,51710
 bec_widgets/widgets/figure/plots/waveform/waveform_curve.py,sha256=ZwRxSfPHbMWEvgUC-mL2orpZvtxR-DcrYAFikkdWEzk,8654
@@ -329,9 +329,9 @@ tests/unit_tests/test_bec_connector.py,sha256=5uqBfjgMeOlGvqJlFbytxEpZ1El7_Y2q8f
 tests/unit_tests/test_bec_dispatcher.py,sha256=rYPiRizHaswhGZw55IBMneDFxmPiCCLAZQBqjEkpdyY,3992
 tests/unit_tests/test_bec_dock.py,sha256=j52o5ZhGzcSJ2VTtRPjVf9ZpQTdMLO4w-eXc6GB2c90,5593
 tests/unit_tests/test_bec_figure.py,sha256=8AojxszCIzMi6EYB5mVFMQjk4pjgBCSp6PH2JZsuDkw,8724
-tests/unit_tests/test_bec_image.py,sha256=JqRKT-fdugmST80P0xSgMp6x_ukK-aLpezahPCWb3fA,2547
+tests/unit_tests/test_bec_image.py,sha256=gMoIuKSSSql2EhRrqk7i-iUMNozc9v2jJ2XGAnR0Oyw,2576
 tests/unit_tests/test_bec_image_widget.py,sha256=4-fdbsJsPuzJs8EFw9C1llcF4Zmv3vzJcA9t34J0WD4,7478
-tests/unit_tests/test_bec_motor_map.py,sha256=dSYopbZS8lGD9cB26Kwmqw5zBoKCZs8t7DEEr50ug-g,8532
+tests/unit_tests/test_bec_motor_map.py,sha256=lIyUeEroJKUZ8CPil-s6ASWmpjTMwzkUz6y5ev43klY,9047
 tests/unit_tests/test_bec_queue.py,sha256=u-uc-iZeGAS8P90o6Cxy5oz_60zHpirGAu04OgQPDXw,4598
 tests/unit_tests/test_bec_status_box.py,sha256=gZdjyy9DNuUP9UwleTLj2Dp5HUImiqnkHjXWiqL0Q-o,4868
 tests/unit_tests/test_client_utils.py,sha256=CBdWIVJ_UiyFzTJnX3XJm4PGw2uXhFvRCP_Y9ifckbw,2630
@@ -369,8 +369,8 @@ tests/unit_tests/test_configs/config_device_no_entry.yaml,sha256=hdvue9KLc_kfNzG
 tests/unit_tests/test_configs/config_scan.yaml,sha256=vo484BbWOjA_e-h6bTjSV9k7QaQHrlAvx-z8wtY-P4E,1915
 tests/unit_tests/test_msgs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit_tests/test_msgs/available_scans_message.py,sha256=m_z97hIrjHXXMa2Ex-UvsPmTxOYXfjxyJaGkIY6StTY,46532
-bec_widgets-0.92.3.dist-info/METADATA,sha256=fwlAwMRQPcnbIvNhjZS_q-c-28z0jotZHuT4pjPbOXc,1308
-bec_widgets-0.92.3.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-bec_widgets-0.92.3.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
-bec_widgets-0.92.3.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-bec_widgets-0.92.3.dist-info/RECORD,,
+bec_widgets-0.92.4.dist-info/METADATA,sha256=XV0Gw1L20hWv_OA290dq_2dyMJceFPXRML6EubLQgwA,1308
+bec_widgets-0.92.4.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+bec_widgets-0.92.4.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
+bec_widgets-0.92.4.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
+bec_widgets-0.92.4.dist-info/RECORD,,

pyproject.toml

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

tests/unit_tests/test_bec_image.py

@@ -17,10 +17,8 @@ def bec_image_show(bec_figure):
 
 def test_on_image_update(bec_image_show):
     data = np.random.rand(100, 100)
-    msg = messages.DeviceMonitor2DMessage(
-        device="eiger", data=data, metadata={"scan_id": "12345"}
-    ).model_dump()
-    bec_image_show.on_image_update(msg)
+    msg = messages.DeviceMonitor2DMessage(device="eiger", data=data, metadata={"scan_id": "12345"})
+    bec_image_show.on_image_update(msg.content, msg.metadata)
     img = bec_image_show.images[0]
     assert np.array_equal(img.get_data(), data)
 
@@ -28,10 +26,8 @@ def test_on_image_update(bec_image_show):
 def test_autorange_on_image_update(bec_image_show):
     # Check if autorange mode "mean" works, should be default
     data = np.random.rand(100, 100)
-    msg = messages.DeviceMonitor2DMessage(
-        device="eiger", data=data, metadata={"scan_id": "12345"}
-    ).model_dump()
-    bec_image_show.on_image_update(msg)
+    msg = messages.DeviceMonitor2DMessage(device="eiger", data=data, metadata={"scan_id": "12345"})
+    bec_image_show.on_image_update(msg.content, msg.metadata)
     img = bec_image_show.images[0]
     assert np.array_equal(img.get_data(), data)
     vmin = max(np.mean(data) - 2 * np.std(data), 0)
@@ -39,7 +35,7 @@ def test_autorange_on_image_update(bec_image_show):
     assert np.isclose(img.color_bar.getLevels(), (vmin, vmax), rtol=(1e-5, 1e-5)).all()
     # Test general update with autorange True, mode "max"
     bec_image_show.set_autorange_mode("max")
-    bec_image_show.on_image_update(msg)
+    bec_image_show.on_image_update(msg.content, msg.metadata)
     img = bec_image_show.images[0]
     vmin = np.min(data)
     vmax = np.max(data)
@@ -47,18 +43,16 @@ def test_autorange_on_image_update(bec_image_show):
     assert np.isclose(img.color_bar.getLevels(), (vmin, vmax), rtol=(1e-5, 1e-5)).all()
     # Change the input data, and switch to autorange False, colormap levels should stay untouched
     data *= 100
-    msg = messages.DeviceMonitor2DMessage(
-        device="eiger", data=data, metadata={"scan_id": "12345"}
-    ).model_dump()
+    msg = messages.DeviceMonitor2DMessage(device="eiger", data=data, metadata={"scan_id": "12345"})
     bec_image_show.set_autorange(False)
-    bec_image_show.on_image_update(msg)
+    bec_image_show.on_image_update(msg.content, msg.metadata)
     img = bec_image_show.images[0]
     assert np.array_equal(img.get_data(), data)
     assert np.isclose(img.color_bar.getLevels(), (vmin, vmax), rtol=(1e-3, 1e-3)).all()
     # Reactivate autorange, should now scale the new data
     bec_image_show.set_autorange(True)
     bec_image_show.set_autorange_mode("mean")
-    bec_image_show.on_image_update(msg)
+    bec_image_show.on_image_update(msg.content, msg.metadata)
     img = bec_image_show.images[0]
     vmin = max(np.mean(data) - 2 * np.std(data), 0)
     vmax = np.mean(data) + 2 * np.std(data)

tests/unit_tests/test_bec_motor_map.py

@@ -1,5 +1,6 @@
 import numpy as np
 import pytest
+from bec_lib.messages import DeviceMessage
 
 from bec_widgets.widgets.figure.plots.motor_map.motor_map import BECMotorMap, MotorMapConfig
 from bec_widgets.widgets.figure.plots.waveform.waveform_curve import SignalData
@@ -72,7 +73,8 @@ def test_motor_movement_updates_position_and_database(bec_figure):
 
     # Simulate motor movement for 'samx' only
     new_position_samx = 4.0
-    mm.on_device_readback({"signals": {"samx": {"value": new_position_samx}}})
+    msg = DeviceMessage(signals={"samx": {"value": new_position_samx}}, metadata={})
+    mm.on_device_readback(msg.content, msg.metadata)
 
     init_positions["samx"].append(new_position_samx)
     init_positions["samy"].append(init_positions["samy"][-1])
@@ -96,7 +98,8 @@ def test_scatter_plot_rendering(bec_figure):
 
     # Simulate motor movement for 'samx' only
     new_position_samx = 4.0
-    mm.on_device_readback({"signals": {"samx": {"value": new_position_samx}}})
+    msg = DeviceMessage(signals={"samx": {"value": new_position_samx}}, metadata={})
+    mm.on_device_readback(msg.content, msg.metadata)
     mm._update_plot()
 
     # Get the scatter plot item
@@ -116,8 +119,10 @@ def test_plot_visualization_consistency(bec_figure):
     mm = bec_figure.motor_map("samx", "samy")
     mm.change_motors("samx", "samy")
     # Simulate updating the plot with new data
-    mm.on_device_readback({"signals": {"samx": {"value": 5}}})
-    mm.on_device_readback({"signals": {"samy": {"value": 9}}})
+    msg = DeviceMessage(signals={"samx": {"value": 5}}, metadata={})
+    mm.on_device_readback(msg.content, msg.metadata)
+    msg = DeviceMessage(signals={"samy": {"value": 9}}, metadata={})
+    mm.on_device_readback(msg.content, msg.metadata)
     mm._update_plot()
 
     scatter_plot_item = mm.plot_components["scatter"]
@@ -234,10 +239,14 @@ def test_motor_map_get_data_max_points(bec_figure, qtbot):
         "samx": [motor_map_dev["samx"].read()["samx"]["value"]],
         "samy": [motor_map_dev["samy"].read()["samy"]["value"]],
     }
-    mm.on_device_readback({"signals": {"samx": {"value": 5.0}}})
-    mm.on_device_readback({"signals": {"samy": {"value": 9.0}}})
-    mm.on_device_readback({"signals": {"samx": {"value": 6.0}}})
-    mm.on_device_readback({"signals": {"samy": {"value": 7.0}}})
+    msg = DeviceMessage(signals={"samx": {"value": 5.0}}, metadata={})
+    mm.on_device_readback(msg.content, msg.metadata)
+    msg = DeviceMessage(signals={"samy": {"value": 9.0}}, metadata={})
+    mm.on_device_readback(msg.content, msg.metadata)
+    msg = DeviceMessage(signals={"samx": {"value": 6.0}}, metadata={})
+    mm.on_device_readback(msg.content, msg.metadata)
+    msg = DeviceMessage(signals={"samy": {"value": 7.0}}, metadata={})
+    mm.on_device_readback(msg.content, msg.metadata)
 
     expected_x = [init_positions["samx"][-1], 5.0, 5.0, 6.0, 6.0]
     expected_y = [init_positions["samy"][-1], init_positions["samy"][-1], 9.0, 9.0, 7.0]