bec-widgets 0.94.2__py3-none-any.whl → 0.94.4__py3-none-any.whl

CHANGELOG.md

@@ -1,5 +1,29 @@
 # CHANGELOG
 
+## v0.94.4 (2024-08-14)
+
+### Documentation
+
+* docs: review developer section; add introduction ([`2af5c94`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2af5c94913a3435c1839034df4f45f885b56d08b))
+
+### Fix
+
+* fix: do not shutdown client in "close"
+
+Terminating client connections has to be done at the application level ([`198c1d1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/198c1d1064cc2dae55de4b941929341faddacb28))
+
+## v0.94.3 (2024-08-13)
+
+### Fix
+
+* fix(curve_dialog): async curves are shown in curve dialog after addition. ([`7aeb2b5`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7aeb2b5c26c7c2851e8d663d32521da8daec95ef))
+
+* fix(waveform): async device entry is correctly passed, updated and with new scan the previous data are cleared ([`d56ea95`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d56ea95ef97bfdd0bc3eeddc4505d20b38e28559))
+
+### Test
+
+* test(waveform_widget): added tests for axis setting and curve dialog ([`f285b35`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f285b35b491660549e74349318119f7c2c44f619))
+
 ## v0.94.2 (2024-08-13)
 
 ### Fix
@@ -129,21 +153,3 @@ This reverts commit fd6ae91993a23a7b8dbb2cf3c4b7c3eda6d2b0f6 ([`5aad401`](https:
 * fix(widgets): fixed import for tictactoe example ([`995a795`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/995a795060bebe25c17108d80ae0fa30463f03b1))
 
 ## v0.92.1 (2024-07-28)
-
-### Build
-
-* build(ci): install ophyd_devices in editable mode for pipelines ([`06205e0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/06205e07903d93accf40abab153f440059f236ed))
-
-### Fix
-
-* fix: use SafeSlot instead of Slot ([`bc1e239`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/bc1e23944cc0e5a861e3d0b4dc5b4ac6292d5269))
-
-* fix: linting ([`a3fe205`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a3fe20500ae2ac03dcde07432f7e21ce5262ce46))
-
-* fix: always add a QApplication for tests ([`61a4e32`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/61a4e32deb337ed27f2f43358b88b7266413b58e))
-
-* fix: add xvfb to draw offscreen ([`3d681f7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3d681f77e144e74138fc5fa65630004d7c166878))
-
-* fix: reset ErrorPopup singleton between tests ([`5a9ccfd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5a9ccfd1f6d2aacd5d86c1a34f74163b272d1ae4))
-
-* fix: metaclass + QObject segfaults PyQt(cpp bindings) ([`fc57b7a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fc57b7a1262031a2df9e6a99493db87e766b779a))

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.94.2
+Version: 0.94.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/examples/jupyter_console/jupyter_console_window.py

@@ -46,6 +46,7 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
                     "w7": self.w7,
                     "w8": self.w8,
                     "w9": self.w9,
+                    "w10": self.w10,
                     "d0": self.d0,
                     "d1": self.d1,
                     "d2": self.d2,

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

@@ -943,7 +943,9 @@ class BECWaveform(BECPlotBase):
                 self.setup_dap(self.old_scan_id, self.scan_id)
             if self._curves_data["async"]:
                 for curve_id, curve in self._curves_data["async"].items():
-                    self.setup_async(curve.config.signals.y.name)
+                    self.setup_async(
+                        name=curve.config.signals.y.name, entry=curve.config.signals.y.entry
+                    )
 
     @Slot(dict, dict)
     def on_scan_segment(self, msg: dict, metadata: dict):
@@ -1005,18 +1007,18 @@ class BECWaveform(BECPlotBase):
             )
 
     @Slot(str)
-    def setup_async(self, device: str):
+    def setup_async(self, name: str, entry: str):
         self.bec_dispatcher.disconnect_slot(
-            self.on_async_readback, MessageEndpoints.device_async_readback(self.old_scan_id, device)
+            self.on_async_readback, MessageEndpoints.device_async_readback(self.old_scan_id, name)
         )
         try:
-            self._curves_data["async"][f"{device}-{device}"].clear_data()
+            self._curves_data["async"][f"{name}-{entry}"].clear_data()
         except KeyError:
             pass
         if len(self._curves_data["async"]) > 0:
             self.bec_dispatcher.connect_slot(
                 self.on_async_readback,
-                MessageEndpoints.device_async_readback(self.scan_id, device),
+                MessageEndpoints.device_async_readback(self.scan_id, name),
                 from_start=True,
             )
 

bec_widgets/widgets/image/image_widget.py

@@ -457,7 +457,6 @@ class BECImageWidget(BECWidget, QWidget):
 
     def cleanup(self):
         self.fig.cleanup()
-        self.client.shutdown()
         self.toolbar.close()
         self.toolbar.deleteLater()
         return super().cleanup()

bec_widgets/widgets/jupyter_console/jupyter_console.py

@@ -63,8 +63,6 @@ class BECJupyterConsole(RichJupyterWidget):  # pragma: no cover:
 
     def closeEvent(self, event):
         self.shutdown_kernel()
-        if self.client:
-            self.client.shutdown()
 
 
 if __name__ == "__main__":  # pragma: no cover

bec_widgets/widgets/waveform/waveform_popups/curve_dialog/curve_dialog.py

@@ -58,16 +58,17 @@ class CurveSettings(SettingWidget):
         self.ui.color_map_selector_scan.combo.setCurrentText(cm)
 
         # Scan Curve Table
-        for label, curve in config["scan_segment"].items():
-            row_count = self.ui.scan_table.rowCount()
-            self.ui.scan_table.insertRow(row_count)
-            DialogRow(
-                parent=self,
-                table_widget=self.ui.scan_table,
-                client=self.target_widget.client,
-                row=row_count,
-                config=curve.config,
-            ).add_scan_row()
+        for source in ["scan_segment", "async"]:
+            for label, curve in config[source].items():
+                row_count = self.ui.scan_table.rowCount()
+                self.ui.scan_table.insertRow(row_count)
+                DialogRow(
+                    parent=self,
+                    table_widget=self.ui.scan_table,
+                    client=self.target_widget.client,
+                    row=row_count,
+                    config=curve.config,
+                ).add_scan_row()
 
         # Add DAP Curves
         for label, curve in config["DAP"].items():
@@ -132,11 +133,12 @@ class CurveSettings(SettingWidget):
         self.accept_curve_changes()
 
     def accept_curve_changes(self):
-        old_curves_scans = list(self.target_widget.waveform._curves_data["scan_segment"].values())
-        old_curves_dap = list(self.target_widget.waveform._curves_data["DAP"].values())
-        for curve in old_curves_scans:
-            curve.remove()
-        for curve in old_curves_dap:
+        sources = ["scan_segment", "async", "DAP"]
+        old_curves = []
+
+        for source in sources:
+            old_curves += list(self.target_widget.waveform._curves_data[source].values())
+        for curve in old_curves:
             curve.remove()
         self.get_curve_params()
 

bec_widgets/widgets/waveform/waveform_widget.py

@@ -561,7 +561,6 @@ class BECWaveformWidget(BECWidget, QWidget):
 
     def cleanup(self):
         self.fig.cleanup()
-        self.client.shutdown()
         return super().cleanup()
 
 

{bec_widgets-0.94.2.dist-info → bec_widgets-0.94.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.94.2
+Version: 0.94.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.94.2.dist-info → bec_widgets-0.94.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=AIRugJUd4Xfa1kLlZjS-fusom9MqeLaedm5gvCf5Mrg,6460
+CHANGELOG.md,sha256=ZgJSqE7XIvqpjlDINU3jRRCwL5__8y6FOftSs8VgNNs,6463
 LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-PKG-INFO,sha256=YQCZe2dGXb5ldFsUtd4xjktxqbR5iMSctbZp1j4M1F0,1307
+PKG-INFO,sha256=Fr6w7cyPHrpWO62J-UES9e5wuB2OKrOMWOKshp4VYCM,1307
 README.md,sha256=Od69x-RS85Hph0-WwWACwal4yUd67XkEn4APEfHhHFw,2649
-pyproject.toml,sha256=SNoDaQvOhh_FOEYgsPR_cnJIO-yWIilEjcZYEy4ksSE,2356
+pyproject.toml,sha256=wDEM1QP9Ii5M219IXkmWm2WSgs7BSJ-Wq3qtwQbFt9s,2356
 .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
@@ -94,7 +94,7 @@ bec_widgets/examples/general_app/general_app.py,sha256=Ks9CKtIQIFOzKosh204zVg1lt
 bec_widgets/examples/general_app/general_app.ui,sha256=TsejkM3Z8znnixyqxoj4SwhIIpIzTAuGAMkGXSS1aT8,10479
 bec_widgets/examples/general_app/web_links.py,sha256=d5OgzgI9zb-NAC0pOGanOtJX3nZoe4x8QuQTw-_hK_8,434
 bec_widgets/examples/jupyter_console/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/examples/jupyter_console/jupyter_console_window.py,sha256=zzeSE4SS-B6p7LTqS91oGbEmYEtEQHewndVscJywL8I,6766
+bec_widgets/examples/jupyter_console/jupyter_console_window.py,sha256=2PDhUevxU5YlZcoVokH5fgGdwFGIQFSN8x0DChhxoxE,6803
 bec_widgets/examples/plugin_example_pyside/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/examples/plugin_example_pyside/main.py,sha256=zDP5wO7wb3BVsQ15HOCRT1nNmCujIVRvSXZ3Txje8L0,549
 bec_widgets/examples/plugin_example_pyside/registertictactoe.py,sha256=cVhBnP0qx5j9Jft-VeKvlTFE-bX58hbP45CX0f4r5pM,535
@@ -182,15 +182,15 @@ bec_widgets/widgets/figure/plots/image/image_processor.py,sha256=GeTtWjbldy6VejM
 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=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.py,sha256=-op62_CFX1Gu-Ag6CD5d3ylEDqu_ieTbfoTUF2zf7T8,51800
 bec_widgets/widgets/figure/plots/waveform/waveform_curve.py,sha256=ZwRxSfPHbMWEvgUC-mL2orpZvtxR-DcrYAFikkdWEzk,8654
 bec_widgets/widgets/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/image/bec_image_widget.pyproject,sha256=PHisdBo5_5UCApd27GkizzqgfdjsDx2bFZa_p9LiSW8,30
 bec_widgets/widgets/image/bec_image_widget_plugin.py,sha256=B7whBMsoQ85MyCR_C6YHBl2s1T7odOJJYeiHaLXzmcM,1387
-bec_widgets/widgets/image/image_widget.py,sha256=csPtl48uZgSlyomxG68bFJX929Y2WOvgv5risWQuXFI,16319
+bec_widgets/widgets/image/image_widget.py,sha256=TCpTF8v94iSMklG9bYxZOjm9SbO60XZB9X0ldEp8lWE,16288
 bec_widgets/widgets/image/register_bec_image_widget.py,sha256=01YLZQTMSSIXvH1TSL-1AYsRs1a4EbSwKLVAwh9AjeA,478
 bec_widgets/widgets/jupyter_console/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/jupyter_console/jupyter_console.py,sha256=mBKM89H6SuHuFy1lQg1n8s1gQiN5QEkZf0xua8aPDns,2402
+bec_widgets/widgets/jupyter_console/jupyter_console.py,sha256=-e7HQOECeH5eDrJYh4BFIzRL78LDkooU4otabyN0aX4,2343
 bec_widgets/widgets/motor_map/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/motor_map/bec_motor_map_widget.pyproject,sha256=NAI8s5gRKz80ED4KY7OgD2OgSH5HEsjt2ux2BYp66yg,63
 bec_widgets/widgets/motor_map/bec_motor_map_widget_plugin.py,sha256=V6iN82E8Za8BharR_cSyZZShh4fI9yc5ky2TQBGELR0,1316
@@ -256,10 +256,10 @@ bec_widgets/widgets/waveform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 bec_widgets/widgets/waveform/bec_waveform_widget.pyproject,sha256=GLD8GN9dXx9wNbtnevrxqqcwk7vKV-Uv8QYSycdaoaI,33
 bec_widgets/widgets/waveform/bec_waveform_widget_plugin.py,sha256=D9q3wdBPB5x0iCzyYDo1qdSXzySXdRIc1d5oD3Gv5gY,1420
 bec_widgets/widgets/waveform/register_bec_waveform_widget.py,sha256=qZHVZH_lP2hvzkG1Ra0EyrXlMeLkRCy0aceH-bfJ1cs,490
-bec_widgets/widgets/waveform/waveform_widget.py,sha256=zErnkgwm69QZEVvNRLi57v9-zRQeu0IaJpYRj34mGmA,19125
+bec_widgets/widgets/waveform/waveform_widget.py,sha256=4aHwkLdn7C8BgvKqFIbOB0YaAxAIIFTG_hG0iLougKQ,19094
 bec_widgets/widgets/waveform/waveform_popups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/waveform/waveform_popups/curve_dialog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bec_widgets/widgets/waveform/waveform_popups/curve_dialog/curve_dialog.py,sha256=jCtWjNxsdOW7fA9BLdMAMrlCKHr2tFMHcVMxpeJ6YZE,13107
+bec_widgets/widgets/waveform/waveform_popups/curve_dialog/curve_dialog.py,sha256=S1j44i1xxJtmCcNtbOsxF8XdklMPsG9t4-1DZ2YfOPw,13128
 bec_widgets/widgets/waveform/waveform_popups/curve_dialog/curve_dialog.ui,sha256=OaQE5HlyBQ3RQoHqxOFHiUoNcx8SDZP5sHJ9NNGhsPI,10404
 bec_widgets/widgets/waveform/waveform_popups/dap_summary_dialog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bec_widgets/widgets/waveform/waveform_popups/dap_summary_dialog/dap_summary.ui,sha256=PFEKro61UXd-jmx65U4pqJ5D29DXtVnhQRnsnDvN-wM,6138
@@ -285,10 +285,11 @@ docs/assets/index_contribute.svg,sha256=OCjvYBw_JhcY_D5Zd7f1MctQvq1YNalYlqPNwB1X
 docs/assets/index_getting_started.svg,sha256=Www1OXmauYlouZD51AR6-VG2vxrEig8-jjuDPhzkNxc,3977
 docs/assets/index_user_guide.svg,sha256=sRjKwOHVJStBYIQUFVcnfmbeXd2qAp0HYjleSp66XCI,6429
 docs/assets/rocket_launch_48dp.svg,sha256=pdrPrBcKWUa5OlgWKM0B6TA6qAW7E57d7C7YW2r1OT8,1070
-docs/developer/developer.md,sha256=VUdMnQBsSRCawYMFCe0vya5oj1MimLML7Pd58kY6fYY,765
-docs/developer/getting_started/development.md,sha256=aYLmuLMYpp5FcIXeDUqCfcStIV8veuiMBjOt5bTW_30,1406
-docs/developer/getting_started/getting_started.md,sha256=My_K_6O7LLaXVB_eINrRku5o-jVx95lsmGgHxgZhT7A,378
-docs/developer/widgets/widgets.md,sha256=aNsJgG7R-3EerumNB6GH84JLIXfZqGN5GjvpKWDi0Hk,504
+docs/developer/developer.md,sha256=LUbV1dnVI9r8FhsL2htKRqrGZDGkFXA-jo5TJfXz4OI,1099
+docs/developer/introduction/concepts.md,sha256=N23ewZjPx97eJtrU6-0Lou2IvPfkfZ6Nw6n9SwASQ74,1721
+docs/developer/introduction/contributing.md,sha256=ocW5kjBNwD5k_nDkusXUpsW8jJALajrpNSRVJftuF-k,1668
+docs/developer/introduction/introduction.md,sha256=860Sw05t1RGW13IUlM5bJwK8DckYhSABPKZykgmwcpA,774
+docs/developer/widget_development/widget_development.md,sha256=wGfDjbt9EonVxUg59keADy7wCLyS-KzCz7m4hY0OV_A,526
 docs/introduction/introduction.md,sha256=YBEFDhxqHTcbfbNTo76xDflaFUHIqDs-sToA1HRmCnI,1436
 docs/user/customisation.md,sha256=wCW8fAbqtlgGE3mURvXOrK67Xo0_B-lxfg0sYuQWB40,3186
 docs/user/user.md,sha256=uCTcjclIi6rdjYRQebko6bWFEVsjyfshsVU3BDYrC-Y,1403
@@ -367,7 +368,7 @@ tests/unit_tests/test_text_box_widget.py,sha256=OhHy5gu_XgWU2WvcO5ZcGbZcc-tiE-lZ
 tests/unit_tests/test_toggle.py,sha256=Amzgres7te0tTQIDR2WMKSx9Kce44TxMpIPR6HZygXQ,832
 tests/unit_tests/test_vscode_widget.py,sha256=BOepZuDzbATK7_yy4wJEkVbz5VWSwVBj9__uxJ5vpM0,2748
 tests/unit_tests/test_waveform1d.py,sha256=AOfpHvebsEVb-MNf8Shh2bAML5bandtvoXkYqKWe8qc,24470
-tests/unit_tests/test_waveform_widget.py,sha256=1FJMo6dDptVk-_Sq4dAhBza4HYe5w6fLQfsOvzWkueg,8573
+tests/unit_tests/test_waveform_widget.py,sha256=EcJim-T6rcMKChleSnolNhXh6AIeIpYyFTsbLl4TmEY,16728
 tests/unit_tests/test_website_widget.py,sha256=POcHK4INck3quasMD14DBlBBJWD0uKJbkOMt_JsPhXA,708
 tests/unit_tests/test_widget_io.py,sha256=FeL3ZYSBQnRt6jxj8VGYw1cmcicRQyHKleahw7XIyR0,3475
 tests/unit_tests/test_yaml_dialog.py,sha256=SEvUgC_poWC6fAoHVWolaORpgMFc7c0Xqqk9cFvHSvo,5826
@@ -376,8 +377,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.94.2.dist-info/METADATA,sha256=YQCZe2dGXb5ldFsUtd4xjktxqbR5iMSctbZp1j4M1F0,1307
-bec_widgets-0.94.2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-bec_widgets-0.94.2.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
-bec_widgets-0.94.2.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
-bec_widgets-0.94.2.dist-info/RECORD,,
+bec_widgets-0.94.4.dist-info/METADATA,sha256=Fr6w7cyPHrpWO62J-UES9e5wuB2OKrOMWOKshp4VYCM,1307
+bec_widgets-0.94.4.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+bec_widgets-0.94.4.dist-info/entry_points.txt,sha256=3otEkCdDB9LZJuBLzG4pFLK5Di0CVybN_12IsZrQ-58,166
+bec_widgets-0.94.4.dist-info/licenses/LICENSE,sha256=YRKe85CBRyP7UpEAWwU8_qSIyuy5-l_9C-HKg5Qm8MQ,1511
+bec_widgets-0.94.4.dist-info/RECORD,,

docs/developer/developer.md

@@ -1,7 +1,9 @@
 (developer)=
 # Developer 
 
-Welcome to the BEC Widgets developer guide! This section is intended for developers who want to contribute to the development of BEC Widgets.
+Welcome to the BEC Widgets developer guide! BEC Widgets is a framework for building graphical user interfaces (GUIs) for [BEC](https://bec.readthedocs.io/en/latest/), a Python package for beamline experiment control.
+
+This guide targets readers who want to develop new widgets or extend existing ones. If your goal is to use BEC Widgets to build GUIs for your experiments, please refer to the [user guide](#user).
 
 ```{toctree}
 ---
@@ -9,8 +11,8 @@ maxdepth: 2
 hidden: true
 ---
 
-getting_started/getting_started.md
-widgets/widgets.md
+introduction/introduction.md
+widget_development/widget_development.md
 api_reference/api_reference.md
 ```
 
@@ -21,26 +23,28 @@ api_reference/api_reference.md
 :gutter: 5
 
 ```{grid-item-card}
-:link: developer.getting_started
+:link: developer.introduction
 :link-type: ref
 :img-top: /assets/rocket_launch_48dp.svg
 :text-align: center
 
-## Getting Started
+## Introduction
 
-Learn how to install BEC Widgets and get started with the framework.
+An introduction into the single-resposibility principle and the modular design of BEC Widgets.
 ```
 
 ```{grid-item-card}
-:link: developer.widgets
+:link: developer.widget_development
 :link-type: ref
 :img-top: /assets/apps_48dp.svg
 :text-align: center
 
-## Widgets
+## Widget Development
 
-Learn about the building blocks of larger applications: widgets.
+Learn how to develop a new modular widget for BEC Widgets.
 ```
-````
+
+````{grid} 2
+
 
 

docs/developer/introduction/concepts.md

@@ -0,0 +1,14 @@
+(developer.concepts)=
+# Concepts
+This section provides an overview of the core concepts of BEC Widgets, which are based on the single-responsibility principle and modular design.
+
+## Moduler Design
+We develop widgets with the single-responsibility principle in mind, meaning each widget is designed for a specific task. Our goal is to keep widgets simple, using them primarily for visualization or to initiate actions within BEC. Following these ideas, widgets should be designed to be reusable in various applications, making them versatile building blocks for larger GUIs. 
+
+We offer up to three different options for composing larger GUIs from these modular widgets: BECDesigner, DockArea widget, or scripting from the command line interface. More information about these options can be found in the user sections on [applications](user.applications).
+
+## Client-Server Architecture
+
+BEC Widgets is built on top of the [BEC](https://bec.readthedocs.io/en/latest/) package, which provides the backend for beamline experiment control. BEC Widgets is a client of BEC, meaning it can interact with the backend through a client-server architecture. To make full usage of the available features of BEC, we recommend to check the documentation about [data access](https://bec.readthedocs.io/en/latest/developer/data_access/data_access.html) in which the messaging and event system of BEC is described.
+In the context of BEC Widgets, the [`BECDispatcher`](/api_reference/_autosummary/bec_widgets.utils.bec_dispatcher.BECDispatcher) connects to this messaging and event system, allowing you to link your Qt [`Slots`](https://www.pythonguis.com/tutorials/pyside6-signals-slots-events/) to messages and event received from BEC.
+

docs/developer/{getting_started/development.md → introduction/contributing.md}

@@ -1,5 +1,5 @@
-(developer.development)=
-# Development
+(developer.contributing)=
+# Contributing
 
 If you like to contribute to the development of BEC Widgets, you can follow the steps below to set up your development environment.
 BEC Widgets works in conjunction with [BEC](https://bec.readthedocs.io/en/latest/). 
@@ -10,6 +10,7 @@ If you already have a BEC environment set up, you can install BEC Widgets in edi
 **Prerequisites**
 1. **Python Version:** BEC Widgets requires Python version 3.10 or higher. Verify your Python version to ensure compatibility.
 2. **BEC Installation:** BEC Widgets works in conjunction with BEC. While BEC is a dependency and will be installed automatically, you can find more information about BEC and its installation process in the [BEC documentation](https://beamline-experiment-control.readthedocs.io/en/latest/).
+3. **Qt Distributions:** BEC Widgets supports [PySide6](https://doc.qt.io/qtforpython-6/quickstart.html) and [PyQt6](https://www.riverbankcomputing.com/static/Docs/PyQt6/introduction.html). We use [qtpy](https://pypi.org/project/QtPy/) to abstract the underlying QT distribution.
 
 **Clone the Repository**: 
 ```bash
@@ -20,8 +21,8 @@ cd bec_widgets
 
 Please install the package in editable mode into your BEC Python environemnt. 
 ```bash
-pip install -e '.[dev,pyqt6]'
+pip install -e '.[dev,pyside6]'
 ```
-This installs the package together with [PyQT6](https://www.riverbankcomputing.com/static/Docs/PyQt6/introduction.html). 
+This installs the package together with [PySide6](https://doc.qt.io/qtforpython-6/quickstart.html).
 
 

docs/developer/introduction/introduction.md

@@ -0,0 +1,15 @@
+(developer.introduction)=
+# Introduction
+BEC Widgets is a framework providing modular components that can be integrated into various larger GUI applications. Each widget serves a specific purpose adhering to the single-responsibility principle as detailed in our [concepts section](developer.concepts), and offers a straightforward, user-friendly interface.
+These widgets provide data visualisation tools and experimental control interfaces by triggering actions within BEC. 
+If you're interested in contributing to BEC Widgets, please refer to our [contributing guide](developer.contributing), which provides instructions for setting up your development environment and creating your own widgets.
+
+```{toctree}
+---
+maxdepth: 2
+hidden: false
+---
+
+concepts/
+contributing/
+```

docs/developer/{widgets/widgets.md → widget_development/widget_development.md}

@@ -1,5 +1,5 @@
-(developer.widgets)=
-# Widgets
+(developer.widget_development)=
+# Widget development
 This section provides an introduction to the building blocks of BEC Widgets: widgets. Widgets are the basic components of the graphical user interface (GUI) and are used to create larger applications. We will cover key topics such as how to develop new widgets or how to customise existing widgets. For details on the already available widgets and their usage, please refer to user section about [widgets](#user.widgets)
 
 ```{toctree}

pyproject.toml

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

tests/unit_tests/test_waveform_widget.py

@@ -3,6 +3,9 @@ from unittest.mock import MagicMock, patch
 import pyqtgraph as pg
 import pytest
 
+from bec_widgets.qt_utils.settings_dialog import SettingsDialog
+from bec_widgets.widgets.figure.plots.axis_settings import AxisSettings
+from bec_widgets.widgets.waveform.waveform_popups.curve_dialog.curve_dialog import CurveSettings
 from bec_widgets.widgets.waveform.waveform_widget import BECWaveformWidget
 
 from .client_mocks import mocked_client
@@ -261,3 +264,199 @@ def test_enable_mouse_pan_mode(qtbot, waveform_widget):
     assert action_drag.isChecked() == True
     assert action_rectangle.isChecked() == False
     mock_view_box.setMouseMode.assert_called_once_with(pg.ViewBox.PanMode)
+
+
+###################################
+# Curve Dialog Tests
+###################################
+def show_curve_dialog(qtbot, waveform_widget):
+    curve_dialog = SettingsDialog(
+        waveform_widget,
+        settings_widget=CurveSettings(),
+        window_title="Curve Settings",
+        config=waveform_widget.waveform._curves_data,
+    )
+    qtbot.addWidget(curve_dialog)
+    qtbot.waitExposed(curve_dialog)
+    return curve_dialog
+
+
+def test_curve_dialog_scan_curves_interactions(qtbot, waveform_widget):
+    waveform_widget.plot(y_name="bpm4i")
+    waveform_widget.plot(y_name="bpm3a")
+
+    curve_dialog = show_curve_dialog(qtbot, waveform_widget)
+
+    # Check default display of config from waveform widget
+    assert curve_dialog is not None
+    assert curve_dialog.widget.ui.scan_table.rowCount() == 2
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 0).text() == "bpm4i"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 1).text() == "bpm4i"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(1, 0).text() == "bpm3a"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(1, 1).text() == "bpm3a"
+    assert curve_dialog.widget.ui.x_mode.currentText() == "best_effort"
+    assert curve_dialog.widget.ui.x_name.isEnabled() == False
+    assert curve_dialog.widget.ui.x_entry.isEnabled() == False
+
+    # Add a new curve
+    curve_dialog.widget.ui.add_curve.click()
+    qtbot.wait(200)
+    assert curve_dialog.widget.ui.scan_table.rowCount() == 3
+
+    # Set device to new curve
+    curve_dialog.widget.ui.scan_table.cellWidget(2, 0).setText("bpm3i")
+
+    # Change the x mode to device
+    curve_dialog.widget.ui.x_mode.setCurrentText("device")
+    qtbot.wait(200)
+    assert curve_dialog.widget.ui.x_name.isEnabled() == True
+    assert curve_dialog.widget.ui.x_entry.isEnabled() == True
+
+    # Set the x device
+    curve_dialog.widget.ui.x_name.setText("samx")
+
+    # Delete first curve ('bpm4i')
+    curve_dialog.widget.ui.scan_table.cellWidget(0, 6).click()
+    qtbot.wait(200)
+    assert curve_dialog.widget.ui.scan_table.rowCount() == 2
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 0).text() == "bpm3a"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 1).text() == "bpm3a"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(1, 0).text() == "bpm3i"
+
+    # Close the dialog
+    curve_dialog.accept()
+    qtbot.wait(200)
+
+    # Check the curve data in the target widget
+    assert list(waveform_widget.waveform._curves_data["scan_segment"].keys()) == [
+        "bpm3a-bpm3a",
+        "bpm3i-bpm3i",
+    ]
+    assert len(waveform_widget.curves) == 2
+
+
+def test_curve_dialog_async(qtbot, waveform_widget):
+    waveform_widget.plot(y_name="bpm4i")
+    waveform_widget.plot(y_name="async_device")
+
+    curve_dialog = show_curve_dialog(qtbot, waveform_widget)
+
+    assert curve_dialog is not None
+    assert curve_dialog.widget.ui.scan_table.rowCount() == 2
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 0).text() == "bpm4i"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 1).text() == "bpm4i"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(1, 0).text() == "async_device"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(1, 1).text() == "async_device"
+
+
+def test_curve_dialog_dap(qtbot, waveform_widget):
+    waveform_widget.plot(x_name="samx", y_name="bpm4i", dap="GaussianModel")
+
+    curve_dialog = show_curve_dialog(qtbot, waveform_widget)
+
+    assert curve_dialog is not None
+    assert curve_dialog.widget.ui.scan_table.rowCount() == 1
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 0).text() == "bpm4i"
+    assert curve_dialog.widget.ui.scan_table.cellWidget(0, 1).text() == "bpm4i"
+    assert curve_dialog.widget.ui.dap_table.isEnabled() == True
+    assert curve_dialog.widget.ui.dap_table.rowCount() == 1
+    assert curve_dialog.widget.ui.dap_table.cellWidget(0, 0).text() == "bpm4i"
+    assert curve_dialog.widget.ui.dap_table.cellWidget(0, 1).text() == "bpm4i"
+    assert curve_dialog.widget.ui.x_mode.currentText() == "device"
+    assert curve_dialog.widget.ui.x_name.isEnabled() == True
+    assert curve_dialog.widget.ui.x_entry.isEnabled() == True
+    assert curve_dialog.widget.ui.x_name.text() == "samx"
+    assert curve_dialog.widget.ui.x_entry.text() == "samx"
+
+    curve_dialog.accept()
+    qtbot.wait(200)
+
+    assert list(waveform_widget.waveform._curves_data["scan_segment"].keys()) == ["bpm4i-bpm4i"]
+    assert len(waveform_widget.curves) == 2
+
+
+###################################
+# Axis Dialog Tests
+###################################
+
+
+def show_axis_dialog(qtbot, waveform_widget):
+    axis_dialog = SettingsDialog(
+        waveform_widget,
+        settings_widget=AxisSettings(),
+        window_title="Axis Settings",
+        config=waveform_widget._config_dict["axis"],
+    )
+    qtbot.addWidget(axis_dialog)
+    qtbot.waitExposed(axis_dialog)
+    return axis_dialog
+
+
+def test_axis_dialog_with_axis_limits(qtbot, waveform_widget):
+    waveform_widget.set(
+        title="Test Title",
+        x_label="X Label",
+        y_label="Y Label",
+        x_scale="linear",
+        y_scale="log",
+        x_lim=(0, 10),
+        y_lim=(0, 10),
+    )
+
+    axis_dialog = show_axis_dialog(qtbot, waveform_widget)
+
+    assert axis_dialog is not None
+    assert axis_dialog.widget.ui.plot_title.text() == "Test Title"
+    assert axis_dialog.widget.ui.x_label.text() == "X Label"
+    assert axis_dialog.widget.ui.y_label.text() == "Y Label"
+    assert axis_dialog.widget.ui.x_scale.currentText() == "linear"
+    assert axis_dialog.widget.ui.y_scale.currentText() == "log"
+    assert axis_dialog.widget.ui.x_min.value() == 0
+    assert axis_dialog.widget.ui.x_max.value() == 10
+    assert axis_dialog.widget.ui.y_min.value() == 0
+    assert axis_dialog.widget.ui.y_max.value() == 10
+
+
+def test_axis_dialog_without_axis_limits(qtbot, waveform_widget):
+    waveform_widget.set(
+        title="Test Title", x_label="X Label", y_label="Y Label", x_scale="linear", y_scale="log"
+    )
+    x_range = waveform_widget.fig.widget_list[0].plot_item.viewRange()[0]
+    y_range = waveform_widget.fig.widget_list[0].plot_item.viewRange()[1]
+
+    axis_dialog = show_axis_dialog(qtbot, waveform_widget)
+
+    assert axis_dialog is not None
+    assert axis_dialog.widget.ui.plot_title.text() == "Test Title"
+    assert axis_dialog.widget.ui.x_label.text() == "X Label"
+    assert axis_dialog.widget.ui.y_label.text() == "Y Label"
+    assert axis_dialog.widget.ui.x_scale.currentText() == "linear"
+    assert axis_dialog.widget.ui.y_scale.currentText() == "log"
+    assert axis_dialog.widget.ui.x_min.value() == x_range[0]
+    assert axis_dialog.widget.ui.x_max.value() == x_range[1]
+    assert axis_dialog.widget.ui.y_min.value() == y_range[0]
+    assert axis_dialog.widget.ui.y_max.value() == y_range[1]
+
+
+def test_axis_dialog_set_properties(qtbot, waveform_widget):
+    axis_dialog = show_axis_dialog(qtbot, waveform_widget)
+
+    axis_dialog.widget.ui.plot_title.setText("New Title")
+    axis_dialog.widget.ui.x_label.setText("New X Label")
+    axis_dialog.widget.ui.y_label.setText("New Y Label")
+    axis_dialog.widget.ui.x_scale.setCurrentText("log")
+    axis_dialog.widget.ui.y_scale.setCurrentText("linear")
+    axis_dialog.widget.ui.x_min.setValue(5)
+    axis_dialog.widget.ui.x_max.setValue(15)
+    axis_dialog.widget.ui.y_min.setValue(5)
+    axis_dialog.widget.ui.y_max.setValue(15)
+
+    axis_dialog.accept()
+
+    assert waveform_widget._config_dict["axis"]["title"] == "New Title"
+    assert waveform_widget._config_dict["axis"]["x_label"] == "New X Label"
+    assert waveform_widget._config_dict["axis"]["y_label"] == "New Y Label"
+    assert waveform_widget._config_dict["axis"]["x_scale"] == "log"
+    assert waveform_widget._config_dict["axis"]["y_scale"] == "linear"
+    assert waveform_widget._config_dict["axis"]["x_lim"] == (5, 15)
+    assert waveform_widget._config_dict["axis"]["y_lim"] == (5, 15)

docs/developer/getting_started/getting_started.md

@@ -1,12 +0,0 @@
-(developer.getting_started)=
-# Getting Started
-This section provides valuable information for developers who want to contribute to the development of BEC Widgets. The guide will help you set up the development environment, understand the modular development concept of BEC Widgets, and contribute to the project.
-
-```{toctree}
----
-maxdepth: 2
-hidden: false
----
-
-development/
-```