0.57.3

Automatically generated by python-semantic-release

.gitlab-ci.yml

@@ -1,7 +1,7 @@
 # This file is a template, and might need editing before it works on your project.
 # Official language image. Look for the different tagged releases at:
 # https://hub.docker.com/r/library/python/tags/
-image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.10
+image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.11
 #commands to run in the Docker container before starting each job.
 variables:
   DOCKER_TLS_CERTDIR: ""
@@ -23,7 +23,6 @@ workflow:
 include:
   - template: Security/Secret-Detection.gitlab-ci.yml
 
-
 # different stages in the pipeline
 stages:
   - Formatter
@@ -65,7 +64,7 @@ pylint:
       - ./pylint/
     expire_in: 1 week
   rules:
-    - if: $CI_PROJECT_PATH == "bec/bec_widgets"    
+    - if: $CI_PROJECT_PATH == "bec/bec_widgets"
 
 pylint-check:
   stage: Formatter
@@ -98,7 +97,7 @@ pylint-check:
       - ./pylint/
     expire_in: 1 week
   rules:
-    - if: $CI_PROJECT_PATH == "bec/bec_widgets"    
+    - if: $CI_PROJECT_PATH == "bec/bec_widgets"
 
 tests:
   stage: test
@@ -124,17 +123,124 @@ tests:
         coverage_format: cobertura
         path: coverage.xml
 
-
-tests-3.11:
+tests-3.10-pyside6:
   extends: "tests"
   stage: AdditionalTests
-  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.11
+  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.10
+  script:
+    - git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
+    - git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
+    - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
+    - apt-get update
+    - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
+    - pip install -e ./bec/bec_lib[dev]
+    - pip install -e .[dev,pyside6]
+    - pytest -v --junitxml=report.xml --random-order ./tests/unit_tests
   allow_failure: true
 
-tests-3.12:
+tests-3.12-pyside6:
   extends: "tests"
   stage: AdditionalTests
   image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.12
+  script:
+    - git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
+    - git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
+    - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
+    - apt-get update
+    - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
+    - pip install -e ./bec/bec_lib[dev]
+    - pip install -e .[dev,pyside6]
+    - pytest -v --junitxml=report.xml --random-order ./tests/unit_tests
+  allow_failure: true
+
+tests-3.10-pyqt5:
+  extends: "tests"
+  stage: AdditionalTests
+  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.10
+  script:
+    - git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
+    - git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
+    - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
+    - apt-get update
+    - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
+    - pip install -e ./bec/bec_lib[dev]
+    - pip install -e .[dev,pyqt5]
+    - pytest -v --junitxml=report.xml --random-order ./tests/unit_tests
+  allow_failure: true
+
+tests-3.11-pyqt5:
+  extends: "tests"
+  stage: AdditionalTests
+  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.11
+  script:
+    - git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
+    - git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
+    - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
+    - apt-get update
+    - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
+    - pip install -e ./bec/bec_lib[dev]
+    - pip install -e .[dev,pyqt5]
+    - pytest -v --junitxml=report.xml --random-order ./tests/unit_tests
+  allow_failure: true
+
+tests-3.12-pyqt5:
+  extends: "tests"
+  stage: AdditionalTests
+  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.12
+  script:
+    - git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
+    - git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
+    - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
+    - apt-get update
+    - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
+    - pip install -e ./bec/bec_lib[dev]
+    - pip install -e .[dev,pyqt5]
+    - pytest -v --junitxml=report.xml --random-order ./tests/unit_tests
+  allow_failure: true
+
+tests-3.10-pyqt6:
+  extends: "tests"
+  stage: AdditionalTests
+  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.10
+  script:
+    - git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
+    - git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
+    - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
+    - apt-get update
+    - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
+    - pip install -e ./bec/bec_lib[dev]
+    - pip install -e .[dev,pyqt6]
+    - pytest -v --junitxml=report.xml --random-order ./tests/unit_tests
+  allow_failure: true
+
+tests-3.11-pyqt6:
+  extends: "tests"
+  stage: AdditionalTests
+  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.11
+  script:
+    - git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
+    - git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
+    - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
+    - apt-get update
+    - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
+    - pip install -e ./bec/bec_lib[dev]
+    - pip install -e .[dev,pyqt6]
+    - pytest -v --junitxml=report.xml --random-order ./tests/unit_tests
+  allow_failure: true
+
+tests-3.12-pyqt6:
+  extends: "tests"
+  stage: AdditionalTests
+  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.12
+  script:
+    - git clone --branch $BEC_CORE_BRANCH https://gitlab.psi.ch/bec/bec.git
+    - git clone --branch $OPHYD_DEVICES_BRANCH https://gitlab.psi.ch/bec/ophyd_devices.git
+    - export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
+    - apt-get update
+    - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
+    - pip install -e ./bec/bec_lib[dev]
+    - pip install -e .[dev,pyqt6]
+    - pytest -v --junitxml=report.xml --random-order ./tests/unit_tests
   allow_failure: true
 
 end-2-end-conda:
@@ -150,7 +256,7 @@ end-2-end-conda:
     - conda config --prepend channels conda-forge
     - conda config --set channel_priority strict
     - conda config --set always_yes yes --set changeps1 no
-    - conda create -q -n test-environment python=3.10
+    - conda create -q -n test-environment python=3.11
     - conda init bash
     - source ~/.bashrc
     - conda activate test-environment
@@ -167,7 +273,7 @@ end-2-end-conda:
     - cd ../
     - pip install -e .[dev,pyqt6]
     - cd ./tests/end-2-end
-    - pytest --start-servers --flush-redis --random-order
+    - pytest -v --start-servers --flush-redis --random-order
 
   artifacts:
     when: on_failure
@@ -183,7 +289,6 @@ end-2-end-conda:
     - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"'
     - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "production"'
 
-
 semver:
   stage: Deploy
   needs: ["tests"]

CHANGELOG.md

@@ -2,6 +2,134 @@
 
 
 
+## v0.57.3 (2024-06-06)
+
+### Documentation
+
+* docs(bar): docs updated ([`4be0d14`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4be0d14b7445c2322c2aef86257db168a841265c))
+
+* docs: fixed syntax of add_widget ([`a951ebf`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a951ebf1be6c086d094aa8abef5e0dfd1b3b8558))
+
+* docs: added auto update; closes #206 ([`32da803`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/32da803df9f7259842c43e85ba9a0ce29a266d06))
+
+* docs: cleanup ([`07d60cf`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/07d60cf7355d2edadb3c5ef8b86607d74b360455))
+
+### Fix
+
+* fix(ring): automatic updates are disabled uf user specify updates manually with .set_update; 'scan_progres' do not reset number of rings ([`e883dba`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e883dbad814dbcc0a19c341041c6d836e58a5918))
+
+* fix(ring): enable_auto_updates(True) do not reset properties of already setup bars ([`a2abad3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a2abad344f4c0039516eb60a825afb6822c5b19a))
+
+* fix(ring): set_min_max accepts floats ([`d44b1cf`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d44b1cf8b107cf02deedd9154b77d01c7f9ed05d))
+
+* fix(ring): set_update changed to Literals, no need to specify endpoint manually ([`c5b6499`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c5b6499e41eb1495bf260436ca3e1b036182c360))
+
+
+## v0.57.2 (2024-06-06)
+
+### Fix
+
+* fix(test/e2e): autoupdate e2e rewritten ([`e1af5ca`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e1af5ca60f0616835f9f41d84412f29dc298c644))
+
+* fix(test/e2e): spiral_progress_bar e2e tests rewritten to use config_dict ([`7fb31fc`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7fb31fc4d762ff4ca839971b3092a084186f81b8))
+
+* fix(test/e2e): dockarea and dock e2e tests changed to check asserts against config_dict ([`5c6ba65`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5c6ba65469863ea1e6fc5abdc742650e20eba9b9))
+
+* fix: rpc_server_dock fixture now spawns the server process ([`cd9fc46`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/cd9fc46ff8a947242c8c28adcd73d7de60b11c44))
+
+* fix: accept scalars or numpy arrays of 1 element ([`2a88e17`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2a88e17b23436c55d25b7d3449e4af3a7689661c))
+
+### Refactor
+
+* refactor: move _get_output and _start_plot_process at the module level ([`69f4371`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/69f4371007c66aee6b7521a6803054025adf8c92))
+
+
+## v0.57.1 (2024-06-06)
+
+### Documentation
+
+* docs: docs refactored from add_widget_bec to add_widget ([`c3f4845`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c3f4845b4f95005ff737fed5542600b0b9a9cc2b))
+
+### Fix
+
+* fix: tests references to add_widget_bec refactored ([`f51b25f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f51b25f0af4ab8b0a75ee48a40bfbb079c16e9d1))
+
+* fix(dock): add_widget and add_widget_bec consolidated ([`8ae323f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8ae323f5c3c0d9d0f202d31d5e8374a272a26be2))
+
+
+## v0.57.0 (2024-06-05)
+
+### Documentation
+
+* docs: extend user documentation for BEC Widgets ([`4160f3d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4160f3d6d7ec1122785b5e3fdfc4afe67a95e9a1))
+
+### Feature
+
+* feat(widgets/console): BECJupyterConsole added ([`8c03034`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8c03034acf6b3ed1e346ebf1b785d41068513cc5))
+
+
+## v0.56.3 (2024-06-05)
+
+### Ci
+
+* ci: increased verbosity for e2e tests ([`4af1abe`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4af1abe4e15b62d2f7e70bf987a1a7d8694ef4d5))
+
+### Fix
+
+* fix: fixed support for auto updates ([`131f49d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/131f49da8ea65af4d44b50e81c1acfc29cd92093))
+
+
+## v0.56.2 (2024-06-05)
+
+### Documentation
+
+* docs: restructured docs layout ([`3c9181d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3c9181d93d68faa4efb3b91c486ca9ca935975a0))
+
+### Fix
+
+* fix(bar): ring saves current value in config ([`9648e3e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9648e3ea96a4109be6be694d855151ed6d3ad661))
+
+* fix(dock): dock saves configs of all children widgets ([`4be756a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4be756a8676421c3a3451458995232407295df84))
+
+* fix(dock_area): save/restore state is saved in config ([`46face0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/46face0ee59122f04cb383da685a6658beeeb389))
+
+* fix(figure): added correct types of configs to subplot widgets ([`6f3b1ea`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6f3b1ea985c18929b9bab54239eeb600f03b274a))
+
+
+## v0.56.1 (2024-06-04)
+
+### Fix
+
+* fix(spiral_progress_bar/rings): config min/max values added check for floats ([`9d615c9`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9d615c915c8f7cc2ea8f1dc17993b98fe462c682))
+
+* fix(spiral_progress_bar): Endpoint is always stored as a string in the RingConnection Config ([`d253991`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d2539918b296559e1d684344e179775a2423daa9))
+
+
+## v0.56.0 (2024-05-29)
+
+### Build
+
+* build: added pyside6 as dependency ([`db301b1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/db301b1be27bba76c8bb21fbff93cb4902b592a5))
+
+### Ci
+
+* ci: added tests for pyside6, pyqt6 and pyqt5, default test and e2e is python 3.11 and pyqt6 ([`855be35`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/855be3551a1372bcbebba6f8930903f99202bbca))
+
+### Documentation
+
+* docs(examples): example apps section deleted ([`ad208a5`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ad208a5ef8495c45a8b83a4850ba9a1041b42717))
+
+### Feature
+
+* feat(utils/ui_loader): universal ui loader for pyside/pyqt ([`0fea8d6`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0fea8d606574fa99dda3b117da5d5209c251f694))
+
+### Fix
+
+* fix(examples): outdated examples removed (mca_plot.py, stream_plot.py, motor_example.py) ([`ddc9510`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ddc9510c2ba8dadf291809eeb5b135a105259492))
+
+* fix: compatibility adjustment to .ui loading and tests for PySide6 ([`07b99d9`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/07b99d91a57a645cddd76294f48d78773e4c9ea5))
+
+
 ## v0.55.0 (2024-05-24)
 
 ### Feature
@@ -31,141 +159,3 @@
 ### Fix
 
 * fix: removed apparently unnecessary sleep while waiting for an rpc response ([`7d64cac`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7d64cac6610b39d3553ff650354f78ead8ee6b55))
-
-
-## v0.53.2 (2024-05-15)
-
-### Ci
-
-* ci: added echo to highlight the current branch ([`0490e80`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0490e80c48563e4fb486bce903b3ce1f08863e83))
-
-### Fix
-
-* fix: check device class without importing to speed up initial import time ([`9f8fbdd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9f8fbdd5fc13cf2be10eacb41e10cf742864cd92))
-
-* fix: speed up initial import times using lazy import (from bec_lib) ([`d1e6cd3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d1e6cd388c6c9f345f52d6096d8a75a1fa7e6934))
-
-* fix: adapt to bec_lib changes (no more submodules in `__init__.py`) ([`5d09a13`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5d09a13d8820a8bdb900733c97593b723a2fce1d))
-
-
-## v0.53.1 (2024-05-09)
-
-### Ci
-
-* ci: fixed rtd pages url ([`8ff3610`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8ff36105d1e637c429915b4bfc2852d54a3c6f19))
-
-### Fix
-
-* fix: docs config ([`0f6a5e5`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0f6a5e5fa9530969c98a9266c9ca7b89a378ff70))
-
-
-## v0.53.0 (2024-05-09)
-
-### Ci
-
-* ci: use formatter config of toml file ([`5cc816d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5cc816d0af73e20c648e044a027c589704ab1625))
-
-### Documentation
-
-* docs: update install instructions ([`57ee735`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/57ee735e5c2436d45a285507cdc939daa20e8e8f))
-
-### Feature
-
-* feat: moved to pyproject.toml; closes #162 ([`c86ce30`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c86ce302a964d71ee631f0817609ab5aa0e3ab0f))
-
-### Fix
-
-* fix: fixed semver job and upgraded to v9 ([`32e1a9d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/32e1a9d8472eb1c25d30697d407a8ffecd04e75d))
-
-### Refactor
-
-* refactor: applied formatter ([`4117fd7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4117fd7b5b2090ff4fb7ad9e0d92cc87cd13ed5f))
-
-
-## v0.52.1 (2024-05-08)
-
-### Fix
-
-* fix(docstrings): docstrings formating fixed for sphinx to properly format readdocs ([`7f2f7cd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7f2f7cd07a14876617cd83cedde8c281fdc52c3a))
-
-
-## v0.52.0 (2024-05-07)
-
-### Ci
-
-* ci: fixed support for child pipelines ([`e65c7f3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e65c7f3be895ada407bd358edf67d569d2cab08e))
-
-### Feature
-
-* feat(utils/layout_manager): added GridLayoutManager to extend functionalities of native QGridLayout ([`fcd6ef0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fcd6ef0975dc872f69c9d6fb2b8a1ad04a423aae))
-
-* feat(widget/dock): BECDock and BECDock area for dockable windows ([`d8ff8af`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d8ff8afcd474660a6069bbdab05f10a65f221727))
-
-### Fix
-
-* fix(widgets/dock): BECDockArea close overwrites the default pyqtgraph Container close + minor improvements ([`ceae979`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ceae979f375ecc33c5c97148f197655c1ca57b6c))
-
-### Refactor
-
-* refactor(widget/plots): WidgetConfig changed to SubplotConfig ([`03fa1f2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/03fa1f26d0fa6b58ed05556fb2438d1e62f6c107))
-
-
-## v0.51.0 (2024-05-07)
-
-### Build
-
-* build(cli): changed repo name to bec_widgets ([`799ea55`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/799ea554de9a7f3720d100be4886a63f02c6a390))
-
-* build(setup): fakeredis added to dev env ([`df32350`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/df323504fea024a97304d96c2e39e61450714069))
-
-* build(setup): PyQt6 version is set to 6.7 ([`0ab8aa3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0ab8aa3a2fe51b5c38b25fca44c1c422bb42478d))
-
-### Ci
-
-* ci: added rule for parent-child pipelines ([`e085125`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e0851250eecb85503db929d37f75d2ba366308a6))
-
-### Feature
-
-* feat(utils): added plugin helper to find and load ([`5ece269`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/5ece269adb0e9b0c2a468f1dfbaa6212e86d3561))
-
-
-## v0.50.2 (2024-04-30)
-
-### Fix
-
-* fix: 'disconnect_slot' has to be symmetric with 'connect_slot' regarding QtThreadSafeCallback ([`0dfcaa4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0dfcaa4b708948af0a40ec7cf34d03ff1e96ffac))
-
-
-## v0.50.1 (2024-04-29)
-
-### Fix
-
-* fix(cli): BECFigure takes the port to connect to redis from the current BECClient, supporting plugins ([`57cb136`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/57cb136a098e87a452414bf44e627edb562f6799))
-
-
-## v0.50.0 (2024-04-29)
-
-### Feature
-
-* feat(plots): universal cleanup and remove also for children items ([`381d713`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/381d713837bb9217c58ba1d8b89691aa35c9f5ec))
-
-* feat(rpc/rpc_register): singleton rpc register for all rpc connections for session ([`a898e7e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a898e7e4f14e9ae854703dddbd1eb8c50cb640ff))
-
-### Fix
-
-* fix(widgets/figure): access pattern changed for getting widgets by coordinates for rpc ([`13c018a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/13c018a79704a7497c140df57179d294e43ecffa))
-
-* fix(plots): cleanup policy reviewed for children items ([`8f20a0b`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8f20a0b3b1b5dd117b36b45645717190b9ee9cbf))
-
-* fix(rpc/client_utils): getoutput more transparent + error handling ([`6b6a6b2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6b6a6b2249f24d3d02bd5fcd7ef1c63ed794c304))
-
-* fix(rpc_register): thread lock for listign all connections ([`2ca3267`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2ca32675ec3f00137e2140259db51f6e5aa7bb71))
-
-### Test
-
-* test(cli/rpc_register): e2e RPCRegister ([`4f261be`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4f261be4c7cfe54501443d031f9266f4f838f6e2))
-
-* test(cli/rpc_register): rpc_register tests added ([`40eb75f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/40eb75f85a4d99d498b086a37e799276a9d2ac3f))
-
-
-## v0.49.1 (2024-04-26)

bec_widgets/cli/__init__.py

@@ -1,8 +1 @@
-from bec_lib.utils.import_utils import lazy_import_from
-
-# from .auto_updates import AutoUpdates, ScanInfo
-# TODO: put back when Pydantic gets faster
-AutoUpdates, ScanInfo = lazy_import_from(
-    "bec_widgets.cli.auto_updates", ("AutoUpdates", "ScanInfo")
-)
 from .client import BECDockArea, BECFigure

bec_widgets/cli/auto_updates.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING
 from pydantic import BaseModel
 
 if TYPE_CHECKING:
-    from .client import BECFigure
+    from .client import BECDockArea, BECFigure
 
 
 class ScanInfo(BaseModel):
@@ -18,9 +18,20 @@ class ScanInfo(BaseModel):
 
 
 class AutoUpdates:
-    def __init__(self, figure: BECFigure, enabled: bool = True):
-        self.enabled = enabled
-        self.figure = figure
+    create_default_dock: bool = False
+    enabled: bool = False
+    dock_name: str = None
+
+    def __init__(self, gui: BECDockArea):
+        self.gui = gui
+
+    def start_default_dock(self):
+        """
+        Create a default dock for the auto updates.
+        """
+        dock = self.gui.add_dock("default_figure")
+        dock.add_widget("BECFigure")
+        self.dock_name = "default_figure"
 
     @staticmethod
     def get_scan_info(msg) -> ScanInfo:
@@ -44,6 +55,18 @@ class AutoUpdates:
             status=status,
         )
 
+    def get_default_figure(self) -> BECFigure | None:
+        """
+        Get the default figure from the GUI.
+        """
+        dock = self.gui.panels.get(self.dock_name, [])
+        if not dock:
+            return None
+        widgets = dock.widget_list
+        if not widgets:
+            return None
+        return widgets[0]
+
     def run(self, msg):
         """
         Run the update function if enabled.
@@ -86,33 +109,42 @@ class AutoUpdates:
         """
         Simple line scan.
         """
+        fig = self.get_default_figure()
+        if not fig:
+            return
         dev_x = info.scan_report_devices[0]
-        dev_y = self.get_selected_device(info.monitored_devices, self.figure.selected_device)
+        dev_y = self.get_selected_device(info.monitored_devices, self.gui.selected_device)
         if not dev_y:
             return
-        self.figure.clear_all()
-        plt = self.figure.plot(dev_x, dev_y)
+        fig.clear_all()
+        plt = fig.plot(x_name=dev_x, y_name=dev_y)
         plt.set(title=f"Scan {info.scan_number}", x_label=dev_x, y_label=dev_y)
 
     def simple_grid_scan(self, info: ScanInfo) -> None:
         """
         Simple grid scan.
         """
+        fig = self.get_default_figure()
+        if not fig:
+            return
         dev_x = info.scan_report_devices[0]
         dev_y = info.scan_report_devices[1]
-        dev_z = self.get_selected_device(info.monitored_devices, self.figure.selected_device)
-        self.figure.clear_all()
-        plt = self.figure.plot(dev_x, dev_y, dev_z, label=f"Scan {info.scan_number}")
+        dev_z = self.get_selected_device(info.monitored_devices, self.gui.selected_device)
+        fig.clear_all()
+        plt = fig.plot(x_name=dev_x, y_name=dev_y, z_name=dev_z, label=f"Scan {info.scan_number}")
         plt.set(title=f"Scan {info.scan_number}", x_label=dev_x, y_label=dev_y)
 
     def best_effort(self, info: ScanInfo) -> None:
         """
         Best effort scan.
         """
+        fig = self.get_default_figure()
+        if not fig:
+            return
         dev_x = info.scan_report_devices[0]
-        dev_y = self.get_selected_device(info.monitored_devices, self.figure.selected_device)
+        dev_y = self.get_selected_device(info.monitored_devices, self.gui.selected_device)
         if not dev_y:
             return
-        self.figure.clear_all()
-        plt = self.figure.plot(dev_x, dev_y, label=f"Scan {info.scan_number}")
+        fig.clear_all()
+        plt = fig.plot(x_name=dev_x, y_name=dev_y, label=f"Scan {info.scan_number}")
         plt.set(title=f"Scan {info.scan_number}", x_label=dev_x, y_label=dev_y)

bec_widgets/cli/client.py

@@ -1410,6 +1410,16 @@ class BECMotorMap(RPCBase):
 
 
 class BECDock(RPCBase):
+    @property
+    @rpc_call
+    def config_dict(self) -> "dict":
+        """
+        Get the configuration of the widget.
+
+        Returns:
+            dict: The configuration of the widget.
+        """
+
     @property
     @rpc_call
     def rpc_id(self) -> "str":
@@ -1458,20 +1468,20 @@ class BECDock(RPCBase):
         """
 
     @rpc_call
-    def add_widget_bec(
+    def add_widget(
         self,
-        widget_type: "str",
+        widget: "BECConnector | str",
         row=None,
         col=0,
         rowspan=1,
         colspan=1,
         shift: "Literal['down', 'up', 'left', 'right']" = "down",
-    ):
+    ) -> "BECConnector":
         """
         Add a widget to the dock.
 
         Args:
-            widget_type(str): The widget to add. Only BEC RPC widgets from RPCWidgetHandler are allowed.
+            widget(QWidget): The widget to add.
             row(int): The row to add the widget to. If None, the widget will be added to the next available row.
             col(int): The column to add the widget to.
             rowspan(int): The number of rows the widget should span.
@@ -1528,6 +1538,16 @@ class BECDock(RPCBase):
 
 
 class BECDockArea(RPCBase, BECGuiClientMixin):
+    @property
+    @rpc_call
+    def config_dict(self) -> "dict":
+        """
+        Get the configuration of the widget.
+
+        Returns:
+            dict: The configuration of the widget.
+        """
+
     @property
     @rpc_call
     def panels(self) -> "dict":
@@ -1631,6 +1651,16 @@ class BECDockArea(RPCBase, BECGuiClientMixin):
         Get all registered RPC objects.
         """
 
+    @property
+    @rpc_call
+    def temp_areas(self) -> "list":
+        """
+        Get the temporary areas in the dock area.
+
+        Returns:
+            list: The temporary areas in the dock area.
+        """
+
 
 class SpiralProgressBar(RPCBase):
     @rpc_call
@@ -1860,7 +1890,7 @@ class Ring(RPCBase):
         """
 
     @rpc_call
-    def set_min_max_values(self, min_value: "int", max_value: "int"):
+    def set_min_max_values(self, min_value: "int | float", max_value: "int | float"):
         """
         None
         """
@@ -1872,9 +1902,13 @@ class Ring(RPCBase):
         """
 
     @rpc_call
-    def set_connections(self, slot: "str", endpoint: "str | EndpointInfo"):
+    def set_update(self, mode: "Literal['manual', 'scan', 'device']", device: "str" = None):
         """
-        None
+        Set the update mode for the ring widget
+
+        Args:
+            mode(str): Update mode for the ring widget. Can be "manual", "scan" or "device"
+            device(str): Device name for the device readback mode, only used when mode is "device"
         """
 
     @rpc_call

bec_widgets/cli/client_utils.py

@@ -17,10 +17,13 @@ from bec_lib.utils.import_utils import isinstance_based_on_class_name, lazy_impo
 from qtpy.QtCore import QCoreApplication
 
 import bec_widgets.cli.client as client
+from bec_widgets.cli.auto_updates import AutoUpdates
 
 if TYPE_CHECKING:
     from bec_lib.device import DeviceBase
 
+    from bec_widgets.cli.client import BECDockArea, BECFigure
+
 messages = lazy_import("bec_lib.messages")
 # from bec_lib.connector import MessageObject
 MessageObject = lazy_import_from("bec_lib.connector", ("MessageObject",))
@@ -58,20 +61,67 @@ def rpc_call(func):
     return wrapper
 
 
+def _get_output(process) -> None:
+    try:
+        os.set_blocking(process.stdout.fileno(), False)
+        os.set_blocking(process.stderr.fileno(), False)
+        while process.poll() is None:
+            readylist, _, _ = select.select([process.stdout, process.stderr], [], [], 1)
+            if process.stdout in readylist:
+                output = process.stdout.read(1024)
+                if output:
+                    print(output, end="")
+            if process.stderr in readylist:
+                error_output = process.stderr.read(1024)
+                if error_output:
+                    print(error_output, end="", file=sys.stderr)
+    except Exception as e:
+        print(f"Error reading process output: {str(e)}")
+
+
+def _start_plot_process(gui_id, gui_class, config) -> None:
+    """
+    Start the plot in a new process.
+    """
+    # pylint: disable=subprocess-run-check
+    monitor_module = importlib.import_module("bec_widgets.cli.server")
+    monitor_path = monitor_module.__file__
+
+    command = [
+        sys.executable,
+        "-u",
+        monitor_path,
+        "--id",
+        gui_id,
+        "--config",
+        config,
+        "--gui_class",
+        gui_class.__name__,
+    ]
+    process = subprocess.Popen(command, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    process_output_processing_thread = threading.Thread(target=_get_output, args=(process,))
+    process_output_processing_thread.start()
+    return process, process_output_processing_thread
+
+
 class BECGuiClientMixin:
     def __init__(self, **kwargs) -> None:
         super().__init__(**kwargs)
         self._process = None
-        self.update_script = self._get_update_script()
+        self._process_output_processing_thread = None
+        self.auto_updates = self._get_update_script()
         self._target_endpoint = MessageEndpoints.scan_status()
         self._selected_device = None
         self.stderr_output = []
 
-    def _get_update_script(self) -> AutoUpdates:
+    def _get_update_script(self) -> AutoUpdates | None:
         eps = imd.entry_points(group="bec.widgets.auto_updates")
         for ep in eps:
             if ep.name == "plugin_widgets_update":
-                return ep.load()(figure=self)
+                try:
+                    return ep.load()(gui=self)
+                except Exception as e:
+                    print(f"Error loading auto update script from plugin: {str(e)}")
         return None
 
     @property
@@ -97,7 +147,7 @@ class BECGuiClientMixin:
 
     @staticmethod
     def _handle_msg_update(msg: MessageObject, parent: BECGuiClientMixin) -> None:
-        if parent.update_script is not None:
+        if parent.auto_updates is not None:
             # pylint: disable=protected-access
             parent._update_script_msg_parser(msg.value)
 
@@ -105,14 +155,17 @@ class BECGuiClientMixin:
         if isinstance(msg, messages.ScanStatusMessage):
             if not self.gui_is_alive():
                 return
-            self.update_script.run(msg)
+            self.auto_updates.run(msg)
 
     def show(self) -> None:
         """
         Show the figure.
         """
         if self._process is None or self._process.poll() is not None:
-            self._start_plot_process()
+            self._start_update_script()
+            self._process, self._process_output_processing_thread = _start_plot_process(
+                self._gui_id, self.__class__, self._client._service_config.redis
+            )
         while not self.gui_is_alive():
             print("Waiting for GUI to start...")
             time.sleep(1)
@@ -132,34 +185,6 @@ class BECGuiClientMixin:
         self._process = None
         self._client.shutdown()
 
-    def _start_plot_process(self) -> None:
-        """
-        Start the plot in a new process.
-        """
-        self._start_update_script()
-        # pylint: disable=subprocess-run-check
-        config = self._client._service_config.redis
-        monitor_module = importlib.import_module("bec_widgets.cli.server")
-        monitor_path = monitor_module.__file__
-        gui_class = self.__class__.__name__
-
-        command = [
-            sys.executable,
-            "-u",
-            monitor_path,
-            "--id",
-            self._gui_id,
-            "--config",
-            config,
-            "--gui_class",
-            gui_class,
-        ]
-        self._process = subprocess.Popen(
-            command, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
-        )
-        self._process_output_processing_thread = threading.Thread(target=self._get_output)
-        self._process_output_processing_thread.start()
-
     def print_log(self) -> None:
         """
         Print the log of the plot process.
@@ -170,26 +195,6 @@ class BECGuiClientMixin:
         # Flush list
         self.stderr_output.clear()
 
-    def _get_output(self) -> str:
-        try:
-            os.set_blocking(self._process.stdout.fileno(), False)
-            os.set_blocking(self._process.stderr.fileno(), False)
-            while self._process.poll() is None:
-                readylist, _, _ = select.select(
-                    [self._process.stdout, self._process.stderr], [], [], 1
-                )
-                if self._process.stdout in readylist:
-                    output = self._process.stdout.read(1024)
-                    if output:
-                        print(output, end="")
-                if self._process.stderr in readylist:
-                    error_output = self._process.stderr.read(1024)
-                    if error_output:
-                        print(error_output, end="", file=sys.stderr)
-                        self.stderr_output.append(error_output)
-        except Exception as e:
-            print(f"Error reading process output: {str(e)}")
-
 
 class RPCResponseTimeoutError(Exception):
     """Exception raised when an RPC response is not received within the expected time."""

bec_widgets/examples/eiger_plot/eiger_plot.py

@@ -1,307 +0,0 @@
-import json
-import os
-import threading
-
-import h5py
-import numpy as np
-import pyqtgraph as pg
-import zmq
-from pyqtgraph.Qt import uic
-from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
-from qtpy.QtGui import QKeySequence
-from qtpy.QtWidgets import QDialog, QFileDialog, QFrame, QLabel, QShortcut, QVBoxLayout, QWidget
-
-# from scipy.stats import multivariate_normal
-
-
-class EigerPlot(QWidget):
-    update_signal = pyqtSignal()
-
-    def __init__(self, parent=None):
-        super().__init__(parent)
-        # pg.setConfigOptions(background="w", foreground="k", antialias=True)
-
-        current_path = os.path.dirname(__file__)
-        uic.loadUi(os.path.join(current_path, "eiger_plot.ui"), self)
-
-        # Set widow name
-        self.setWindowTitle("Eiger Plot")
-
-        self.hist_lims = None
-        self.mask = None
-        self.image = None
-
-        # UI
-        self.init_ui()
-        self.hook_signals()
-        self.key_bindings()
-
-        # ZMQ Consumer
-        self._zmq_consumer_exit_event = threading.Event()
-        self._zmq_consumer_thread = self.start_zmq_consumer()
-
-    def close(self):
-        super().close()
-        self._zmq_consumer_exit_event.set()
-        self._zmq_consumer_thread.join()
-
-    def init_ui(self):
-        # Create Plot and add ImageItem
-        self.plot_item = pg.PlotItem()
-        self.plot_item.setAspectLocked(True)
-        self.imageItem = pg.ImageItem()
-        self.plot_item.addItem(self.imageItem)
-
-        # Setting up histogram
-        self.hist = pg.HistogramLUTItem()
-        self.hist.setImageItem(self.imageItem)
-        self.hist.gradient.loadPreset("magma")
-        self.update_hist()
-
-        # Adding Items to Graphical Layout
-        self.glw.addItem(self.plot_item)
-        self.glw.addItem(self.hist)
-
-    def hook_signals(self):
-        # Buttons
-        # self.pushButton_test.clicked.connect(self.start_sim_stream)
-        self.pushButton_mask.clicked.connect(self.load_mask_dialog)
-        self.pushButton_delete_mask.clicked.connect(self.delete_mask)
-        self.pushButton_help.clicked.connect(self.show_help_dialog)
-
-        # SpinBoxes
-        self.doubleSpinBox_hist_min.valueChanged.connect(self.update_hist)
-        self.doubleSpinBox_hist_max.valueChanged.connect(self.update_hist)
-
-        # Signal/Slots
-        self.update_signal.connect(self.on_image_update)
-
-    def key_bindings(self):
-        # Key bindings for rotation
-        rotate_plus = QShortcut(QKeySequence("Ctrl+A"), self)
-        rotate_minus = QShortcut(QKeySequence("Ctrl+Z"), self)
-        self.comboBox_rotation.setToolTip("Increase rotation: Ctrl+A\nDecrease rotation: Ctrl+Z")
-        self.checkBox_transpose.setToolTip("Toggle transpose: Ctrl+T")
-
-        max_index = self.comboBox_rotation.count() - 1  # Maximum valid index
-
-        rotate_plus.activated.connect(
-            lambda: self.comboBox_rotation.setCurrentIndex(
-                min(self.comboBox_rotation.currentIndex() + 1, max_index)
-            )
-        )
-
-        rotate_minus.activated.connect(
-            lambda: self.comboBox_rotation.setCurrentIndex(
-                max(self.comboBox_rotation.currentIndex() - 1, 0)
-            )
-        )
-
-        # Key bindings for transpose
-        transpose = QShortcut(QKeySequence("Ctrl+T"), self)
-        transpose.activated.connect(self.checkBox_transpose.toggle)
-
-        FFT = QShortcut(QKeySequence("Ctrl+F"), self)
-        FFT.activated.connect(self.checkBox_FFT.toggle)
-        self.checkBox_FFT.setToolTip("Toggle FFT: Ctrl+F")
-
-        log = QShortcut(QKeySequence("Ctrl+L"), self)
-        log.activated.connect(self.checkBox_log.toggle)
-        self.checkBox_log.setToolTip("Toggle log: Ctrl+L")
-
-        mask = QShortcut(QKeySequence("Ctrl+M"), self)
-        mask.activated.connect(self.pushButton_mask.click)
-        self.pushButton_mask.setToolTip("Load mask: Ctrl+M")
-
-        delete_mask = QShortcut(QKeySequence("Ctrl+D"), self)
-        delete_mask.activated.connect(self.pushButton_delete_mask.click)
-        self.pushButton_delete_mask.setToolTip("Delete mask: Ctrl+D")
-
-    def update_hist(self):
-        self.hist_levels = [
-            self.doubleSpinBox_hist_min.value(),
-            self.doubleSpinBox_hist_max.value(),
-        ]
-        self.hist.setLevels(min=self.hist_levels[0], max=self.hist_levels[1])
-        self.hist.setHistogramRange(
-            self.hist_levels[0] - 0.1 * self.hist_levels[0],
-            self.hist_levels[1] + 0.1 * self.hist_levels[1],
-        )
-
-    def load_mask_dialog(self):
-        options = QFileDialog.Options()
-        options |= QFileDialog.ReadOnly
-        file_name, _ = QFileDialog.getOpenFileName(
-            self, "Select Mask File", "", "H5 Files (*.h5);;All Files (*)", options=options
-        )
-        if file_name:
-            self.load_mask(file_name)
-
-    def load_mask(self, path):
-        try:
-            with h5py.File(path, "r") as f:
-                self.mask = f["data"][...]
-            if self.mask is not None:
-                # Set label to mask name without path
-                self.label_mask.setText(os.path.basename(path))
-        except KeyError as e:
-            # Update GUI with the error message
-            print(f"Error: {str(e)}")
-
-    def delete_mask(self):
-        self.mask = None
-        self.label_mask.setText("No Mask")
-
-    @pyqtSlot()
-    def on_image_update(self):
-        # TODO first rotate then transpose
-        if self.mask is not None:
-            # self.image = np.ma.masked_array(self.image, mask=self.mask) #TODO test if np works
-            self.image = self.image * (1 - self.mask) + 1
-
-        if self.checkBox_FFT.isChecked():
-            self.image = np.abs(np.fft.fftshift(np.fft.fft2(self.image)))
-
-        if self.comboBox_rotation.currentIndex() > 0:  # rotate
-            self.image = np.rot90(self.image, k=self.comboBox_rotation.currentIndex(), axes=(0, 1))
-
-        if self.checkBox_transpose.isChecked():  # transpose
-            self.image = np.transpose(self.image)
-
-        if self.checkBox_log.isChecked():
-            self.image = np.log10(self.image)
-
-        self.imageItem.setImage(self.image, autoLevels=False)
-
-    ###############################
-    # ZMQ Consumer
-    ###############################
-
-    def start_zmq_consumer(self):
-        consumer_thread = threading.Thread(
-            target=self.zmq_consumer, args=(self._zmq_consumer_exit_event,), daemon=True
-        )
-        consumer_thread.start()
-        return consumer_thread
-
-    def zmq_consumer(self, exit_event):
-        print("starting consumer")
-        live_stream_url = "tcp://129.129.95.38:20000"
-        receiver = zmq.Context().socket(zmq.SUB)
-        receiver.connect(live_stream_url)
-        receiver.setsockopt_string(zmq.SUBSCRIBE, "")
-
-        poller = zmq.Poller()
-        poller.register(receiver, zmq.POLLIN)
-
-        # code could be a bit simpler here, testing exit_event in
-        # 'while' condition, but like this it is easier for the
-        # 'test_zmq_consumer' test
-        while True:
-            if poller.poll(1000):  # 1s timeout
-                raw_meta, raw_data = receiver.recv_multipart(zmq.NOBLOCK)
-
-                meta = json.loads(raw_meta.decode("utf-8"))
-                self.image = np.frombuffer(raw_data, dtype=meta["type"]).reshape(meta["shape"])
-                self.update_signal.emit()
-            if exit_event.is_set():
-                break
-
-        receiver.disconnect(live_stream_url)
-
-    ###############################
-    # just simulations from here
-    ###############################
-
-    def show_help_dialog(self):
-        dialog = QDialog(self)
-        dialog.setWindowTitle("Help")
-
-        layout = QVBoxLayout()
-
-        # Key bindings section
-        layout.addWidget(QLabel("Keyboard Shortcuts:"))
-
-        key_bindings = [
-            ("Ctrl+A", "Increase rotation"),
-            ("Ctrl+Z", "Decrease rotation"),
-            ("Ctrl+T", "Toggle transpose"),
-            ("Ctrl+F", "Toggle FFT"),
-            ("Ctrl+L", "Toggle log scale"),
-            ("Ctrl+M", "Load mask"),
-            ("Ctrl+D", "Delete mask"),
-        ]
-
-        for keys, action in key_bindings:
-            layout.addWidget(QLabel(f"{keys} - {action}"))
-
-        # Separator
-        separator = QFrame()
-        separator.setFrameShape(QFrame.HLine)
-        separator.setFrameShadow(QFrame.Sunken)
-        layout.addWidget(separator)
-
-        # Histogram section
-        layout.addWidget(QLabel("Histogram:"))
-        layout.addWidget(
-            QLabel(
-                "Use the Double Spin Boxes to adjust the minimum and maximum values of the histogram."
-            )
-        )
-
-        # Another Separator
-        another_separator = QFrame()
-        another_separator.setFrameShape(QFrame.HLine)
-        another_separator.setFrameShadow(QFrame.Sunken)
-        layout.addWidget(another_separator)
-
-        # Mask section
-        layout.addWidget(QLabel("Mask:"))
-        layout.addWidget(
-            QLabel(
-                "Use 'Load Mask' to load a mask from an H5 file. 'Delete Mask' removes the current mask."
-            )
-        )
-
-        dialog.setLayout(layout)
-        dialog.exec()
-
-    ###############################
-    # just simulations from here
-    ###############################
-    # def start_sim_stream(self):
-    #     sim_stream_thread = threading.Thread(target=self.sim_stream, daemon=True)
-    #     sim_stream_thread.start()
-    #
-    # def sim_stream(self):
-    #     for i in range(100):
-    #         # Generate 100x100 image of random noise
-    #         self.image = np.random.rand(100, 100) * 0.2
-    #
-    #         # Define Gaussian parameters
-    #         x, y = np.mgrid[0:50, 0:50]
-    #         pos = np.dstack((x, y))
-    #
-    #         # Center at (25, 25) longer along y-axis
-    #         rv = multivariate_normal(mean=[25, 25], cov=[[25, 0], [0, 80]])
-    #
-    #         # Generate Gaussian in the first quadrant
-    #         gaussian_quadrant = rv.pdf(pos) * 40
-    #
-    #         # Place Gaussian in the first quadrant
-    #         self.image[0:50, 0:50] += gaussian_quadrant * 10
-    #
-    #         self.update_signal.emit()
-    #         time.sleep(0.1)
-
-
-if __name__ == "__main__":
-    import sys
-
-    from qtpy.QtWidgets import QApplication
-
-    app = QApplication(sys.argv)
-    plot = EigerPlot()
-    plot.show()
-    sys.exit(app.exec())

bec_widgets/examples/eiger_plot/eiger_plot.ui

@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>874</width>
-    <height>762</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QGroupBox" name="groupBox">
-       <property name="title">
-        <string>Plot Control</string>
-       </property>
-       <layout class="QGridLayout" name="gridLayout">
-        <item row="0" column="0">
-         <widget class="QLabel" name="label">
-          <property name="text">
-           <string>Histogram MIN</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="QDoubleSpinBox" name="doubleSpinBox_hist_min">
-          <property name="minimum">
-           <double>-100000.000000000000000</double>
-          </property>
-          <property name="maximum">
-           <double>100000.000000000000000</double>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="label_2">
-          <property name="text">
-           <string>Histogram MAX</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="QDoubleSpinBox" name="doubleSpinBox_hist_max">
-          <property name="minimum">
-           <double>-100000.000000000000000</double>
-          </property>
-          <property name="maximum">
-           <double>100000.000000000000000</double>
-          </property>
-          <property name="value">
-           <double>2.000000000000000</double>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <item>
-      <widget class="QGroupBox" name="groupBox_2">
-       <property name="title">
-        <string>Data Control</string>
-       </property>
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <item>
-         <widget class="QCheckBox" name="checkBox_FFT">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="text">
-           <string>FFT</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="checkBox_log">
-          <property name="text">
-           <string>log</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pushButton_mask">
-          <property name="text">
-           <string>Load Mask</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pushButton_delete_mask">
-          <property name="text">
-           <string>Delete Mask</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <item>
-      <widget class="QGroupBox" name="groupBox_3">
-       <property name="title">
-        <string>Orientation</string>
-       </property>
-       <layout class="QGridLayout" name="gridLayout_2">
-        <item row="2" column="1">
-         <widget class="QComboBox" name="comboBox_rotation">
-          <item>
-           <property name="text">
-            <string>0</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>90</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>180</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>270</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="label_3">
-          <property name="text">
-           <string>Rotation</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="0" colspan="2">
-         <widget class="QCheckBox" name="checkBox_transpose">
-          <property name="text">
-           <string>Transpose</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <item>
-      <widget class="QGroupBox" name="groupBox_4">
-       <property name="title">
-        <string>Help</string>
-       </property>
-       <layout class="QVBoxLayout" name="verticalLayout_3">
-        <item>
-         <widget class="QLabel" name="label_mask">
-          <property name="text">
-           <string>No Mask</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pushButton_help">
-          <property name="text">
-           <string>Help</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="GraphicsLayoutWidget" name="glw"/>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>GraphicsLayoutWidget</class>
-   <extends>QGraphicsView</extends>
-   <header>pyqtgraph.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

bec_widgets/examples/jupyter_console/jupyter_console_window.py

@@ -2,35 +2,32 @@ import os
 
 import numpy as np
 import pyqtgraph as pg
-from pyqtgraph.Qt import QtWidgets, uic
+import qdarktheme
 from qtconsole.inprocess import QtInProcessKernelManager
 from qtconsole.rich_jupyter_widget import RichJupyterWidget
 from qtpy.QtCore import QSize
 from qtpy.QtGui import QIcon
 from qtpy.QtWidgets import QApplication, QVBoxLayout, QWidget
 
-from bec_widgets.cli.rpc_register import RPCRegister
-from bec_widgets.utils import BECDispatcher
+from bec_widgets.utils import BECDispatcher, UILoader
 from bec_widgets.widgets import BECFigure
 from bec_widgets.widgets.dock.dock_area import BECDockArea
-from bec_widgets.widgets.spiral_progress_bar.spiral_progress_bar import SpiralProgressBar
+from bec_widgets.widgets.jupyter_console.jupyter_console import BECJupyterConsole
 
-
-class JupyterConsoleWidget(RichJupyterWidget):  # pragma: no cover:
-    def __init__(self):
-        super().__init__()
-
-        self.kernel_manager = QtInProcessKernelManager()
-        self.kernel_manager.start_kernel(show_banner=False)
-        self.kernel_client = self.kernel_manager.client()
-        self.kernel_client.start_channels()
-
-        self.kernel_manager.kernel.shell.push({"np": np, "pg": pg})
-        # self.set_console_font_size(70)
-
-    def shutdown_kernel(self):
-        self.kernel_client.stop_channels()
-        self.kernel_manager.shutdown_kernel()
+# class JupyterConsoleWidget(RichJupyterWidget):  # pragma: no cover:
+#     def __init__(self):
+#         super().__init__()
+#
+#         self.kernel_manager = QtInProcessKernelManager()
+#         self.kernel_manager.start_kernel(show_banner=False)
+#         self.kernel_client = self.kernel_manager.client()
+#         self.kernel_client.start_channels()
+#
+#         self.kernel_manager.kernel.shell.push({"np": np, "pg": pg})
+#
+#     def shutdown_kernel(self):
+#         self.kernel_client.stop_channels()
+#         self.kernel_manager.shutdown_kernel()
 
 
 class JupyterConsoleWindow(QWidget):  # pragma: no cover:
@@ -40,46 +37,41 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
         super().__init__(parent)
 
         current_path = os.path.dirname(__file__)
-        uic.loadUi(os.path.join(current_path, "jupyter_console_window.ui"), self)
+        self.ui = UILoader().load_ui(os.path.join(current_path, "jupyter_console_window.ui"), self)
 
         self._init_ui()
 
-        self.splitter.setSizes([200, 100])
+        self.ui.splitter.setSizes([200, 100])
         self.safe_close = False
-        # self.figure.clean_signal.connect(self.confirm_close)
-
-        self.register = RPCRegister()
-        self.register.add_rpc(self.figure)
 
         # console push
-        self.console.kernel_manager.kernel.shell.push(
-            {
-                "fig": self.figure,
-                "register": self.register,
-                "dock": self.dock,
-                "w1": self.w1,
-                "w2": self.w2,
-                "w3": self.w3,
-                "d1": self.d1,
-                "d2": self.d2,
-                "d3": self.d3,
-                "bar": self.bar,
-                "b2a": self.button_2_a,
-                "b2b": self.button_2_b,
-                "b2c": self.button_2_c,
-                "bec": self.figure.client,
-                "scans": self.figure.client.scans,
-                "dev": self.figure.client.device_manager.devices,
-            }
-        )
+        if self.console.inprocess is True:
+            self.console.kernel_manager.kernel.shell.push(
+                {
+                    "np": np,
+                    "pg": pg,
+                    "fig": self.figure,
+                    "dock": self.dock,
+                    "w1": self.w1,
+                    "w2": self.w2,
+                    "w3": self.w3,
+                    "d0": self.d0,
+                    "d1": self.d1,
+                    "d2": self.d2,
+                    "fig0": self.fig0,
+                    "fig1": self.fig1,
+                    "fig2": self.fig2,
+                    "bar": self.bar,
+                }
+            )
 
     def _init_ui(self):
         # Plotting window
-        self.glw_1_layout = QVBoxLayout(self.glw)  # Create a new QVBoxLayout
+        self.glw_1_layout = QVBoxLayout(self.ui.glw)  # Create a new QVBoxLayout
         self.figure = BECFigure(parent=self, gui_id="remote")  # Create a new BECDeviceMonitor
         self.glw_1_layout.addWidget(self.figure)  # Add BECDeviceMonitor to the layout
 
-        self.dock_layout = QVBoxLayout(self.dock_placeholder)
+        self.dock_layout = QVBoxLayout(self.ui.dock_placeholder)
         self.dock = BECDockArea(gui_id="remote")
         self.dock_layout.addWidget(self.dock)
 
@@ -89,10 +81,9 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
         # init dock for testing
         self._init_dock()
 
-        self.console_layout = QVBoxLayout(self.widget_console)
-        self.console = JupyterConsoleWidget()
+        self.console_layout = QVBoxLayout(self.ui.widget_console)
+        self.console = BECJupyterConsole(inprocess=True)
         self.console_layout.addWidget(self.console)
-        self.console.set_default_style("linux")
 
     def _init_figure(self):
         self.figure.plot(x_name="samx", y_name="bpm4d")
@@ -111,25 +102,22 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
         self.c1 = self.w1.get_config()
 
     def _init_dock(self):
-        self.button_1 = QtWidgets.QPushButton("Button 1 ")
-        self.button_2_a = QtWidgets.QPushButton("Button to be added at place 0,0 in d3")
-        self.button_2_b = QtWidgets.QPushButton("button after without postions specified")
-        self.button_2_c = QtWidgets.QPushButton("button super late")
-        self.button_3 = QtWidgets.QPushButton("Button above Figure ")
-        self.bar = SpiralProgressBar()
 
-        self.label_2 = QtWidgets.QLabel("label which is added separately")
-        self.label_3 = QtWidgets.QLabel("Label above figure")
+        self.d0 = self.dock.add_dock(name="dock_0")
+        self.fig0 = self.d0.add_widget("BECFigure")
+        self.fig0.image("eiger", vrange=(0, 100))
 
-        self.d1 = self.dock.add_dock(widget=self.button_1, position="left")
-        self.d1.addWidget(self.label_2)
-        self.d2 = self.dock.add_dock(widget=self.bar, position="right")
-        self.d3 = self.dock.add_dock(name="figure")
-        self.fig_dock3 = BECFigure()
-        self.fig_dock3.plot(x_name="samx", y_name="bpm4d")
-        self.d3.add_widget(self.label_3)
-        self.d3.add_widget(self.button_3)
-        self.d3.add_widget(self.fig_dock3)
+        self.d1 = self.dock.add_dock(name="dock_1", position="right")
+        self.fig1 = self.d1.add_widget("BECFigure")
+        self.fig1.plot(x_name="samx", y_name="bpm4i")
+        self.fig1.plot(x_name="samx", y_name="bpm3a")
+
+        self.d2 = self.dock.add_dock(name="dock_2", position="bottom")
+        self.fig2 = self.d2.add_widget("BECFigure", row=0, col=0)
+        self.fig2.motor_map(x_name="samx", y_name="samy")
+        self.fig2.plot(x_name="samx", y_name="bpm4i")
+        self.bar = self.d2.add_widget("SpiralProgressBar", row=0, col=1)
+        self.bar.set_diameter(200)
 
         self.dock.save_state()
 
@@ -155,6 +143,7 @@ if __name__ == "__main__":  # pragma: no cover
     app = QApplication(sys.argv)
     app.setApplicationName("Jupyter Console")
     app.setApplicationDisplayName("Jupyter Console")
+    # qdarktheme.setup_theme("auto")
     icon = QIcon()
     icon.addFile(os.path.join(module_path, "assets", "terminal_icon.png"), size=QSize(48, 48))
     app.setWindowIcon(icon)

bec_widgets/examples/mca_readout/mca_plot.py

@@ -1,159 +0,0 @@
-# import simulation_progress as SP
-import numpy as np
-import pyqtgraph as pg
-from bec_lib import messages
-from bec_lib.endpoints import MessageEndpoints
-from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
-from qtpy.QtWidgets import QApplication, QVBoxLayout, QWidget
-
-
-class StreamApp(QWidget):
-    update_signal = pyqtSignal()
-    new_scan_id = pyqtSignal(str)
-
-    def __init__(self, device, sub_device):
-        super().__init__()
-        pg.setConfigOptions(background="w", foreground="k")
-        self.init_ui()
-
-        self.setWindowTitle("MCA readout")
-
-        self.data = None
-        self.scan_id = None
-        self.stream_consumer = None
-
-        self.device = device
-        self.sub_device = sub_device
-
-        self.start_device_consumer()
-
-        # self.start_device_consumer(self.device)  # for simulation
-
-        self.new_scan_id.connect(self.create_new_stream_consumer)
-        self.update_signal.connect(self.plot_new)
-
-    def init_ui(self):
-        # Create layout and add widgets
-        self.layout = QVBoxLayout()
-        self.setLayout(self.layout)
-
-        # Create plot
-        self.glw = pg.GraphicsLayoutWidget()
-        self.layout.addWidget(self.glw)
-
-        # Create Plot and add ImageItem
-        self.plot_item = pg.PlotItem()
-        self.plot_item.setAspectLocked(False)
-        self.imageItem = pg.ImageItem()
-        # self.plot_item1D = pg.PlotItem()
-        # self.plot_item.addItem(self.imageItem)
-        # self.plot_item.addItem(self.plot_item1D)
-
-        # Setting up histogram
-        # self.hist = pg.HistogramLUTItem()
-        # self.hist.setImageItem(self.imageItem)
-        # self.hist.gradient.loadPreset("magma")
-        # self.update_hist()
-
-        # Adding Items to Graphical Layout
-        self.glw.addItem(self.plot_item)
-        # self.glw.addItem(self.hist)
-
-    @pyqtSlot(str)
-    def create_new_stream_consumer(self, scan_id: str):
-        print(f"Creating new stream consumer for scan_id: {scan_id}")
-
-        self.connect_stream_consumer(scan_id, self.device)
-
-    def connect_stream_consumer(self, scan_id, device):
-        if self.stream_consumer is not None:
-            self.stream_consumer.shutdown()
-
-        self.stream_consumer = connector.stream_consumer(
-            topics=MessageEndpoints.device_async_readback(scan_id=scan_id, device=device),
-            cb=self._streamer_cb,
-            parent=self,
-        )
-
-        self.stream_consumer.start()
-
-    def start_device_consumer(self):
-        self.device_consumer = connector.consumer(
-            topics=MessageEndpoints.scan_status(), cb=self._device_cv, parent=self
-        )
-
-        self.device_consumer.start()
-
-    # def start_device_consumer(self, device): #for simulation
-    #     self.device_consumer = connector.consumer(
-    #         topics=MessageEndpoints.device_status(device), cb=self._device_cv, parent=self
-    #     )
-    #
-    #     self.device_consumer.start()
-
-    def plot_new(self):
-        print(f"Printing data from plot update: {self.data}")
-        self.plot_item.plot(self.data[0])
-        # self.imageItem.setImage(self.data, autoLevels=False)
-
-    @staticmethod
-    def _streamer_cb(msg, *, parent, **_kwargs) -> None:
-        msgMCS = msg.value
-        print(msgMCS)
-        row = msgMCS.content["signals"][parent.sub_device]
-        metadata = msgMCS.metadata
-
-        # Check if the current number of rows is odd
-        # if parent.data is not None and parent.data.shape[0] % 2 == 1:
-        #     row = np.flip(row)  # Flip the row
-        print(f"Printing data from callback update: {row}")
-        parent.data = np.array([row])
-        # if parent.data is None:
-        #     parent.data = np.array([row])
-        # else:
-        #     parent.data = np.vstack((parent.data, row))
-
-        parent.update_signal.emit()
-
-    @staticmethod
-    def _device_cv(msg, *, parent, **_kwargs) -> None:
-        print("Getting ScanID")
-
-        msgDEV = msg.value
-
-        current_scan_id = msgDEV.content["scan_id"]
-
-        if parent.scan_id is None:
-            parent.scan_id = current_scan_id
-            parent.new_scan_id.emit(current_scan_id)
-            print(f"New scan_id: {current_scan_id}")
-
-        if current_scan_id != parent.scan_id:
-            parent.scan_id = current_scan_id
-            # parent.data = None
-            # parent.imageItem.clear()
-            parent.new_scan_id.emit(current_scan_id)
-
-            print(f"New scan_id: {current_scan_id}")
-
-
-if __name__ == "__main__":
-    import argparse
-
-    from bec_lib.redis_connector import RedisConnector
-
-    parser = argparse.ArgumentParser(description="Stream App.")
-    parser.add_argument("--port", type=str, default="pc15543:6379", help="Port for RedisConnector")
-    parser.add_argument("--device", type=str, default="mcs", help="Device name")
-    parser.add_argument("--sub_device", type=str, default="mca4", help="Sub-device name")
-
-    args = parser.parse_args()
-
-    connector = RedisConnector(args.port)
-
-    app = QApplication([])
-    streamApp = StreamApp(device=args.device, sub_device=args.sub_device)
-
-    streamApp.show()
-    app.exec()

bec_widgets/examples/mca_readout/mca_sim.py

@@ -1,28 +0,0 @@
-import time
-
-from bec_lib import messages
-from bec_lib.endpoints import MessageEndpoints
-from bec_lib.redis_connector import RedisConnector
-
-connector = RedisConnector("localhost:6379")
-metadata = {}
-
-scan_id = "ScanID1"
-
-metadata.update(
-    {"scan_id": scan_id, "async_update": "append"}  # this will be different for each scan
-)
-for ii in range(20):
-    data = {"mca1": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], "mca2": [10, 9, 8, 7, 6, 5, 4, 3, 2, 1]}
-    msg = messages.DeviceMessage(signals=data, metadata=metadata).dumps()
-
-    connector.xadd(
-        topic=MessageEndpoints.device_async_readback(
-            scan_id=scan_id, device="mca"
-        ),  # scan_id will be different for each scan
-        msg={"data": msg},  # TODO should be msg_dict
-        expire=1800,
-    )
-
-    print(f"Sent {ii}")
-    time.sleep(0.5)

bec_widgets/examples/modular_app/modular.ui

@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>1433</width>
-    <height>689</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>MainWindow</string>
-  </property>
-  <widget class="QWidget" name="centralwidget">
-   <layout class="QGridLayout" name="gridLayout">
-    <item row="1" column="2">
-     <widget class="QLabel" name="label_3">
-      <property name="text">
-       <string>Plot  Config 2</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="0" colspan="2">
-     <widget class="BECMonitor" name="plot_1"/>
-    </item>
-    <item row="1" column="3">
-     <widget class="QPushButton" name="pushButton_setting_2">
-      <property name="text">
-       <string>Setting Plot 2</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="2" colspan="2">
-     <widget class="BECMonitor" name="plot_2"/>
-    </item>
-    <item row="1" column="4">
-     <widget class="QLabel" name="label_2">
-      <property name="text">
-       <string>Plot Scan Types = True</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="1">
-     <widget class="QPushButton" name="pushButton_setting_1">
-      <property name="text">
-       <string>Setting Plot 1</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="0">
-     <widget class="QLabel" name="label">
-      <property name="text">
-       <string>Plot Config 1</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="5">
-     <widget class="QPushButton" name="pushButton_setting_3">
-      <property name="text">
-       <string>Setting Plot 3</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="4" colspan="2">
-     <widget class="BECMonitor" name="plot_3"/>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QMenuBar" name="menubar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>1433</width>
-     <height>37</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QStatusBar" name="statusbar"/>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>BECMonitor</class>
-   <extends>QGraphicsView</extends>
-   <header location="global">bec_widgets.widgets.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

bec_widgets/examples/modular_app/modular_app.py

@@ -1,197 +0,0 @@
-import os
-
-from qtpy import uic
-from qtpy.QtWidgets import QApplication, QMainWindow
-
-from bec_widgets.utils.bec_dispatcher import BECDispatcher
-from bec_widgets.widgets import BECMonitor
-
-# some default configs for demonstration purposes
-CONFIG_SIMPLE = {
-    "plot_settings": {
-        "background_color": "black",
-        "num_columns": 2,
-        "colormap": "plasma",
-        "scan_types": False,
-    },
-    "plot_data": [
-        {
-            "plot_name": "BPM4i plots vs samx",
-            "x_label": "Motor X",
-            "y_label": "bpm4i",
-            "sources": [
-                {
-                    "type": "scan_segment",
-                    "signals": {
-                        "x": [{"name": "samx"}],
-                        "y": [{"name": "bpm4i", "entry": "bpm4i"}],
-                    },
-                },
-                # {
-                #     "type": "history",
-                #     "signals": {
-                #         "x": [{"name": "samx"}],
-                #         "y": [{"name": "bpm4i", "entry": "bpm4i"}],
-                #     },
-                # },
-                # {
-                #     "type": "dap",
-                #     'worker':'some_worker',
-                #     "signals": {
-                #         "x": [{"name": "samx"}],
-                #         "y": [{"name": "bpm4i", "entry": "bpm4i"}],
-                #     },
-                # },
-            ],
-        },
-        {
-            "plot_name": "Gauss plots vs samx",
-            "x_label": "Motor X",
-            "y_label": "Gauss",
-            "sources": [
-                {
-                    "type": "scan_segment",
-                    "signals": {
-                        "x": [{"name": "samx", "entry": "samx"}],
-                        "y": [{"name": "gauss_bpm"}, {"name": "gauss_adc1"}],
-                    },
-                }
-            ],
-        },
-    ],
-}
-
-
-CONFIG_SCAN_MODE = {
-    "plot_settings": {
-        "background_color": "white",
-        "num_columns": 3,
-        "colormap": "plasma",
-        "scan_types": True,
-    },
-    "plot_data": {
-        "grid_scan": [
-            {
-                "plot_name": "Grid plot 1",
-                "x_label": "Motor X",
-                "y_label": "BPM",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {
-                            "x": [{"name": "samx", "entry": "samx"}],
-                            "y": [{"name": "gauss_bpm"}],
-                        },
-                    }
-                ],
-            },
-            {
-                "plot_name": "Grid plot 2",
-                "x_label": "Motor X",
-                "y_label": "BPM",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {
-                            "x": [{"name": "samx", "entry": "samx"}],
-                            "y": [{"name": "gauss_adc1"}],
-                        },
-                    }
-                ],
-            },
-            {
-                "plot_name": "Grid plot 3",
-                "x_label": "Motor X",
-                "y_label": "BPM",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {"x": [{"name": "samy"}], "y": [{"name": "gauss_adc2"}]},
-                    }
-                ],
-            },
-            {
-                "plot_name": "Grid plot 4",
-                "x_label": "Motor X",
-                "y_label": "BPM",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {
-                            "x": [{"name": "samy", "entry": "samy"}],
-                            "y": [{"name": "gauss_adc3"}],
-                        },
-                    }
-                ],
-            },
-        ],
-        "line_scan": [
-            {
-                "plot_name": "BPM plots vs samx",
-                "x_label": "Motor X",
-                "y_label": "Gauss",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {
-                            "x": [{"name": "samx", "entry": "samx"}],
-                            "y": [{"name": "bpm4i"}],
-                        },
-                    }
-                ],
-            },
-            {
-                "plot_name": "Gauss plots vs samx",
-                "x_label": "Motor X",
-                "y_label": "Gauss",
-                "sources": [
-                    {
-                        "type": "scan_segment",
-                        "signals": {
-                            "x": [{"name": "samx", "entry": "samx"}],
-                            "y": [{"name": "gauss_bpm"}, {"name": "gauss_adc1"}],
-                        },
-                    }
-                ],
-            },
-        ],
-    },
-}
-
-
-class ModularApp(QMainWindow):
-    def __init__(self, client=None, parent=None):
-        super(ModularApp, self).__init__(parent)
-
-        # Client and device manager from BEC
-        self.client = BECDispatcher().client if client is None else client
-
-        # Loading UI
-        current_path = os.path.dirname(__file__)
-        uic.loadUi(os.path.join(current_path, "modular.ui"), self)
-
-        self._init_plots()
-
-    def _init_plots(self):
-        """Initialize plots and connect the buttons to the config dialogs"""
-        plots = [self.plot_1, self.plot_2, self.plot_3]
-        configs = [CONFIG_SIMPLE, CONFIG_SCAN_MODE, CONFIG_SCAN_MODE]
-        buttons = [self.pushButton_setting_1, self.pushButton_setting_2, self.pushButton_setting_3]
-
-        # hook plots, configs and buttons together
-        for plot, config, button in zip(plots, configs, buttons):
-            plot.on_config_update(config)
-            button.clicked.connect(plot.show_config_dialog)
-
-
-if __name__ == "__main__":
-    # BECclient global variables
-    client = BECDispatcher().client
-    client.start()
-
-    app = QApplication([])
-    modularApp = ModularApp(client=client)
-
-    window = modularApp
-    window.show()
-    app.exec()

bec_widgets/examples/motor_movement/config_example.yaml

@@ -1,17 +0,0 @@
-selected_motors:
-  motor_x: "samx"
-  motor_y: "samy"
-
-plot_motors:
-  max_points: 1000
-  num_dim_points: 100
-  scatter_size: 5
-  precision: 3
-  mode_lock: False # "Individual" or "Start/Stop". False to unlock
-  extra_columns:
-    - sample name: "sample 1"
-    - step_x [mu]: 25
-    - step_y [mu]: 25
-    - exp_time [s]: 1
-    - start: 1
-    - tilt [deg]: 0

bec_widgets/examples/motor_movement/csax_bec_config.yaml

@@ -1,10 +0,0 @@
-redis:
-  host: pc15543
-  port: 6379
-mongodb:
-  host: localhost
-  port: 27017
-scibec:
-  host: http://localhost
-  port: 3030
-  beamline: MyBeamline

bec_widgets/examples/motor_movement/csaxs_config.yaml

@@ -1,17 +0,0 @@
-selected_motors:
-  motor_x: "samx"
-  motor_y: "samy"
-
-plot_motors:
-  max_points: 1000
-  num_dim_points: 100
-  scatter_size: 5
-  precision: 3
-  mode_lock: Start/Stop # "Individual" or "Start/Stop"
-  extra_columns:
-    - sample name: "sample 1"
-    - step_x [mu]: 25
-    - step_y [mu]: 25
-    - exp_time [s]: 1
-    - start: 1
-    - tilt [deg]: 0

bec_widgets/examples/motor_movement/motor_control_compilations.py

@@ -151,7 +151,7 @@ class MotorControlPanel(QWidget):
         self.selection_widget.selected_motors_signal.connect(self.absolute_widget.change_motors)
 
         # Set the window to a fixed size based on its contents
-        self.layout().setSizeConstraint(layout.SetFixedSize)
+        # self.layout().setSizeConstraint(layout.SetFixedSize)
 
 
 class MotorControlPanelAbsolute(QWidget):
@@ -178,9 +178,6 @@ class MotorControlPanelAbsolute(QWidget):
         # Connecting signals and slots
         self.selection_widget.selected_motors_signal.connect(self.absolute_widget.change_motors)
 
-        # Set the window to a fixed size based on its contents
-        self.layout().setSizeConstraint(layout.SetFixedSize)
-
 
 class MotorControlPanelRelative(QWidget):
     def __init__(self, parent=None, client=None, config=None):
@@ -206,9 +203,6 @@ class MotorControlPanelRelative(QWidget):
         # Connecting signals and slots
         self.selection_widget.selected_motors_signal.connect(self.relative_widget.change_motors)
 
-        # Set the window to a fixed size based on its contents
-        self.layout().setSizeConstraint(layout.SetFixedSize)
-
 
 if __name__ == "__main__":  # pragma: no cover
     import argparse

bec_widgets/examples/stream_plot/line_plot.ui

@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>845</width>
-    <height>635</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Line Plot</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <widget class="QSplitter" name="splitter">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <widget class="QSplitter" name="splitter_plot">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-        <horstretch>1</horstretch>
-        <verstretch>1</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="orientation">
-       <enum>Qt::Vertical</enum>
-      </property>
-      <widget class="GraphicsLayoutWidget" name="glw_plot"/>
-      <widget class="GraphicsLayoutWidget" name="glw_image"/>
-     </widget>
-     <widget class="QWidget" name="">
-      <layout class="QVBoxLayout" name="verticalLayout" stretch="1,1,1,15">
-       <item>
-        <widget class="QPushButton" name="pushButton_generate">
-         <property name="text">
-          <string>Generate 1D and 2D data without stream</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="title">
-          <string>1st angle of azimutal segment (deg)</string>
-         </property>
-         <layout class="QHBoxLayout" name="horizontalLayout">
-          <item>
-           <widget class="QDoubleSpinBox" name="doubleSpinBox">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="maximum">
-             <double>360.000000000000000</double>
-            </property>
-            <property name="singleStep">
-             <double>0.250000000000000</double>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="comboBox">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <item>
-             <property name="text">
-              <string>f1amp</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>f2amp</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>f2 phase</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_2">
-         <item>
-          <widget class="QLabel" name="label">
-           <property name="text">
-            <string>Precision</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QSpinBox" name="spinBox_precision">
-           <property name="value">
-            <number>4</number>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="QTableWidget" name="cursor_table">
-         <property name="textElideMode">
-          <enum>Qt::ElideMiddle</enum>
-         </property>
-         <column>
-          <property name="text">
-           <string>Display</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>X</string>
-          </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Y</string>
-          </property>
-         </column>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>GraphicsLayoutWidget</class>
-   <extends>QGraphicsView</extends>
-   <header>pyqtgraph.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

bec_widgets/examples/stream_plot/stream_plot.py

@@ -1,337 +0,0 @@
-import os
-import threading
-import time
-
-import numpy as np
-import pyqtgraph
-import pyqtgraph as pg
-from bec_lib import messages
-from bec_lib.endpoints import MessageEndpoints
-from bec_lib.redis_connector import RedisConnector
-from pyqtgraph import mkBrush, mkPen
-from pyqtgraph.Qt import QtCore, QtWidgets, uic
-from pyqtgraph.Qt.QtCore import pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
-from qtpy.QtWidgets import QTableWidgetItem
-
-from bec_widgets.utils import Colors, Crosshair
-from bec_widgets.utils.bec_dispatcher import BECDispatcher
-
-
-class StreamPlot(QtWidgets.QWidget):
-    update_signal = pyqtSignal()
-    roi_signal = pyqtSignal(tuple)
-
-    def __init__(self, name="", y_value_list=["gauss_bpm"], client=None, parent=None) -> None:
-        """
-        Basic plot widget for displaying scan data.
-
-        Args:
-            name (str, optional): Name of the plot. Defaults to "".
-            y_value_list (list, optional): List of signals to be plotted. Defaults to ["gauss_bpm"].
-        """
-
-        # Client and device manager from BEC
-        self.client = BECDispatcher().client if client is None else client
-
-        super(StreamPlot, self).__init__()
-        # Set style for pyqtgraph plots
-        pg.setConfigOption("background", "w")
-        pg.setConfigOption("foreground", "k")
-        current_path = os.path.dirname(__file__)
-        uic.loadUi(os.path.join(current_path, "line_plot.ui"), self)
-
-        self._idle_time = 100
-        self.connector = RedisConnector(["localhost:6379"])
-
-        self.y_value_list = y_value_list
-        self.previous_y_value_list = None
-        self.plotter_data_x = []
-        self.plotter_data_y = []
-
-        self.plotter_scan_id = None
-
-        self._current_proj = None
-        self._current_metadata_ep = "px_stream/projection_{}/metadata"
-
-        self.proxy_update = pg.SignalProxy(self.update_signal, rateLimit=25, slot=self.update)
-
-        self._data_retriever_thread_exit_event = threading.Event()
-        self.data_retriever = threading.Thread(
-            target=self.on_projection, args=(self._data_retriever_thread_exit_event,), daemon=True
-        )
-        self.data_retriever.start()
-
-        ##########################
-        # UI
-        ##########################
-        self.init_ui()
-        self.init_curves()
-        self.hook_crosshair()
-
-    def close(self):
-        super().close()
-        self._data_retriever_thread_exit_event.set()
-        self.data_retriever.join()
-
-    def init_ui(self):
-        """Setup all ui elements"""
-        ##########################
-        # 1D Plot
-        ##########################
-
-        # LabelItem for ROI
-        self.label_plot = pg.LabelItem(justify="center")
-        self.glw_plot.addItem(self.label_plot)
-        self.label_plot.setText("ROI region")
-
-        # ROI selector - so far from [-1,1] #TODO update to scale with xrange
-        self.roi_selector = pg.LinearRegionItem([-1, 1])
-
-        self.glw_plot.nextRow()  # TODO update of cursor
-        self.label_plot_moved = pg.LabelItem(justify="center")
-        self.glw_plot.addItem(self.label_plot_moved)
-        self.label_plot_moved.setText("Actual coordinates (X, Y)")
-
-        # Label for coordinates clicked
-        self.glw_plot.nextRow()
-        self.label_plot_clicked = pg.LabelItem(justify="center")
-        self.glw_plot.addItem(self.label_plot_clicked)
-        self.label_plot_clicked.setText("Clicked coordinates (X, Y)")
-
-        # 1D PlotItem
-        self.glw_plot.nextRow()
-        self.plot = pg.PlotItem()
-        self.plot.setLogMode(True, True)
-        self.glw_plot.addItem(self.plot)
-        self.plot.addLegend()
-
-        ##########################
-        # 2D Plot
-        ##########################
-
-        # Label for coordinates moved
-        self.label_image_moved = pg.LabelItem(justify="center")
-        self.glw_image.addItem(self.label_image_moved)
-        self.label_image_moved.setText("Actual coordinates (X, Y)")
-
-        # Label for coordinates clicked
-        self.glw_image.nextRow()
-        self.label_image_clicked = pg.LabelItem(justify="center")
-        self.glw_image.addItem(self.label_image_clicked)
-        self.label_image_clicked.setText("Clicked coordinates (X, Y)")
-
-        # TODO try to lock aspect ratio with view
-
-        # # Create a window
-        # win = pg.GraphicsLayoutWidget()
-        # win.show()
-        #
-        # # Create a ViewBox
-        # view = win.addViewBox()
-        #
-        # # Lock the aspect ratio
-        # view.setAspectLocked(True)
-
-        # # Create an ImageItem
-        # image_item = pg.ImageItem(np.random.random((100, 100)))
-        #
-        # # Add the ImageItem to the ViewBox
-        # view.addItem(image_item)
-
-        # 2D ImageItem
-        self.glw_image.nextRow()
-        self.plot_image = pg.PlotItem()
-        self.glw_image.addItem(self.plot_image)
-
-    def init_curves(self):
-        # init of 1D plot
-        self.plot.clear()
-
-        self.curves = []
-        self.pens = []
-        self.brushs = []
-
-        self.color_list = Colors.golden_angle_color(colormap="CET-R2", num=len(self.y_value_list))
-
-        for ii, y_value in enumerate(self.y_value_list):
-            pen = mkPen(color=self.color_list[ii], width=2, style=QtCore.Qt.DashLine)
-            brush = mkBrush(color=self.color_list[ii])
-            curve = pg.PlotDataItem(symbolBrush=brush, pen=pen, skipFiniteCheck=True, name=y_value)
-            self.plot.addItem(curve)
-            self.curves.append(curve)
-            self.pens.append(pen)
-            self.brushs.append(brush)
-
-        # check if roi selector is in the plot
-        if self.roi_selector not in self.plot.items:
-            self.plot.addItem(self.roi_selector)
-
-        # init of 2D plot
-        self.plot_image.clear()
-
-        self.img = pg.ImageItem()
-        self.plot_image.addItem(self.img)
-
-        # hooking signals
-        self.hook_crosshair()
-        self.init_table()
-
-    def splitter_sizes(self): ...
-
-    def hook_crosshair(self):
-        self.crosshair_1d = Crosshair(self.plot, precision=4)
-
-        self.crosshair_1d.coordinatesChanged1D.connect(
-            lambda x, y: self.label_plot_moved.setText(f"Moved : ({x}, {y})")
-        )
-        self.crosshair_1d.coordinatesClicked1D.connect(
-            lambda x, y: self.label_plot_clicked.setText(f"Moved : ({x}, {y})")
-        )
-
-        self.crosshair_1d.coordinatesChanged1D.connect(
-            lambda x, y: self.update_table(table_widget=self.cursor_table, x=x, y_values=y)
-        )
-
-        self.crosshair_2D = Crosshair(self.plot_image)
-
-        self.crosshair_2D.coordinatesChanged2D.connect(
-            lambda x, y: self.label_image_moved.setText(f"Moved : ({x}, {y})")
-        )
-        self.crosshair_2D.coordinatesClicked2D.connect(
-            lambda x, y: self.label_image_clicked.setText(f"Moved : ({x}, {y})")
-        )
-
-        # ROI
-        self.roi_selector.sigRegionChangeFinished.connect(self.get_roi_region)
-
-    def get_roi_region(self):
-        """For testing purpose now, get roi region and print it to self.label as tuple"""
-        region = self.roi_selector.getRegion()
-        self.label_plot.setText(f"x = {(10 ** region[0]):.4f}, y ={(10 ** region[1]):.4f}")
-        return_dict = {
-            "horiz_roi": [
-                np.where(self.plotter_data_x[0] > 10 ** region[0])[0][0],
-                np.where(self.plotter_data_x[0] < 10 ** region[1])[0][-1],
-            ]
-        }
-        msg = messages.DeviceMessage(signals=return_dict).dumps()
-        self.connector.set_and_publish("px_stream/gui_event", msg=msg)
-        self.roi_signal.emit(region)
-
-    def init_table(self):
-        # Init number of rows in table according to n of devices
-        self.cursor_table.setRowCount(len(self.y_value_list))
-        # self.table.setHorizontalHeaderLabels(["(X, Y) - Moved", "(X, Y) - Clicked"]) #TODO can be dynamic
-        self.cursor_table.setVerticalHeaderLabels(self.y_value_list)
-        self.cursor_table.resizeColumnsToContents()
-
-    def update_table(self, table_widget, x, y_values):
-        for i, y in enumerate(y_values):
-            table_widget.setItem(i, 1, QTableWidgetItem(str(x)))
-            table_widget.setItem(i, 2, QTableWidgetItem(str(y)))
-            table_widget.resizeColumnsToContents()
-
-    def update(self):
-        """Update the plot with the new data."""
-
-        # check if QTable was initialised and if list of devices was changed
-        # if self.y_value_list != self.previous_y_value_list:
-        #     self.setup_cursor_table()
-        #     self.previous_y_value_list = self.y_value_list.copy() if self.y_value_list else None
-
-        self.curves[0].setData(self.plotter_data_x[0], self.plotter_data_y[0])
-
-    @staticmethod
-    def flip_even_rows(arr):
-        arr_copy = np.copy(arr)  # Create a writable copy
-        arr_copy[1::2, :] = arr_copy[1::2, ::-1]
-        return arr_copy
-
-    @staticmethod
-    def remove_curve_by_name(plot: pyqtgraph.PlotItem, name: str) -> None:
-        # def remove_curve_by_name(plot: pyqtgraph.PlotItem, checkbox: QtWidgets.QCheckBox, name: str) -> None:
-        """Removes a curve from the given plot by the specified name.
-
-        Args:
-            plot (pyqtgraph.PlotItem): The plot from which to remove the curve.
-            name (str): The name of the curve to remove.
-        """
-        # if checkbox.isChecked():
-        for item in plot.items:
-            if isinstance(item, pg.PlotDataItem) and getattr(item, "opts", {}).get("name") == name:
-                plot.removeItem(item)
-                return
-
-        # else:
-        #     return
-
-    def on_projection(self, exit_event):
-        while not exit_event.is_set():
-            if self._current_proj is None:
-                time.sleep(0.1)
-                continue
-            endpoint = f"px_stream/projection_{self._current_proj}/data"
-            msgs = self.client.connector.lrange(topic=endpoint, start=-1, end=-1)
-            data = msgs
-            if not data:
-                continue
-            with np.errstate(divide="ignore", invalid="ignore"):
-                self.plotter_data_y = [
-                    np.sum(
-                        np.sum(data[-1].content["signals"]["data"] * self._current_norm, axis=1)
-                        / np.sum(self._current_norm, axis=0),
-                        axis=0,
-                    ).squeeze()
-                ]
-
-            self.update_signal.emit()
-
-    @pyqtSlot(dict, dict)
-    def on_dap_update(self, data: dict, metadata: dict):
-        flipped_data = self.flip_even_rows(data["data"]["z"])
-
-        self.img.setImage(flipped_data)
-
-    @pyqtSlot(dict, dict)
-    def new_proj(self, content: dict, _metadata: dict):
-        proj_nr = content["signals"]["proj_nr"]
-        endpoint = f"px_stream/projection_{proj_nr}/metadata"
-        msg_raw = self.client.connector.get(topic=endpoint)
-        msg = messages.DeviceMessage.loads(msg_raw)
-        self._current_q = msg.content["signals"]["q"]
-        self._current_norm = msg.content["signals"]["norm_sum"]
-        self._current_metadata = msg.content["signals"]["metadata"]
-
-        self.plotter_data_x = [self._current_q]
-        self._current_proj = proj_nr
-
-
-if __name__ == "__main__":
-    import argparse
-
-    # from bec_widgets import ctrl_c  # TODO uncomment when ctrl_c is ready to be compatible with qtpy
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "--signals", help="specify recorded signals", nargs="+", default=["gauss_bpm"]
-    )
-    # default = ["gauss_bpm", "bpm4i", "bpm5i", "bpm6i", "xert"],
-    value = parser.parse_args()
-    print(f"Plotting signals for: {', '.join(value.signals)}")
-
-    # Client from dispatcher
-    bec_dispatcher = BECDispatcher()
-    client = bec_dispatcher.client
-
-    app = QtWidgets.QApplication([])
-    # ctrl_c.setup(app) # TODO uncomment when ctrl_c is ready to be compatible with qtpy
-    plot = StreamPlot(y_value_list=value.signals, client=client)
-
-    bec_dispatcher.connect_slot(plot.new_proj, "px_stream/proj_nr")
-    bec_dispatcher.connect_slot(
-        plot.on_dap_update, MessageEndpoints.processed_data("px_dap_worker")
-    )
-    plot.show()
-    # client.callbacks.register("scan_segment", plot, sync=False)
-    app.exec()

bec_widgets/utils/crosshair.py

@@ -8,13 +8,13 @@ from qtpy.QtCore import Signal as pyqtSignal
 
 class Crosshair(QObject):
     # Signal for 1D plot
-    coordinatesChanged1D = pyqtSignal(float, list)
-    coordinatesClicked1D = pyqtSignal(float, list)
+    coordinatesChanged1D = pyqtSignal(tuple)
+    coordinatesClicked1D = pyqtSignal(tuple)
     # Signal for 2D plot
-    coordinatesChanged2D = pyqtSignal(float, float)
-    coordinatesClicked2D = pyqtSignal(float, float)
+    coordinatesChanged2D = pyqtSignal(tuple)
+    coordinatesClicked2D = pyqtSignal(tuple)
 
-    def __init__(self, plot_item: pg.PlotItem, precision: int = None, parent=None):
+    def __init__(self, plot_item: pg.PlotItem, precision: int = 3, parent=None):
         """
         Crosshair for 1D and 2D plots.
 
@@ -174,10 +174,11 @@ class Crosshair(QObject):
                 if isinstance(item, pg.PlotDataItem):
                     if x is None or all(v is None for v in y_values):
                         return
-                    self.coordinatesChanged1D.emit(
+                    coordinate_to_emit = (
                         round(x, self.precision),
                         [round(y_val, self.precision) for y_val in y_values],
                     )
+                    self.coordinatesChanged1D.emit(coordinate_to_emit)
                     for i, y_val in enumerate(y_values):
                         self.marker_moved_1d[i].setData(
                             [x if not self.is_log_x else np.log10(x)],
@@ -186,7 +187,8 @@ class Crosshair(QObject):
                 elif isinstance(item, pg.ImageItem):
                     if x is None or y_values is None:
                         return
-                    self.coordinatesChanged2D.emit(x, y_values)
+                    coordinate_to_emit = (x, y_values)
+                    self.coordinatesChanged2D.emit(coordinate_to_emit)
 
     def mouse_clicked(self, event):
         """Handles the mouse clicked event, updating the crosshair position and emitting signals.
@@ -209,10 +211,11 @@ class Crosshair(QObject):
                 if isinstance(item, pg.PlotDataItem):
                     if x is None or all(v is None for v in y_values):
                         return
-                    self.coordinatesClicked1D.emit(
+                    coordinate_to_emit = (
                         round(x, self.precision),
                         [round(y_val, self.precision) for y_val in y_values],
                     )
+                    self.coordinatesClicked1D.emit(coordinate_to_emit)
                     for i, y_val in enumerate(y_values):
                         for marker in self.marker_clicked_1d[i]:
                             marker.setData(
@@ -222,7 +225,8 @@ class Crosshair(QObject):
                 elif isinstance(item, pg.ImageItem):
                     if x is None or y_values is None:
                         return
-                    self.coordinatesClicked2D.emit(x, y_values)
+                    coordinate_to_emit = (x, y_values)
+                    self.coordinatesClicked2D.emit(coordinate_to_emit)
                     self.marker_2d.setPos([x, y_values])
 
     def check_log(self):

bec_widgets/widgets/dock/dock.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Literal, Optional
+from typing import TYPE_CHECKING, Any, Literal, Optional
 
 from pydantic import Field
 from pyqtgraph.dockarea import Dock
@@ -15,7 +15,7 @@ if TYPE_CHECKING:
 
 
 class DockConfig(ConnectionConfig):
-    widgets: dict[str, ConnectionConfig] = Field({}, description="The widgets in the dock.")
+    widgets: dict[str, Any] = Field({}, description="The widgets in the dock.")
     position: Literal["bottom", "top", "left", "right", "above", "below"] = Field(
         "bottom", description="The position of the dock."
     )
@@ -26,13 +26,14 @@ class DockConfig(ConnectionConfig):
 
 class BECDock(BECConnector, Dock):
     USER_ACCESS = [
+        "config_dict",
         "rpc_id",
         "widget_list",
         "show_title_bar",
         "hide_title_bar",
         "get_widgets_positions",
         "set_title",
-        "add_widget_bec",
+        "add_widget",
         "list_eligible_widgets",
         "move_widget",
         "remove_widget",
@@ -151,46 +152,47 @@ class BECDock(BECConnector, Dock):
         """
         return list(RPCWidgetHandler.widget_classes.keys())
 
-    def add_widget_bec(
-        self,
-        widget_type: str,
-        row=None,
-        col=0,
-        rowspan=1,
-        colspan=1,
-        shift: Literal["down", "up", "left", "right"] = "down",
-    ):
-        """
-        Add a widget to the dock.
-
-        Args:
-            widget_type(str): The widget to add. Only BEC RPC widgets from RPCWidgetHandler are allowed.
-            row(int): The row to add the widget to. If None, the widget will be added to the next available row.
-            col(int): The column to add the widget to.
-            rowspan(int): The number of rows the widget should span.
-            colspan(int): The number of columns the widget should span.
-            shift(Literal["down", "up", "left", "right"]): The direction to shift the widgets if the position is occupied.
-        """
-        if row is None:
-            row = self.layout.rowCount()
-
-        if self.layout_manager.is_position_occupied(row, col):
-            self.layout_manager.shift_widgets(shift, start_row=row)
-
-        widget = RPCWidgetHandler.create_widget(widget_type)
-        self.addWidget(widget, row=row, col=col, rowspan=rowspan, colspan=colspan)
-
-        return widget
+    # def add_widget_bec(
+    #     self,
+    #     widget_type: str,
+    #     row=None,
+    #     col=0,
+    #     rowspan=1,
+    #     colspan=1,
+    #     shift: Literal["down", "up", "left", "right"] = "down",
+    # ):
+    #     """
+    #     Add a widget to the dock.
+    #
+    #     Args:
+    #         widget_type(str): The widget to add. Only BEC RPC widgets from RPCWidgetHandler are allowed.
+    #         row(int): The row to add the widget to. If None, the widget will be added to the next available row.
+    #         col(int): The column to add the widget to.
+    #         rowspan(int): The number of rows the widget should span.
+    #         colspan(int): The number of columns the widget should span.
+    #         shift(Literal["down", "up", "left", "right"]): The direction to shift the widgets if the position is occupied.
+    #     """
+    #     if row is None:
+    #         row = self.layout.rowCount()
+    #
+    #     if self.layout_manager.is_position_occupied(row, col):
+    #         self.layout_manager.shift_widgets(shift, start_row=row)
+    #
+    #     widget = RPCWidgetHandler.create_widget(widget_type)
+    #     self.addWidget(widget, row=row, col=col, rowspan=rowspan, colspan=colspan)
+    #     self.config.widgets[widget.gui_id] = widget.config
+    #
+    #     return widget
 
     def add_widget(
         self,
-        widget: QWidget,
+        widget: BECConnector | str,
         row=None,
         col=0,
         rowspan=1,
         colspan=1,
         shift: Literal["down", "up", "left", "right"] = "down",
-    ):
+    ) -> BECConnector:
         """
         Add a widget to the dock.
 
@@ -208,8 +210,18 @@ class BECDock(BECConnector, Dock):
         if self.layout_manager.is_position_occupied(row, col):
             self.layout_manager.shift_widgets(shift, start_row=row)
 
+        if isinstance(widget, str):
+            widget = RPCWidgetHandler.create_widget(widget)
+        else:
+            widget = widget
+
         self.addWidget(widget, row=row, col=col, rowspan=rowspan, colspan=colspan)
 
+        if hasattr(widget, "config"):
+            self.config.widgets[widget.gui_id] = widget.config
+
+        return widget
+
     def move_widget(self, widget: QWidget, new_row: int, new_col: int):
         """
         Move a widget to a new position in the layout.
@@ -242,6 +254,7 @@ class BECDock(BECConnector, Dock):
         """
         widget = self.rpc_register.get_rpc_by_id(widget_rpc_id)
         self.layout.removeWidget(widget)
+        self.config.widgets.pop(widget_rpc_id, None)
         widget.close()
 
     def remove(self):

bec_widgets/widgets/dock/dock_area.py

@@ -16,10 +16,14 @@ from .dock import BECDock, DockConfig
 
 class DockAreaConfig(ConnectionConfig):
     docks: dict[str, DockConfig] = Field({}, description="The docks in the dock area.")
+    docks_state: Optional[dict] = Field(
+        None, description="The state of the docks in the dock area."
+    )
 
 
 class BECDockArea(BECConnector, DockArea):
     USER_ACCESS = [
+        "config_dict",
         "panels",
         "save_state",
         "remove_dock",
@@ -29,6 +33,7 @@ class BECDockArea(BECConnector, DockArea):
         "detach_dock",
         "attach_all",
         "get_all_rpc",
+        "temp_areas",
     ]
 
     def __init__(
@@ -66,9 +71,22 @@ class BECDockArea(BECConnector, DockArea):
 
     @panels.setter
     def panels(self, value: dict):
-
         self.docks = WeakValueDictionary(value)
 
+    @property
+    def temp_areas(self) -> list:
+        """
+        Get the temporary areas in the dock area.
+
+        Returns:
+            list: The temporary areas in the dock area.
+        """
+        return list(map(str, self.tempAreas))
+
+    @temp_areas.setter
+    def temp_areas(self, value: list):
+        self.tempAreas = list(map(str, value))
+
     def restore_state(
         self, state: dict = None, missing: Literal["ignore", "error"] = "ignore", extra="bottom"
     ):
@@ -81,7 +99,7 @@ class BECDockArea(BECConnector, DockArea):
             extra(str): Extra docks that are in the dockarea but that are not mentioned in state will be added to the bottom of the dockarea, unless otherwise specified by the extra argument.
         """
         if state is None:
-            state = self._last_state
+            state = self.config.docks_state
         self.restoreState(state, missing=missing, extra=extra)
 
     def save_state(self) -> dict:
@@ -91,8 +109,9 @@ class BECDockArea(BECConnector, DockArea):
         Returns:
             dict: The state of the dock area.
         """
-        self._last_state = self.saveState()
-        return self._last_state
+        last_state = self.saveState()
+        self.config.docks_state = last_state
+        return last_state
 
     def remove_dock(self, name: str):
         """
@@ -102,6 +121,7 @@ class BECDockArea(BECConnector, DockArea):
             name(str): The name of the dock to remove.
         """
         dock = self.docks.pop(name, None)
+        self.config.docks.pop(name, None)
         if dock:
             dock.close()
             if len(self.docks) <= 1:
@@ -166,9 +186,7 @@ class BECDockArea(BECConnector, DockArea):
                 dock.show_title_bar()
 
         if widget is not None and isinstance(widget, str):
-            dock.add_widget_bec(
-                widget_type=widget, row=row, col=col, rowspan=rowspan, colspan=colspan
-            )
+            dock.add_widget(widget=widget, row=row, col=col, rowspan=rowspan, colspan=colspan)
         elif widget is not None and isinstance(widget, QWidget):
             dock.addWidget(widget, row=row, col=col, rowspan=rowspan, colspan=colspan)
         if self._instructions_visible:
@@ -187,7 +205,7 @@ class BECDockArea(BECConnector, DockArea):
             BECDock: The undocked dock.
         """
         dock = self.docks[dock_name]
-        self.floatDock(dock)
+        dock.detach()
         return dock
 
     def attach_all(self):

bec_widgets/widgets/figure/figure.py

@@ -26,7 +26,7 @@ class FigureConfig(ConnectionConfig):
     theme: Literal["dark", "light"] = Field("dark", description="The theme of the figure widget.")
     num_cols: int = Field(1, description="The number of columns in the figure widget.")
     num_rows: int = Field(1, description="The number of rows in the figure widget.")
-    widgets: dict[str, SubplotConfig] = Field(
+    widgets: dict[str, Waveform1DConfig | ImageConfig | MotorMapConfig | SubplotConfig] = Field(
         {}, description="The list of widgets to be added to the figure widget."
     )
 

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

@@ -317,7 +317,7 @@ class BECMotorMap(BECPlotBase):
         Returns:
             float: Motor initial position.
         """
-        init_position = round(self.dev[name].read()[entry]["value"], precision)
+        init_position = round(float(self.dev[name].read()[entry]["value"]), precision)
         return init_position
 
     def _validate_signal_entries(
@@ -403,7 +403,7 @@ class BECMotorMap(BECPlotBase):
         # Update plot title
         precision = self.config.precision
         self.set_title(
-            f"Motor position: ({round(current_x,precision)}, {round(current_y,precision)})"
+            f"Motor position: ({round(float(current_x),precision)}, {round(float(current_y),precision)})"
         )
 
     @pyqtSlot(dict)

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

@@ -577,7 +577,6 @@ class BECWaveform(BECPlotBase):
         Returns:
             dict | pd.DataFrame: Data of all curves in the specified format.
         """
-
         data = {}
         try:
             import pandas as pd

bec_widgets/widgets/jupyter_console/jupyter_console.py

@@ -0,0 +1,72 @@
+from bec_ipython_client.main import BECIPythonClient
+from qtconsole.inprocess import QtInProcessKernelManager
+from qtconsole.manager import QtKernelManager
+from qtconsole.rich_jupyter_widget import RichJupyterWidget
+from qtpy.QtWidgets import QApplication, QMainWindow
+
+
+class BECJupyterConsole(RichJupyterWidget):  # pragma: no cover:
+    def __init__(self, inprocess: bool = False):
+        super().__init__()
+
+        self.inprocess = None
+
+        self.kernel_manager, self.kernel_client = self._init_kernel(inprocess=inprocess)
+        self.set_default_style("linux")
+        self._init_bec()
+
+    def _init_kernel(self, inprocess: bool = False, kernel_name: str = "python3"):
+        self.inprocess = inprocess
+        if inprocess is True:
+            print("starting inprocess kernel")
+            kernel_manager = QtInProcessKernelManager()
+        else:
+            kernel_manager = QtKernelManager(kernel_name=kernel_name)
+        kernel_manager.start_kernel()
+        kernel_client = kernel_manager.client()
+        kernel_client.start_channels()
+        return kernel_manager, kernel_client
+
+    def _init_bec(self):
+        if self.inprocess is True:
+            self._init_bec_inprocess()
+        else:
+            self._init_bec_kernel()
+
+    def _init_bec_inprocess(self):
+        self.client = BECIPythonClient()
+        self.client.start()
+
+        self.kernel_manager.kernel.shell.push(
+            {
+                "bec": self.client,
+                "dev": self.client.device_manager.devices,
+                "scans": self.client.scans,
+            }
+        )
+
+    def _init_bec_kernel(self):
+        self.execute(
+            """
+            from bec_ipython_client.main import BECIPythonClient
+            bec = BECIPythonClient()
+            bec.start()
+            dev = bec.device_manager.devices if bec else None
+            scans = bec.scans if bec else None
+            """
+        )
+
+    def shutdown_kernel(self):
+        self.kernel_client.stop_channels()
+        self.kernel_manager.shutdown_kernel()
+
+
+if __name__ == "__main__":  # pragma: no cover
+    import sys
+
+    app = QApplication(sys.argv)
+    win = QMainWindow()
+    win.setCentralWidget(BECJupyterConsole(True))
+    win.show()
+
+    sys.exit(app.exec_())

bec_widgets/widgets/motor_control/motor_table/motor_table.py

@@ -16,6 +16,7 @@ from qtpy.QtWidgets import (
     QTableWidgetItem,
 )
 
+from bec_widgets.utils import UILoader
 from bec_widgets.widgets.motor_control.motor_control import MotorControlWidget
 
 
@@ -37,25 +38,25 @@ class MotorCoordinateTable(MotorControlWidget):
     def _load_ui(self):
         """Load the UI for the coordinate table."""
         current_path = os.path.dirname(__file__)
-        uic.loadUi(os.path.join(current_path, "motor_table.ui"), self)
+        self.ui = UILoader().load_ui(os.path.join(current_path, "motor_table.ui"), self)
 
     def _init_ui(self):
         """Initialize the UI"""
         # Setup table behaviour
         self._setup_table()
-        self.table.setSelectionBehavior(QTableWidget.SelectRows)
+        self.ui.table.setSelectionBehavior(QTableWidget.SelectRows)
 
         # for tag columns default tag
         self.tag_counter = 1
 
         # Connect signals and slots
-        self.checkBox_resize_auto.stateChanged.connect(self.resize_table_auto)
-        self.comboBox_mode.currentIndexChanged.connect(self.mode_switch)
+        self.ui.checkBox_resize_auto.stateChanged.connect(self.resize_table_auto)
+        self.ui.comboBox_mode.currentIndexChanged.connect(self.mode_switch)
 
         # Keyboard shortcuts for deleting a row
-        self.delete_shortcut = QShortcut(QKeySequence(Qt.Key_Delete), self.table)
+        self.delete_shortcut = QShortcut(QKeySequence(Qt.Key_Delete), self.ui.table)
         self.delete_shortcut.activated.connect(self.delete_selected_row)
-        self.backspace_shortcut = QShortcut(QKeySequence(Qt.Key_Backspace), self.table)
+        self.backspace_shortcut = QShortcut(QKeySequence(Qt.Key_Backspace), self.ui.table)
         self.backspace_shortcut.activated.connect(self.delete_selected_row)
 
         # Warning message for mode switch enable/disable
@@ -83,13 +84,13 @@ class MotorCoordinateTable(MotorControlWidget):
         self.mode = self.config["motor_control"].get("mode", "Individual")
 
         # Set combobox to default mode
-        self.comboBox_mode.setCurrentText(self.mode)
+        self.ui.comboBox_mode.setCurrentText(self.mode)
 
         self._init_ui()
 
     def _setup_table(self):
         """Setup the table with appropriate headers and configurations."""
-        mode = self.comboBox_mode.currentText()
+        mode = self.ui.comboBox_mode.currentText()
 
         if mode == "Individual":
             self._setup_individual_mode()
@@ -101,14 +102,14 @@ class MotorCoordinateTable(MotorControlWidget):
 
     def _setup_individual_mode(self):
         """Setup the table for individual mode."""
-        self.table.setColumnCount(5)
-        self.table.setHorizontalHeaderLabels(["Show", "Move", "Tag", "X", "Y"])
-        self.table.verticalHeader().setVisible(False)
+        self.ui.table.setColumnCount(5)
+        self.ui.table.setHorizontalHeaderLabels(["Show", "Move", "Tag", "X", "Y"])
+        self.ui.table.verticalHeader().setVisible(False)
 
     def _setup_start_stop_mode(self):
         """Setup the table for start/stop mode."""
-        self.table.setColumnCount(8)
-        self.table.setHorizontalHeaderLabels(
+        self.ui.table.setColumnCount(8)
+        self.ui.table.setHorizontalHeaderLabels(
             [
                 "Show",
                 "Move [start]",
@@ -120,15 +121,15 @@ class MotorCoordinateTable(MotorControlWidget):
                 "Y [end]",
             ]
         )
-        self.table.verticalHeader().setVisible(False)
+        self.ui.table.verticalHeader().setVisible(False)
         # Set flag to track if the coordinate is stat or the end of the entry
         self.is_next_entry_end = False
 
     def mode_switch(self):
         """Switch between individual and start/stop mode."""
-        last_selected_index = self.comboBox_mode.currentIndex()
+        last_selected_index = self.ui.comboBox_mode.currentIndex()
 
-        if self.table.rowCount() > 0 and self.warning_message is True:
+        if self.ui.table.rowCount() > 0 and self.warning_message is True:
             msgBox = QMessageBox()
             msgBox.setIcon(QMessageBox.Critical)
             msgBox.setText(
@@ -138,9 +139,9 @@ class MotorCoordinateTable(MotorControlWidget):
             returnValue = msgBox.exec()
 
             if returnValue is QMessageBox.Cancel:
-                self.comboBox_mode.blockSignals(True)  # Block signals
-                self.comboBox_mode.setCurrentIndex(last_selected_index)
-                self.comboBox_mode.blockSignals(False)  # Unblock signals
+                self.ui.comboBox_mode.blockSignals(True)  # Block signals
+                self.ui.comboBox_mode.setCurrentIndex(last_selected_index)
+                self.ui.comboBox_mode.blockSignals(False)  # Unblock signals
                 return
 
         # Wipe table
@@ -170,7 +171,7 @@ class MotorCoordinateTable(MotorControlWidget):
             y(float): Y coordinate.
         """
 
-        mode = self.comboBox_mode.currentText()
+        mode = self.ui.comboBox_mode.currentText()
         if mode == "Individual":
             checkbox_pos = 0
             button_pos = 1
@@ -181,8 +182,8 @@ class MotorCoordinateTable(MotorControlWidget):
             color = "green"
 
             # Add new row -> new entry
-            row_count = self.table.rowCount()
-            self.table.insertRow(row_count)
+            row_count = self.ui.table.rowCount()
+            self.ui.table.insertRow(row_count)
 
             # Add Widgets
             self._add_widgets(
@@ -213,8 +214,8 @@ class MotorCoordinateTable(MotorControlWidget):
                 color = "blue"
 
                 # Add new row -> new entry
-                row_count = self.table.rowCount()
-                self.table.insertRow(row_count)
+                row_count = self.ui.table.rowCount()
+                self.ui.table.insertRow(row_count)
 
                 # Add Widgets
                 self._add_widgets(
@@ -236,7 +237,7 @@ class MotorCoordinateTable(MotorControlWidget):
 
             elif self.is_next_entry_end is True:  # It is the end position of the entry
                 print("End position")
-                row_count = self.table.rowCount() - 1  # Current row
+                row_count = self.ui.table.rowCount() - 1  # Current row
                 button_pos = 2
                 x_pos = 6
                 y_pos = 7
@@ -294,7 +295,7 @@ class MotorCoordinateTable(MotorControlWidget):
         # Add widgets
         self._add_checkbox(row, checkBox_pos, x_pos, y_pos)
         self._add_move_button(row, button_pos, x_pos, y_pos)
-        self.table.setItem(row, tag_pos, QTableWidgetItem(tag))
+        self.ui.table.setItem(row, tag_pos, QTableWidgetItem(tag))
         self._add_line_edit(x, row, x_pos, x_pos, y_pos, coordinate_reference, color)
         self._add_line_edit(y, row, y_pos, x_pos, y_pos, coordinate_reference, color)
 
@@ -302,10 +303,10 @@ class MotorCoordinateTable(MotorControlWidget):
         self.emit_plot_coordinates(x_pos, y_pos, coordinate_reference, color)
 
         # Connect item edit to emit coordinates
-        self.table.itemChanged.connect(
+        self.ui.table.itemChanged.connect(
             lambda: print(f"item changed from {coordinate_reference} slot \n {x}-{y}-{color}")
         )
-        self.table.itemChanged.connect(
+        self.ui.table.itemChanged.connect(
             lambda: self.emit_plot_coordinates(x_pos, y_pos, coordinate_reference, color)
         )
 
@@ -321,7 +322,7 @@ class MotorCoordinateTable(MotorControlWidget):
         show_checkbox = QCheckBox()
         show_checkbox.setChecked(True)
         show_checkbox.stateChanged.connect(lambda: self.emit_plot_coordinates(x_pos, y_pos))
-        self.table.setCellWidget(row, checkBox_pos, show_checkbox)
+        self.ui.table.setCellWidget(row, checkBox_pos, show_checkbox)
 
     def _add_move_button(self, row: int, button_pos: int, x_pos: int, y_pos: int) -> None:
         """
@@ -334,7 +335,7 @@ class MotorCoordinateTable(MotorControlWidget):
         """
         move_button = QPushButton("Move")
         move_button.clicked.connect(lambda: self.handle_move_button_click(x_pos, y_pos))
-        self.table.setCellWidget(row, button_pos, move_button)
+        self.ui.table.setCellWidget(row, button_pos, move_button)
 
     def _add_line_edit(
         self,
@@ -367,7 +368,7 @@ class MotorCoordinateTable(MotorControlWidget):
         edit.setAlignment(Qt.AlignmentFlag.AlignCenter)
 
         # Add line edit to the table
-        self.table.setCellWidget(row, line_pos, edit)
+        self.ui.table.setCellWidget(row, line_pos, edit)
         edit.textChanged.connect(
             lambda: self.emit_plot_coordinates(x_pos, y_pos, coordinate_reference, color)
         )
@@ -375,10 +376,10 @@ class MotorCoordinateTable(MotorControlWidget):
     def wipe_motor_map_coordinates(self):
         """Wipe the motor map coordinates."""
         try:
-            self.table.itemChanged.disconnect()  # Disconnect all previous connections
+            self.ui.table.itemChanged.disconnect()  # Disconnect all previous connections
         except TypeError:
             print("No previous connections to disconnect")
-        self.table.setRowCount(0)
+        self.ui.table.setRowCount(0)
         reference_tags = ["Individual", "Start", "Stop"]
         for reference_tag in reference_tags:
             self.plot_coordinates_signal.emit([], reference_tag, "green")
@@ -391,7 +392,7 @@ class MotorCoordinateTable(MotorControlWidget):
             y_pos(int): Y position of the coordinate.
         """
         button = self.sender()
-        row = self.table.indexAt(button.pos()).row()
+        row = self.ui.table.indexAt(button.pos()).row()
 
         x = self.get_coordinate(row, x_pos)
         y = self.get_coordinate(row, y_pos)
@@ -410,8 +411,8 @@ class MotorCoordinateTable(MotorControlWidget):
             f"Emitting plot coordinates: x_pos={x_pos}, y_pos={y_pos}, reference_tag={reference_tag}, color={color}"
         )
         coordinates = []
-        for row in range(self.table.rowCount()):
-            show = self.table.cellWidget(row, 0).isChecked()
+        for row in range(self.ui.table.rowCount()):
+            show = self.ui.table.cellWidget(row, 0).isChecked()
             x = self.get_coordinate(row, x_pos)
             y = self.get_coordinate(row, y_pos)
 
@@ -427,27 +428,27 @@ class MotorCoordinateTable(MotorControlWidget):
         Returns:
             float: Value of the coordinate.
         """
-        edit = self.table.cellWidget(row, column)
+        edit = self.ui.table.cellWidget(row, column)
         value = float(edit.text()) if edit and edit.text() != "" else None
         if value:
             return value
 
     def delete_selected_row(self):
         """Delete the selected row from the table."""
-        selected_rows = self.table.selectionModel().selectedRows()
+        selected_rows = self.ui.table.selectionModel().selectedRows()
         for row in selected_rows:
-            self.table.removeRow(row.row())
-        if self.comboBox_mode.currentText() == "Start/Stop":
+            self.ui.table.removeRow(row.row())
+        if self.ui.comboBox_mode.currentText() == "Start/Stop":
             self.emit_plot_coordinates(x_pos=4, y_pos=5, reference_tag="Start", color="blue")
             self.emit_plot_coordinates(x_pos=6, y_pos=7, reference_tag="Stop", color="red")
             self.is_next_entry_end = False
-        elif self.comboBox_mode.currentText() == "Individual":
+        elif self.ui.comboBox_mode.currentText() == "Individual":
             self.emit_plot_coordinates(x_pos=3, y_pos=4, reference_tag="Individual", color="green")
 
     def resize_table_auto(self):
         """Resize the table to fit the contents."""
-        if self.checkBox_resize_auto.isChecked():
-            self.table.resizeColumnsToContents()
+        if self.ui.checkBox_resize_auto.isChecked():
+            self.ui.table.resizeColumnsToContents()
 
     def move_motor(self, x: float, y: float) -> None:
         """

bec_widgets/widgets/motor_control/movement_absolute/movement_absolute.py

@@ -3,8 +3,10 @@ import os
 from qtpy import uic
 from qtpy.QtCore import Signal as pyqtSignal
 from qtpy.QtCore import Slot as pyqtSlot
+from qtpy.QtWidgets import QWidget
 
-from bec_widgets.widgets.motor_control.motor_control import MotorControlWidget
+from bec_widgets.utils import UILoader
+from bec_widgets.widgets.motor_control.motor_control import MotorControlErrors, MotorControlWidget
 
 
 class MotorControlAbsolute(MotorControlWidget):
@@ -23,26 +25,26 @@ class MotorControlAbsolute(MotorControlWidget):
     def _load_ui(self):
         """Load the UI from the .ui file."""
         current_path = os.path.dirname(__file__)
-        uic.loadUi(os.path.join(current_path, "movement_absolute.ui"), self)
+        self.ui = UILoader().load_ui(os.path.join(current_path, "movement_absolute.ui"), self)
 
     def _init_ui(self):
         """Initialize the UI."""
 
         # Check if there are any motors connected
         if self.motor_x is None or self.motor_y is None:
-            self.motorControl_absolute.setEnabled(False)
+            self.ui.motorControl_absolute.setEnabled(False)
             return
 
         # Move to absolute coordinates
-        self.pushButton_go_absolute.clicked.connect(
+        self.ui.pushButton_go_absolute.clicked.connect(
             lambda: self.move_motor_absolute(
-                self.spinBox_absolute_x.value(), self.spinBox_absolute_y.value()
+                self.ui.spinBox_absolute_x.value(), self.ui.spinBox_absolute_y.value()
             )
         )
 
-        self.pushButton_set.clicked.connect(self.save_absolute_coordinates)
-        self.pushButton_save.clicked.connect(self.save_current_coordinates)
-        self.pushButton_stop.clicked.connect(self.motor_thread.stop_movement)
+        self.ui.pushButton_set.clicked.connect(self.save_absolute_coordinates)
+        self.ui.pushButton_save.clicked.connect(self.save_current_coordinates)
+        self.ui.pushButton_stop.clicked.connect(self.motor_thread.stop_movement)
 
         # Enable/Disable GUI
         self.motor_thread.lock_gui.connect(self.enable_motor_controls)
@@ -80,11 +82,11 @@ class MotorControlAbsolute(MotorControlWidget):
         """
 
         # Disable or enable all controls within the motorControl_absolute group box
-        for widget in self.motorControl_absolute.findChildren(QWidget):
+        for widget in self.ui.motorControl_absolute.findChildren(QWidget):
             widget.setEnabled(enable)
 
         # Enable the pushButton_stop if the motor is moving
-        self.pushButton_stop.setEnabled(True)
+        self.ui.pushButton_stop.setEnabled(True)
 
     @pyqtSlot(str, str)
     def change_motors(self, motor_x: str, motor_y: str):
@@ -109,8 +111,8 @@ class MotorControlAbsolute(MotorControlWidget):
         """
         self.precision = precision
         self.config["motor_control"]["precision"] = precision
-        self.spinBox_absolute_x.setDecimals(precision)
-        self.spinBox_absolute_y.setDecimals(precision)
+        self.ui.spinBox_absolute_x.setDecimals(precision)
+        self.ui.spinBox_absolute_y.setDecimals(precision)
 
     def move_motor_absolute(self, x: float, y: float) -> None:
         """
@@ -122,32 +124,32 @@ class MotorControlAbsolute(MotorControlWidget):
         # self._enable_motor_controls(False)
         target_coordinates = (x, y)
         self.motor_thread.move_absolute(self.motor_x, self.motor_y, target_coordinates)
-        if self.checkBox_save_with_go.isChecked():
+        if self.ui.checkBox_save_with_go.isChecked():
             self.save_absolute_coordinates()
 
     def _init_keyboard_shortcuts(self):
         """Initialize the keyboard shortcuts."""
         # Go absolute button
-        self.pushButton_go_absolute.setShortcut("Ctrl+G")
-        self.pushButton_go_absolute.setToolTip("Ctrl+G")
+        self.ui.pushButton_go_absolute.setShortcut("Ctrl+G")
+        self.ui.pushButton_go_absolute.setToolTip("Ctrl+G")
 
         # Set absolute coordinates
-        self.pushButton_set.setShortcut("Ctrl+D")
-        self.pushButton_set.setToolTip("Ctrl+D")
+        self.ui.pushButton_set.setShortcut("Ctrl+D")
+        self.ui.pushButton_set.setToolTip("Ctrl+D")
 
         # Save Current coordinates
-        self.pushButton_save.setShortcut("Ctrl+S")
-        self.pushButton_save.setToolTip("Ctrl+S")
+        self.ui.pushButton_save.setShortcut("Ctrl+S")
+        self.ui.pushButton_save.setToolTip("Ctrl+S")
 
         # Stop Button
-        self.pushButton_stop.setShortcut("Ctrl+X")
-        self.pushButton_stop.setToolTip("Ctrl+X")
+        self.ui.pushButton_stop.setShortcut("Ctrl+X")
+        self.ui.pushButton_stop.setToolTip("Ctrl+X")
 
     def save_absolute_coordinates(self):
         """Emit the setup coordinates from the spinboxes"""
 
-        x, y = round(self.spinBox_absolute_x.value(), self.precision), round(
-            self.spinBox_absolute_y.value(), self.precision
+        x, y = round(self.ui.spinBox_absolute_x.value(), self.precision), round(
+            self.ui.spinBox_absolute_y.value(), self.precision
         )
         self.coordinates_signal.emit((x, y))
 

bec_widgets/widgets/motor_control/movement_relative/movement_relative.py

@@ -7,6 +7,7 @@ from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtGui import QKeySequence
 from qtpy.QtWidgets import QDoubleSpinBox, QShortcut, QWidget
 
+from bec_widgets.utils import UILoader
 from bec_widgets.widgets.motor_control.motor_control import MotorControlWidget
 
 
@@ -27,7 +28,7 @@ class MotorControlRelative(MotorControlWidget):
         """Load the UI from the .ui file."""
         # Loading UI
         current_path = os.path.dirname(__file__)
-        uic.loadUi(os.path.join(current_path, "movement_relative.ui"), self)
+        self.ui = UILoader().load_ui(os.path.join(current_path, "movement_relative.ui"), self)
 
     def _init_ui(self):
         """Initialize the UI."""
@@ -51,15 +52,15 @@ class MotorControlRelative(MotorControlWidget):
 
         # Update step precision
         self.precision = self.config["motor_control"]["precision"]
-        self.spinBox_precision.setValue(self.precision)
+        self.ui.spinBox_precision.setValue(self.precision)
 
         # Update step sizes
-        self.spinBox_step_x.setValue(self.config["motor_control"]["step_size_x"])
-        self.spinBox_step_y.setValue(self.config["motor_control"]["step_size_y"])
+        self.ui.spinBox_step_x.setValue(self.config["motor_control"]["step_size_x"])
+        self.ui.spinBox_step_y.setValue(self.config["motor_control"]["step_size_y"])
 
         # Checkboxes for keyboard shortcuts and x/y step size link
-        self.checkBox_same_xy.setChecked(self.config["motor_control"]["step_x_y_same"])
-        self.checkBox_enableArrows.setChecked(self.config["motor_control"]["move_with_arrows"])
+        self.ui.checkBox_same_xy.setChecked(self.config["motor_control"]["step_x_y_same"])
+        self.ui.checkBox_enableArrows.setChecked(self.config["motor_control"]["move_with_arrows"])
 
         self._init_ui()
 
@@ -67,30 +68,32 @@ class MotorControlRelative(MotorControlWidget):
         """Initialize the motor control elements"""
 
         # Connect checkbox and spinBoxes
-        self.checkBox_same_xy.stateChanged.connect(self._sync_step_sizes)
-        self.spinBox_step_x.valueChanged.connect(self._update_step_size_x)
-        self.spinBox_step_y.valueChanged.connect(self._update_step_size_y)
+        self.ui.checkBox_same_xy.stateChanged.connect(self._sync_step_sizes)
+        self.ui.spinBox_step_x.valueChanged.connect(self._update_step_size_x)
+        self.ui.spinBox_step_y.valueChanged.connect(self._update_step_size_y)
 
-        self.toolButton_right.clicked.connect(
+        self.ui.toolButton_right.clicked.connect(
             lambda: self.move_motor_relative(self.motor_x, "x", 1)
         )
-        self.toolButton_left.clicked.connect(
+        self.ui.toolButton_left.clicked.connect(
             lambda: self.move_motor_relative(self.motor_x, "x", -1)
         )
-        self.toolButton_up.clicked.connect(lambda: self.move_motor_relative(self.motor_y, "y", 1))
-        self.toolButton_down.clicked.connect(
+        self.ui.toolButton_up.clicked.connect(
+            lambda: self.move_motor_relative(self.motor_y, "y", 1)
+        )
+        self.ui.toolButton_down.clicked.connect(
             lambda: self.move_motor_relative(self.motor_y, "y", -1)
         )
 
         # Switch between key shortcuts active
-        self.checkBox_enableArrows.stateChanged.connect(self._update_arrow_key_shortcuts)
+        self.ui.checkBox_enableArrows.stateChanged.connect(self._update_arrow_key_shortcuts)
         self._update_arrow_key_shortcuts()
 
         # Enable/Disable GUI
         self.motor_thread.lock_gui.connect(self.enable_motor_controls)
 
         # Precision update
-        self.spinBox_precision.valueChanged.connect(lambda x: self._update_precision(x))
+        self.ui.spinBox_precision.valueChanged.connect(lambda x: self._update_precision(x))
 
         # Error messages
         self.motor_thread.motor_error.connect(
@@ -98,7 +101,7 @@ class MotorControlRelative(MotorControlWidget):
         )
 
         # Stop Button
-        self.pushButton_stop.clicked.connect(self.motor_thread.stop_movement)
+        self.ui.pushButton_stop.clicked.connect(self.motor_thread.stop_movement)
 
     def _init_keyboard_shortcuts(self) -> None:
         """Initialize the keyboard shortcuts"""
@@ -107,42 +110,42 @@ class MotorControlRelative(MotorControlWidget):
         increase_x_shortcut = QShortcut(QKeySequence("Ctrl+A"), self)
         decrease_x_shortcut = QShortcut(QKeySequence("Ctrl+Z"), self)
         increase_x_shortcut.activated.connect(
-            lambda: self._change_step_size(self.spinBox_step_x, 2)
+            lambda: self._change_step_size(self.ui.spinBox_step_x, 2)
         )
         decrease_x_shortcut.activated.connect(
-            lambda: self._change_step_size(self.spinBox_step_x, 0.5)
+            lambda: self._change_step_size(self.ui.spinBox_step_x, 0.5)
         )
-        self.spinBox_step_x.setToolTip("Increase step size: Ctrl+A\nDecrease step size: Ctrl+Z")
+        self.ui.spinBox_step_x.setToolTip("Increase step size: Ctrl+A\nDecrease step size: Ctrl+Z")
 
         # Increase/decrease step size for Y motor
         increase_y_shortcut = QShortcut(QKeySequence("Alt+A"), self)
         decrease_y_shortcut = QShortcut(QKeySequence("Alt+Z"), self)
         increase_y_shortcut.activated.connect(
-            lambda: self._change_step_size(self.spinBox_step_y, 2)
+            lambda: self._change_step_size(self.ui.spinBox_step_y, 2)
         )
         decrease_y_shortcut.activated.connect(
-            lambda: self._change_step_size(self.spinBox_step_y, 0.5)
+            lambda: self._change_step_size(self.ui.spinBox_step_y, 0.5)
         )
-        self.spinBox_step_y.setToolTip("Increase step size: Alt+A\nDecrease step size: Alt+Z")
+        self.ui.spinBox_step_y.setToolTip("Increase step size: Alt+A\nDecrease step size: Alt+Z")
 
         # Stop Button
-        self.pushButton_stop.setShortcut("Ctrl+X")
-        self.pushButton_stop.setToolTip("Ctrl+X")
+        self.ui.pushButton_stop.setShortcut("Ctrl+X")
+        self.ui.pushButton_stop.setToolTip("Ctrl+X")
 
     def _update_arrow_key_shortcuts(self) -> None:
         """Update the arrow key shortcuts based on the checkbox state."""
-        if self.checkBox_enableArrows.isChecked():
+        if self.ui.checkBox_enableArrows.isChecked():
             # Set the arrow key shortcuts for motor movement
-            self.toolButton_right.setShortcut(Qt.Key_Right)
-            self.toolButton_left.setShortcut(Qt.Key_Left)
-            self.toolButton_up.setShortcut(Qt.Key_Up)
-            self.toolButton_down.setShortcut(Qt.Key_Down)
+            self.ui.toolButton_right.setShortcut(Qt.Key_Right)
+            self.ui.toolButton_left.setShortcut(Qt.Key_Left)
+            self.ui.toolButton_up.setShortcut(Qt.Key_Up)
+            self.ui.toolButton_down.setShortcut(Qt.Key_Down)
         else:
             # Clear the shortcuts
-            self.toolButton_right.setShortcut("")
-            self.toolButton_left.setShortcut("")
-            self.toolButton_up.setShortcut("")
-            self.toolButton_down.setShortcut("")
+            self.ui.toolButton_right.setShortcut("")
+            self.ui.toolButton_left.setShortcut("")
+            self.ui.toolButton_up.setShortcut("")
+            self.ui.toolButton_down.setShortcut("")
 
     def _update_precision(self, precision: int) -> None:
         """
@@ -150,8 +153,8 @@ class MotorControlRelative(MotorControlWidget):
         Args:
             precision(int): Precision of the coordinates.
         """
-        self.spinBox_step_x.setDecimals(precision)
-        self.spinBox_step_y.setDecimals(precision)
+        self.ui.spinBox_step_x.setDecimals(precision)
+        self.ui.spinBox_step_y.setDecimals(precision)
         self.precision_signal.emit(precision)
 
     def _change_step_size(self, spinBox: QDoubleSpinBox, factor: float) -> None:
@@ -167,21 +170,21 @@ class MotorControlRelative(MotorControlWidget):
 
     def _sync_step_sizes(self):
         """Sync step sizes based on checkbox state."""
-        if self.checkBox_same_xy.isChecked():
-            value = self.spinBox_step_x.value()
-            self.spinBox_step_y.setValue(value)
+        if self.ui.checkBox_same_xy.isChecked():
+            value = self.ui.spinBox_step_x.value()
+            self.ui.spinBox_step_y.setValue(value)
 
     def _update_step_size_x(self):
         """Update step size for x if checkbox is checked."""
-        if self.checkBox_same_xy.isChecked():
-            value = self.spinBox_step_x.value()
-            self.spinBox_step_y.setValue(value)
+        if self.ui.checkBox_same_xy.isChecked():
+            value = self.ui.spinBox_step_x.value()
+            self.ui.spinBox_step_y.setValue(value)
 
     def _update_step_size_y(self):
         """Update step size for y if checkbox is checked."""
-        if self.checkBox_same_xy.isChecked():
-            value = self.spinBox_step_y.value()
-            self.spinBox_step_x.setValue(value)
+        if self.ui.checkBox_same_xy.isChecked():
+            value = self.ui.spinBox_step_y.value()
+            self.ui.spinBox_step_x.setValue(value)
 
     @pyqtSlot(str, str)
     def change_motors(self, motor_x: str, motor_y: str):
@@ -206,11 +209,11 @@ class MotorControlRelative(MotorControlWidget):
         """
 
         # Disable or enable all controls within the motorControl_absolute group box
-        for widget in self.motorControl.findChildren(QWidget):
+        for widget in self.ui.motorControl.findChildren(QWidget):
             widget.setEnabled(disable)
 
         # Enable the pushButton_stop if the motor is moving
-        self.pushButton_stop.setEnabled(True)
+        self.ui.pushButton_stop.setEnabled(True)
 
     def move_motor_relative(self, motor, axis: str, direction: int) -> None:
         """
@@ -221,7 +224,7 @@ class MotorControlRelative(MotorControlWidget):
             direction(int): Direction to move. 1 for positive, -1 for negative.
         """
         if axis == "x":
-            step = direction * self.spinBox_step_x.value()
+            step = direction * self.ui.spinBox_step_x.value()
         elif axis == "y":
-            step = direction * self.spinBox_step_y.value()
+            step = direction * self.ui.spinBox_step_y.value()
         self.motor_thread.move_relative(motor, step)

bec_widgets/widgets/spiral_progress_bar/ring.py

@@ -17,16 +17,16 @@ class RingConnections(BaseModel):
     @field_validator("endpoint")
     def validate_endpoint(cls, v, values):
         slot = values.data["slot"]
-        endpoint = v.endpoint if isinstance(v, EndpointInfo) else v
+        v = v.endpoint if isinstance(v, EndpointInfo) else v
         if slot == "on_scan_progress":
-            if endpoint != "scans/scan_progress":
+            if v != "scans/scan_progress":
                 raise PydanticCustomError(
                     "unsupported endpoint",
                     "For slot 'on_scan_progress', endpoint must be MessageEndpoint.scan_progress or 'scans/scan_progress'.",
                     {"wrong_value": v},
                 )
         elif slot == "on_device_readback":
-            if not endpoint.startswith("internal/devices/readback/"):
+            if not v.startswith("internal/devices/readback/"):
                 raise PydanticCustomError(
                     "unsupported endpoint",
                     "For slot 'on_device_readback', endpoint must be MessageEndpoint.device_readback(device) or 'internal/devices/readback/{device}'.",
@@ -36,6 +36,7 @@ class RingConnections(BaseModel):
 
 
 class RingConfig(ConnectionConfig):
+    value: int | float | None = Field(0, description="Value for the progress bars.")
     direction: int | None = Field(
         -1, description="Direction of the progress bars. -1 for clockwise, 1 for counter-clockwise."
     )
@@ -48,14 +49,14 @@ class RingConfig(ConnectionConfig):
         description="Background color for the progress bars. Can be tuple (R, G, B, A) or string HEX Code.",
     )
     index: int | None = Field(0, description="Index of the progress bar. 0 is outer ring.")
-    line_width: int | None = Field(5, description="Line widths for the progress bars.")
+    line_width: int | None = Field(10, description="Line widths for the progress bars.")
     start_position: int | None = Field(
         90,
         description="Start position for the progress bars in degrees. Default is 90 degrees - corespons to "
         "the top of the ring.",
     )
-    min_value: int | None = Field(0, description="Minimum value for the progress bars.")
-    max_value: int | None = Field(100, description="Maximum value for the progress bars.")
+    min_value: int | float | None = Field(0, description="Minimum value for the progress bars.")
+    max_value: int | float | None = Field(100, description="Maximum value for the progress bars.")
     precision: int | None = Field(3, description="Precision for the progress bars.")
     update_behaviour: Literal["manual", "auto"] | None = Field(
         "auto", description="Update behaviour for the progress bars."
@@ -76,7 +77,7 @@ class Ring(BECConnector):
         "set_line_width",
         "set_min_max_values",
         "set_start_angle",
-        "set_connections",
+        "set_update",
         "reset_connection",
     ]
 
@@ -102,7 +103,6 @@ class Ring(BECConnector):
         self.background_color = None
         self.start_position = None
         self.config = config
-        self.value = 0
         self.RID = None
         self._init_config_params()
 
@@ -114,8 +114,9 @@ class Ring(BECConnector):
             self.set_connections(self.config.connections.slot, self.config.connections.endpoint)
 
     def set_value(self, value: int | float):
-        self.value = round(
-            max(self.config.min_value, min(self.config.max_value, value)), self.config.precision
+        self.config.value = round(
+            float(max(self.config.min_value, min(self.config.max_value, value))),
+            self.config.precision,
         )
 
     def set_color(self, color: str | tuple):
@@ -129,7 +130,7 @@ class Ring(BECConnector):
     def set_line_width(self, width: int):
         self.config.line_width = width
 
-    def set_min_max_values(self, min_value: int, max_value: int):
+    def set_min_max_values(self, min_value: int | float, max_value: int | float):
         self.config.min_value = min_value
         self.config.max_value = max_value
 
@@ -146,6 +147,27 @@ class Ring(BECConnector):
             converted_color = QtGui.QColor(*color)
         return converted_color
 
+    def set_update(self, mode: Literal["manual", "scan", "device"], device: str = None):
+        """
+        Set the update mode for the ring widget
+
+        Args:
+            mode(str): Update mode for the ring widget. Can be "manual", "scan" or "device"
+            device(str): Device name for the device readback mode, only used when mode is "device"
+        """
+        if mode == "manual":
+            self.bec_dispatcher.disconnect_slot(
+                getattr(self, self.config.connections.slot), self.config.connections.endpoint
+            )
+            self.config.connections.slot = None
+            self.config.connections.endpoint = None
+        elif mode == "scan":
+            self.set_connections("on_scan_progress", "scans/scan_progress")
+        elif mode == "device":
+            self.set_connections("on_device_readback", f"internal/devices/readback/{device}")
+
+        self.parent_progress_widget.enable_auto_updates(False)
+
     def set_connections(self, slot: str, endpoint: str | EndpointInfo):
         if self.config.connections.endpoint == endpoint and self.config.connections.slot == slot:
             return

bec_widgets/widgets/spiral_progress_bar/spiral_progress_bar.py

@@ -23,7 +23,7 @@ class SpiralProgressBarConfig(ConnectionConfig):
         10, description="Maximum number of progress bars to display."
     )
     num_bars: int | None = Field(1, description="Number of progress bars to display.")
-    gap: int | None = Field(10, description="Gap between progress bars.")
+    gap: int | None = Field(20, description="Gap between progress bars.")
     auto_updates: bool | None = Field(
         True, description="Enable or disable updates based on scan queue status."
     )
@@ -115,11 +115,10 @@ class SpiralProgressBar(BECConnector, QWidget):
         self.entry_validator = EntryValidator(self.dev)
 
         self.RID = None
-        self.values = None
 
         # For updating bar behaviour
         self._auto_updates = True
-        self._rings = []
+        self._rings = None
 
         if num_bars is not None:
             self.config.num_bars = max(
@@ -187,13 +186,22 @@ class SpiralProgressBar(BECConnector, QWidget):
             Ring: Ring object.
         """
         if self.config.num_bars < self.config.max_number_of_bars:
-            ring = Ring(parent_progress_widget=self, **kwargs)
-            ring.config.index = self.config.num_bars
+            ring_index = self.config.num_bars
+            ring_config = RingConfig(
+                widget_class="Ring",
+                index=ring_index,
+                start_positions=90 * 16,
+                directions=-1,
+                **kwargs,
+            )
+            ring = Ring(parent_progress_widget=self, config=ring_config)
             self.config.num_bars += 1
             self._rings.append(ring)
             self.config.rings.append(ring.config)
             if self.config.color_map:
                 self.set_colors_from_map(self.config.color_map)
+            base_line_width = self._rings[ring.config.index].config.line_width
+            self.set_line_widths(base_line_width, ring.config.index)
             self.update()
             return ring
 
@@ -212,6 +220,7 @@ class SpiralProgressBar(BECConnector, QWidget):
         self._reindex_rings()
         if self.config.color_map:
             self.set_colors_from_map(self.config.color_map)
+        del ring
         self.update()
 
     def _reindex_rings(self):
@@ -270,9 +279,30 @@ class SpiralProgressBar(BECConnector, QWidget):
         num_bars = max(
             self.config.min_number_of_bars, min(num_bars, self.config.max_number_of_bars)
         )
-        if num_bars != self.config.num_bars:
-            self.config.num_bars = num_bars
-            self.initialize_bars()
+        current_num_bars = self.config.num_bars
+
+        if num_bars > current_num_bars:
+            for i in range(current_num_bars, num_bars):
+                new_ring_config = RingConfig(
+                    widget_class="Ring", index=i, start_positions=90 * 16, directions=-1
+                )
+                self.config.rings.append(new_ring_config)
+                new_ring = Ring(parent_progress_widget=self, config=new_ring_config)
+                self._rings.append(new_ring)
+
+        elif num_bars < current_num_bars:
+            for i in range(current_num_bars - 1, num_bars - 1, -1):
+                self.remove_ring(i)
+
+        self.config.num_bars = num_bars
+
+        if self.config.color_map:
+            self.set_colors_from_map(self.config.color_map)
+
+        base_line_width = self._rings[0].config.line_width
+        self.set_line_widths(base_line_width)
+
+        self.update()
 
     def set_value(self, values: int | list, ring_index: int = None):
         """
@@ -444,8 +474,6 @@ class SpiralProgressBar(BECConnector, QWidget):
                 if report_instructions:
                     instruction_type = list(report_instructions[0].keys())[0]
                     if instruction_type == "scan_progress":
-                        if self.config.num_bars != 1:
-                            self.set_number_of_bars(1)
                         self._hook_scan_progress(ring_index=0)
                     elif instruction_type == "readback":
                         devices = report_instructions[0].get("readback").get("devices")
@@ -544,7 +572,7 @@ class SpiralProgressBar(BECConnector, QWidget):
             pen = QtGui.QPen(ring.color, ring.config.line_width, QtCore.Qt.SolidLine)
             pen.setCapStyle(QtCore.Qt.RoundCap)
             painter.setPen(pen)
-            proportion = (ring.value - ring.config.min_value) / (
+            proportion = (ring.config.value - ring.config.min_value) / (
                 (ring.config.max_value - ring.config.min_value) + 1e-3
             )
             angle = int(proportion * 360 * 16 * ring.config.direction)

docs/api_reference/api_reference.md

@@ -1,4 +1,5 @@
-## API Reference
+(api_reference)=
+# API Reference
 
 ```{eval-rst}
 .. autosummary::
@@ -7,4 +8,5 @@
    :recursive:
 
    bec_widgets
+
 ```

docs/assets/apps_48dp.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48px" viewBox="0 0 24 24" width="48px" fill="#000000"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M4 8h4V4H4v4zm6 12h4v-4h-4v4zm-6 0h4v-4H4v4zm0-6h4v-4H4v4zm6 0h4v-4h-4v4zm6-10v4h4V4h-4zm-6 4h4V4h-4v4zm6 6h4v-4h-4v4zm0 6h4v-4h-4v4z"/></svg>

docs/assets/display_settings_48dp.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 20 20" height="48px" viewBox="0 0 20 20" width="48px" fill="#000000"><g><rect fill="none" height="20" width="20" x="0"/></g><g><g><path d="M16.5,3h-13C2.67,3,2,3.67,2,4.5v9C2,14.33,2.67,15,3.5,15H7v2h6v-2h3.5c0.83,0,1.5-0.67,1.5-1.5v-9 C18,3.67,17.33,3,16.5,3z M16.5,13.5h-13v-9h13V13.5z"/><rect height="1" width="7" x="5" y="7"/><polygon points="14,8 15,8 15,7 14,7 14,6 13,6 13,9 14,9"/><rect height="1" width="7" x="8" y="10"/><polygon points="6,12 7,12 7,9 6,9 6,10 5,10 5,11 6,11"/></g></g></svg>

docs/assets/index_api.svg

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="99.058548mm"
+   height="89.967583mm"
+   viewBox="0 0 99.058554 89.967582"
+   version="1.1"
+   id="svg1040"
+   inkscape:version="0.92.4 (f8dce91, 2019-08-02)"
+   sodipodi:docname="index_api.svg">
+  <defs
+     id="defs1034" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="533.74914"
+     inkscape:cy="10.90433"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="930"
+     inkscape:window-height="472"
+     inkscape:window-x="2349"
+     inkscape:window-y="267"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata1037">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(195.19933,-1.0492759)">
+    <g
+       id="g1008"
+       transform="matrix(1.094977,0,0,1.094977,-521.5523,-198.34055)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path899"
+         d="M 324.96812,187.09499 H 303.0455 v 72.1639 h 22.67969"
+         style="fill:none;stroke:#5a5a5a;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path899-3"
+         d="m 361.58921,187.09499 h 21.92262 v 72.1639 h -22.67969"
+         style="fill:none;stroke:#5a5a5a;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <g
+         transform="translate(415.87139,46.162126)"
+         id="g944">
+        <circle
+           style="fill:#5a5a5a;fill-opacity:1;stroke:#5a5a5a;stroke-width:4.53704548;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path918"
+           cx="-84.40152"
+           cy="189.84375"
+           r="2.2293637" />
+        <circle
+           style="fill:#5a5a5a;fill-opacity:1;stroke:#5a5a5a;stroke-width:4.53704548;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path918-5"
+           cx="-72.949402"
+           cy="189.84375"
+           r="2.2293637" />
+        <circle
+           style="fill:#5a5a5a;fill-opacity:1;stroke:#5a5a5a;stroke-width:4.53704548;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path918-6"
+           cx="-61.497284"
+           cy="189.84375"
+           r="2.2293637" />
+      </g>
+    </g>
+  </g>
+</svg>

docs/assets/index_contribute.svg

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="89.624855mm"
+   height="89.96759mm"
+   viewBox="0 0 89.62486 89.96759"
+   version="1.1"
+   id="svg1040"
+   inkscape:version="0.92.4 (f8dce91, 2019-08-02)"
+   sodipodi:docname="index_contribute.svg">
+  <defs
+     id="defs1034" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="683.11893"
+     inkscape:cy="-59.078181"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="930"
+     inkscape:window-height="472"
+     inkscape:window-x="2349"
+     inkscape:window-y="267"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata1037">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(234.72009,17.466935)">
+    <g
+       id="g875"
+       transform="matrix(0.99300176,0,0,0.99300176,-133.24106,-172.58804)">
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path869"
+         d="m -97.139881,161.26069 47.247024,40.25446 -47.247024,40.25446"
+         style="fill:none;stroke:#5a5a5a;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path871"
+         d="m -49.514879,241.81547 h 32.505951"
+         style="fill:none;stroke:#5a5a5a;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>

docs/assets/index_getting_started.svg

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="101.09389mm"
+   height="89.96759mm"
+   viewBox="0 0 101.09389 89.96759"
+   version="1.1"
+   id="svg1040"
+   inkscape:version="0.92.4 (f8dce91, 2019-08-02)"
+   sodipodi:docname="index_getting_started.svg">
+  <defs
+     id="defs1034" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="-93.242129"
+     inkscape:cy="-189.9825"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1875"
+     inkscape:window-height="1056"
+     inkscape:window-x="1965"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata1037">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(2.9219487,-8.5995374)">
+    <path
+       style="fill:#5a5a5a;fill-opacity:1;stroke-width:0.20233451"
+       d="M 37.270955,98.335591 C 33.358064,97.07991 31.237736,92.52319 32.964256,89.08022 c 0.18139,-0.361738 4.757999,-5.096629 10.17021,-10.521968 l 9.84041,-9.864254 -4.03738,-4.041175 -4.037391,-4.041172 -4.96415,4.916665 c -3.61569,3.581096 -5.238959,5.04997 -5.975818,5.407377 l -1.011682,0.490718 H 17.267525 1.5866055 L 0.65034544,70.96512 C -2.2506745,69.535833 -3.5952145,66.18561 -2.5925745,62.884631 c 0.53525,-1.762217 1.61699004,-3.050074 3.22528014,-3.839847 l 1.15623996,-0.56778 13.2591094,-0.05613 13.259111,-0.05613 11.5262,-11.527539 11.526199,-11.527528 H 40.622647 c -12.145542,0 -12.189222,-0.0046 -13.752801,-1.445851 -2.229871,-2.055423 -2.162799,-5.970551 0.135998,-7.938238 1.475193,-1.262712 1.111351,-1.238469 18.588522,-1.238469 12.899229,0 16.035311,0.05193 16.692589,0.276494 0.641832,0.219264 2.590731,2.051402 9.416301,8.852134 l 8.606941,8.575638 h 6.848168 c 4.837422,0 7.092281,0.07311 7.679571,0.249094 0.48064,0.144008 1.22985,0.634863 1.77578,1.163429 2.383085,2.307333 1.968685,6.539886 -0.804989,8.221882 -0.571871,0.346781 -1.38284,0.687226 -1.80217,0.756523 -0.41933,0.06928 -4.2741,0.127016 -8.56615,0.128238 -6.56998,0.0016 -7.977492,-0.04901 -8.902732,-0.321921 -0.975569,-0.287742 -1.400468,-0.622236 -3.783999,-2.978832 l -2.685021,-2.654679 -5.05411,5.051071 -5.0541,5.051081 3.926292,3.947202 c 2.365399,2.378001 4.114289,4.309171 4.399158,4.857713 0.39266,0.75606 0.47311,1.219412 0.474321,2.731516 0.003,3.083647 0.620779,2.331942 -13.598011,16.531349 -10.273768,10.259761 -12.679778,12.563171 -13.500979,12.92519 -1.267042,0.55857 -3.156169,0.681342 -4.390271,0.285321 z m 40.130741,-65.45839 c -2.212909,-0.579748 -3.782711,-1.498393 -5.51275,-3.226063 -2.522111,-2.518633 -3.633121,-5.181304 -3.633121,-8.707194 0,-3.530699 1.11238,-6.197124 3.631161,-8.704043 4.866751,-4.8438383 12.324781,-4.8550953 17.211791,-0.026 3.908758,3.862461 4.818578,9.377999 2.372188,14.380771 -0.846209,1.730481 -3.39493,4.326384 -5.143839,5.239072 -2.69708,1.407492 -6.042829,1.798628 -8.92543,1.043434 z"
+       id="path1000"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>

docs/assets/index_user_guide.svg

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="123.72241mm"
+   height="89.96759mm"
+   viewBox="0 0 123.72242 89.96759"
+   version="1.1"
+   id="svg1040"
+   inkscape:version="0.92.4 (f8dce91, 2019-08-02)"
+   sodipodi:docname="index_userguide.svg">
+  <defs
+     id="defs1034" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="332.26618"
+     inkscape:cy="83.744004"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="930"
+     inkscape:window-height="472"
+     inkscape:window-x="2349"
+     inkscape:window-y="267"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata1037">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(141.8903,-20.32143)">
+    <path
+       style="fill:#5a5a5a;fill-opacity:1;stroke-width:0.20483544"
+       d="m -139.53374,110.1657 c -0.80428,-0.24884 -1.71513,-1.11296 -2.07107,-1.96486 -0.23905,-0.57214 -0.28453,-6.28104 -0.28453,-35.720988 0,-38.274546 -0.079,-35.840728 1.19849,-36.91568 0.58869,-0.495345 4.63766,-2.187548 8.47998,-3.544073 l 1.58749,-0.560453 v -3.309822 c 0,-3.025538 0.0396,-3.388179 0.46086,-4.222122 0.68808,-1.362003 1.38671,-1.714455 4.60319,-2.322195 4.12797,-0.779966 5.13304,-0.912766 8.81544,-1.16476 11.80964,-0.808168 22.80911,2.509277 30.965439,9.3392 1.750401,1.465747 3.840861,3.5635 5.0903,5.108065 l 0.659122,0.814805 0.659109,-0.814805 c 1.249431,-1.544565 3.33988,-3.642318 5.09029,-5.108065 8.156331,-6.829923 19.155791,-10.147368 30.965441,-9.3392 3.682389,0.251994 4.68748,0.384794 8.81544,1.16476 3.21647,0.60774 3.91511,0.960192 4.60318,2.322195 0.4213,0.833943 0.46087,1.196584 0.46087,4.222122 v 3.309822 l 1.58748,0.560453 c 4.10165,1.448077 7.98852,3.072753 8.5259,3.563743 1.22643,1.120567 1.15258,-1.245868 1.15258,36.927177 0,34.567591 -0.005,35.083151 -0.40663,35.903991 -0.22365,0.45804 -0.73729,1.05665 -1.14143,1.33024 -1.22281,0.82783 -2.17721,0.70485 -5.86813,-0.7561 -9.19595,-3.63998 -18.956011,-6.38443 -26.791332,-7.53353 -3.02827,-0.44412 -9.26189,-0.61543 -11.77821,-0.3237 -5.19357,0.60212 -8.736108,2.05527 -11.700039,4.79936 -0.684501,0.63371 -1.466141,1.23646 -1.736979,1.33942 -0.63859,0.2428 -4.236521,0.2428 -4.875112,0 -0.27083,-0.10296 -1.05247,-0.70571 -1.73696,-1.33942 -2.96395,-2.74409 -6.50648,-4.19724 -11.700058,-4.79936 -2.516312,-0.29173 -8.749941,-0.12042 -11.778201,0.3237 -7.78194,1.14127 -17.39965,3.83907 -26.73341,7.49883 -3.38325,1.32658 -4.15525,1.50926 -5.11851,1.21125 z m 4.2107,-5.34052 c 5.86759,-2.29858 14.40398,-4.922695 20.2018,-6.210065 6.31584,-1.402418 8.5236,-1.646248 14.91592,-1.647338 4.68699,-7.94e-4 6.013661,0.0632 7.257809,0.3497 0.837332,0.19286 1.561052,0.312028 1.60828,0.264819 0.147111,-0.147119 -1.803289,-1.307431 -4.154879,-2.471801 -8.12511,-4.023029 -18.27311,-4.986568 -29.0861,-2.761718 -1.09536,0.22538 -2.32708,0.40827 -2.73715,0.406418 -1.12787,-0.005 -2.3054,-0.76382 -2.84516,-1.8332 l -0.46086,-0.913098 V 62.99179 35.97471 l -0.56331,0.138329 c -0.30981,0.07608 -1.89985,0.665075 -3.5334,1.308881 -2.27551,0.896801 -2.96414,1.252878 -2.94452,1.522563 0.014,0.193604 0.0372,15.284513 0.0512,33.535345 0.014,18.250839 0.0538,33.183322 0.0884,33.183322 0.0346,0 1.02543,-0.3771 2.20198,-0.83801 z m 113.006991,-32.697216 -0.0518,-33.535203 -3.17495,-1.272156 c -1.74623,-0.699685 -3.33627,-1.278755 -3.53341,-1.286819 -0.33966,-0.01389 -0.35847,1.401778 -0.35847,26.980216 v 26.994863 l -0.46087,0.913112 c -0.53976,1.06939 -1.71729,1.828088 -2.84515,1.833189 -0.41008,0.0021 -1.6418,-0.181031 -2.73716,-0.406421 -11.888201,-2.446089 -22.84337,-1.046438 -31.491022,4.02332 -1.68175,0.985941 -2.216748,1.467501 -1.36534,1.228942 1.575181,-0.441362 4.990592,-0.73864 8.524862,-0.742011 5.954408,-0.005 11.43046,0.791951 19.10874,2.78333 3.9516,1.024874 12.1555,3.687454 15.6699,5.085704 1.23926,0.49306 2.36869,0.90517 2.50985,0.9158 0.20489,0.0155 0.2462,-6.745894 0.20483,-33.515866 z m -59.76135,-2.233777 V 40.065438 l -0.95972,-1.357442 c -1.380522,-1.952627 -5.376262,-5.847994 -7.64336,-7.45136 -3.778692,-2.672401 -9.063392,-4.943324 -13.672511,-5.875304 -3.19731,-0.646503 -5.23069,-0.833103 -9.05886,-0.831312 -4.37716,0.0021 -7.70223,0.349169 -11.83461,1.235469 l -1.07538,0.230645 v 31.242342 c 0,26.565778 0.0426,31.226011 0.28429,31.133261 0.15637,-0.06 1.42379,-0.297169 2.81648,-0.527026 12.37657,-2.042634 23.21658,-0.346861 32.521639,5.087596 2.10018,1.226558 5.20202,3.618878 6.880942,5.30692 0.788609,0.792909 1.502978,1.446609 1.587468,1.452679 0.0845,0.006 0.153622,-13.411893 0.153622,-29.817719 z m 5.80221,28.3766 c 6.21476,-6.141601 15.08488,-10.061509 25.025529,-11.05933 4.262419,-0.427849 11.579921,-0.0054 16.017661,0.924912 0.75932,0.15916 1.45259,0.244888 1.54058,0.190498 0.088,-0.05434 0.16003,-14.060382 0.16003,-31.124436 V 26.176883 l -0.52136,-0.198219 c -0.66893,-0.254325 -4.77649,-0.95482 -7.159981,-1.221048 -2.41372,-0.269605 -8.559851,-0.266589 -10.759229,0.0052 -6.458111,0.798299 -12.584091,3.083792 -17.405651,6.49374 -2.267091,1.603366 -6.262831,5.498733 -7.64336,7.45136 l -0.959721,1.357438 v 29.828747 c 0,16.405812 0.0532,29.828746 0.11802,29.828746 0.065,0 0.77928,-0.65347 1.587482,-1.452149 z"
+       id="path845"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csscccscsssscsssssscscsccsccsccscsscccccccscccccccccsccscscscccscccsccssccsscccscccccsccccsccscsccsscc" />
+  </g>
+</svg>

docs/assets/rocket_launch_48dp.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 20 20" height="48px" viewBox="0 0 20 20" width="48px" fill="#000000"><g><rect fill="none" height="20" width="20" x="0"/></g><g><g><path d="M14.45,10.86l0.26,2.1c0.06,0.46-0.1,0.92-0.43,1.25l-3.55,3.55l-1.41-4.24l-2.83-2.83L2.25,9.27l3.55-3.55 c0.33-0.33,0.79-0.49,1.25-0.43l2.1,0.26C13.92,0.78,17.8,2.2,17.8,2.2C17.8,2.2,19.22,6.08,14.45,10.86z M10.2,6.62 C9.18,7.64,8.37,9.06,7.9,9.97l2.12,2.12c0.91-0.46,2.34-1.27,3.36-2.3C16.18,7,16.54,4.67,16.5,3.5C15.33,3.46,13,3.82,10.2,6.62 z M14,7.5C14,6.68,13.32,6,12.5,6C11.67,6,11,6.68,11,7.5S11.67,9,12.5,9C13.32,9,14,8.33,14,7.5z M7.99,6.92L6.86,6.78L5.02,8.61 l1.62,0.54C6.97,8.52,7.43,7.71,7.99,6.92z M10.85,13.36l0.54,1.62l1.83-1.83l-0.14-1.14C12.29,12.57,11.48,13.03,10.85,13.36z M5.25,12.5c-0.62,0-1.18,0.25-1.59,0.66C2.44,14.38,2,18,2,18s3.62-0.44,4.84-1.66c0.41-0.41,0.66-0.97,0.66-1.59 C7.5,13.51,6.49,12.5,5.25,12.5z M5.78,15.28c-0.44,0.44-1.87,0.81-1.87,0.81s0.37-1.43,0.81-1.87c0.29-0.29,0.77-0.29,1.06,0 S6.07,14.99,5.78,15.28z"/></g></g></svg>

docs/conf.py

@@ -64,6 +64,7 @@ add_module_names = False  # Remove namespaces from class/method signatures
 autodoc_inherit_docstrings = True  # If no docstring, inherit from base class
 set_type_checking_flag = True  # Enable 'expensive' imports for sphinx_autodoc_typehints
 autoclass_content = "both"  # Include both class docstring and __init__
+autodoc_mock_imports = ["pyqtgraph"]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ["_templates"]
@@ -76,6 +77,5 @@ language = "Python"
 
 html_theme = "pydata_sphinx_theme"
 html_static_path = ["_static"]
-html_css_files = ["css/custom.css"]
-html_logo = "_static/bec.png"
-html_theme_options = {"show_nav_level": 1, "navbar_align": "content"}
+html_css_files = ["custom.css"]
+html_logo = "../bec_widgets/assets/bec_widgets_icon.png"

docs/developer/developer.md

@@ -1,14 +1,6 @@
 (developer)=
 # Development
 
-```{toctree}
----
-maxdepth: 1
-hidden: true
----
-reference/
-```
-
 To contribute to the development of BEC Widgets, start by setting up the development environment:
 
 1. **Clone the Repository**: 

docs/index.md

@@ -1,39 +1,70 @@
 # BEC Widgets documentation
 
+A flexible and extensible framework for building graphical user interfaces in Python, optimized for use in the BEC environment.
+
 <br><br>
 
-````{grid} 3
+<br><br>
+
+````{grid} 2
 :gutter: 5
 
-```{grid-item-card}  Introduction
+```{grid-item-card}
 :link: introduction
 :link-type: ref
+:img-top: /assets/index_getting_started.svg
+:text-align: center
 
-General information.
+## Introduction
+
+General information about BEC Widgets.
 ```
 
-```{grid-item-card}  User
+```{grid-item-card}
 :link: user
 :link-type: ref
+:img-top:  /assets/index_user_guide.svg
+:text-align: center
 
-Information for users.
+## User guide
+
+Information for users of BEC Widgets.
 ```
 
-```{grid-item-card}  Developer
+```{grid-item-card} 
 :link: developer
 :link-type: ref
+:img-top: /assets/index_contribute.svg
+:text-align: center
 
-Information for developers.
+## Developer guide
+
+Information for developers of BEC Widgets. 
 ```
+
+```{grid-item-card} 
+:link: api_reference
+:link-type: ref
+:img-top: /assets/index_api.svg
+:text-align: center
+
+## API reference
+
+Comprehensive reference of all BEC Widget classes, functions, and methods.
+```
+
 ````
 
 
 ```{toctree}
 ---
 numbered: true
-maxdepth: 1
+maxdepth: 2
+hidden: true
 ---
 
 introduction/introduction
 user/user
 developer/developer
+api_reference/api_reference
+```

docs/user/api_reference/api_reference.md

@@ -0,0 +1,11 @@
+(user.api_reference)=
+# User API Reference
+
+```{eval-rst}
+.. autosummary::
+   :toctree: _autosummary
+   :template: custom-module-template.rst
+
+    bec_widgets.cli.client
+
+```

docs/user/applications/applications.md

@@ -0,0 +1,10 @@
+(user.applications)=
+# Applications
+
+**Coming soon**
+
+```{toctree}
+---
+maxdepth: 1
+hidden: true
+---

docs/user/apps.md

@@ -1,39 +0,0 @@
-(user.apps)=
-# Applications
-
-In the `bec_widgets/examples` directory, you will find practical applications that demonstrate the capabilities of BEC Widgets in real-world scenarios. These applications showcase the adaptability and functionality of the framework for various beamline experiment needs.
-
-**Motor Alignment Tool**
-
-This tool assists in aligning motors with samples during experiments. It enables users to move motors, visually track their movement, and record positions for precise alignment.
-
-- **Location:** `bec_widgets/examples/motor_movement`
-- **Further Details:** [Motor Alignment Tool Documentation](#user.apps.motor_app) 
-
-**General Plotting Live Acquisition Tool**
-
-This application is designed for live data visualization. It allows users to view real-time signals from detectors in a multi-grid layout, facilitating immediate analysis during experiments.
-
-- **Location:** `bec_widgets/examples/plot_app`
-- **Further Details:** [General Plotting Live Acquisition Tool Documentation](#user.apps.plot_app) 
-
-
-**Modular Application**
-
-A bespoke application built entirely using BEC Widgets' modular components. This example illustrates the framework's flexibility in creating customized GUIs tailored to specific experimental setups.
-
-- **Location:** `bec_widgets/examples/modular_app`
-- **Further Details:** [Modular Application](#user.apps.modular_app) 
-
----
-Note: The documentation for these applications is currently under development. The provided links will direct you to their respective pages once the documentation is complete.
-
-```{toctree}
----
-maxdepth: 1
-hidden: true
----
-
-apps/motor_app
-apps/plot_app
-apps/modular_app

docs/user/apps/modular_app.md

@@ -1,6 +0,0 @@
-(user.apps.modular_app)=
-
-# Modular Application
-
-
-_to be added..._

docs/user/apps/motor_app.md

@@ -1,34 +0,0 @@
-(user.apps.motor_app)=
-# Motor Alignment
-
-The Motor Alignment Application is a key component of the BEC Widgets suite, designed to facilitate precise alignment of motors. 
-Users can easily launch this app using the script located at  `/bec_widgets/example/motor_movement/motor_example.py` script. 
-The application's primary function is to enable users to align motors to specific positions and to visually track the motor's trajectory.
-
-## Controlling Motors
-
-In the top middle panel of the application, users will find combobox dropdown menus for selecting the motors they wish to track on the x and y axes of the motor map. 
-These motors are automatically loaded from the current active BEC instance, ensuring seamless integration and ease of use.
-
-There are two primary methods to control motor movements:
-
-
-1. **Manual Control with Arrow Keys:** Users can manually drive the motors using arrow keys. Before doing so, they need to select the step size for each motor, allowing for precise and incremental movements.
-2. **Direct Position Entry:** Alternatively, users can input a desired position in the text input box and then click the Go button. This action will move the motor directly to the specified coordinates.
-
-As the motors are moved, their trajectory is plotted in real-time, providing users with a visual representation of the motor's path. This feature is particularly useful for understanding the movement patterns and making necessary adjustments.
-
-
-## Saving and Exporting Data
-
-Users have the ability to save the current motor position in a table widget. This functionality is beneficial for recalling and returning to specific positions. By clicking the Go button in the table widget, the motors will automatically move back to the saved position.
-
-Additionally, users can annotate each saved position with notes and comments directly in the table widget. This feature is invaluable for keeping track of specific alignment settings or observations. The contents of the table, including the notes, can be exported to a .csv file. This exported data can be used for initiating scans or for record-keeping purposes.
-
-The table widget also supports saving and loading functionalities, allowing users to preserve their motor positions and notes across sessions. The saved files are in a user-friendly format for ease of access and use.
-
-
-## Example of Use
-
-![Motor app example](motor_app_10fps.gif)
-

docs/user/apps/plot_app.md

@@ -1,6 +0,0 @@
-(user.apps.plot_app)=
-
-# General Plotting Tool
-
-
-_to be added..._

docs/user/getting_started/auto_updates.md

@@ -0,0 +1,82 @@
+(user.auto_updates)=
+# Auto updates
+BEC Widgets provides a simple way to update the entire GUI configuration based on events. These events can be of different types, such as a new scan being started or completed, a button being pressed, a device reporting an error or the existence of a specific metadata key. This allows the users to streamline the experience of the GUI and to focus on the data and the analysis, rather than on the GUI itself.
+
+The default auto update only takes control over a single `BECFigure` widget, which is automatically added to the GUI instance. The update instance is accessible via the `bec.gui.auto_updates` object. The user can disable / enable the auto updates by setting the `enabled` attribute of the `bec.gui.auto_updates` object, e.g. 
+
+```python
+bec.gui.auto_updates.enabled = False
+```
+
+Without further customization, the auto update will automatically update the `BECFigure` widget based on the currently performed scan. The behaviour is determined by the `handler` method of the `AutoUpdate` class: 
+
+````{dropdown} Auto Updates Handler
+:icon: code-square
+:animate: fade-in-slide-down
+:open: 
+```{literalinclude} ../../../bec_widgets/cli/auto_updates.py
+:pyobject: AutoUpdates.handler
+```
+````
+
+As shown, the default handler switches between different scan names and updates the `BECFigure` widget accordingly. If the scan is a line scan, the `simple_line_scan` update method is executed. 
+
+````{dropdown} Auto Updates Simple Line Scan
+:icon: code-square
+:animate: fade-in-slide-down
+:open: 
+```{literalinclude} ../../../bec_widgets/cli/auto_updates.py
+:pyobject: AutoUpdates.simple_line_scan
+```
+````
+
+As it can be seen from the above snippet, the update method gets the default figure by calling the `get_default_figure` method. If the figure is not found, maybe because the user has deleted or closed it, no update is performed. If the figure is found, the scan info is used to extract the first reported device for the x axis and the first device of the monitored devices for the y axis. The y axis can also be set by the user using the `selected_device` attribute:
+
+```python
+bec.gui.auto_updates.selected_device = 'bpm4i'
+```
+
+
+````{dropdown} Auto Updates Code
+:icon: code-square
+:animate: fade-in-slide-down
+```{literalinclude} ../../../bec_widgets/cli/auto_updates.py
+```
+````
+
+## Custom Auto Updates
+The beamline can customize their default behaviour through customized auto update classes. This can be achieved by modifying the class located in the beamline plugin repository: `<beamline_plugin>/bec_widgets/auto_updates.py`. The class should inherit from the `AutoUpdates` class and overwrite the `handler` method. 
+
+```python
+from bec_widgets.cli.auto_updates import AutoUpdates, ScanInfo
+
+
+class PlotUpdate(AutoUpdates):
+    create_default_dock = True
+    enabled = True
+
+    # def simple_line_scan(self, info: ScanInfo) -> None:
+    #     """
+    #     Simple line scan.
+    #     """
+    #     fig = self.get_default_figure()
+    #     if not fig:
+    #         return
+    #     dev_x = info.scan_report_devices[0]
+    #     dev_y = self.get_selected_device(info.monitored_devices, self.gui.selected_device)
+    #     if not dev_y:
+    #         return
+    #     fig.clear_all()
+    #     plt = fig.plot(x_name=dev_x, y_name=dev_y)
+    #     plt.set(title=f"Custom Plot {info.scan_number}", x_label=dev_x, y_label=dev_y)
+
+    def handler(self, info: ScanInfo) -> None:
+        # EXAMPLES:
+        # if info.scan_name == "line_scan" and info.scan_report_devices:
+        #     self.simple_line_scan(info)
+        #     return
+        # if info.scan_name == "grid_scan" and info.scan_report_devices:
+        #     self.run_grid_scan_update(info)
+        #     return
+        super().handler(info)
+```

docs/user/getting_started/getting_started.md

@@ -0,0 +1,14 @@
+(user.getting_started)=
+# Getting Started
+This section provides a comprehensive guide to getting started with BEC Widgets. Whether you are new to BEC Widgets or looking to refresh your knowledge, this guide will help you set up and navigate the framework with ease.
+
+```{toctree}
+---
+maxdepth: 2
+hidden: true
+---
+
+installation/
+quick_start/
+auto_updates/
+```

docs/user/getting_started/installation.md

@@ -1,7 +1,5 @@
 (user.installation)=
 # Installation
-
-
 **Prerequisites**
 
 Before installing BEC Widgets, please ensure the following requirements are met:
@@ -11,25 +9,14 @@ Before installing BEC Widgets, please ensure the following requirements are met:
 
 **Standard Installation**
 
-Install BEC Widgets using the pip package manager. Open your terminal and execute:
+To install BEC Widgets using the pip package manager, execute the following command in your terminal for getting the default PyQT6 version in your python environment:
 
-```bash
-pip install bec_widgets
-```
-
-This command installs BEC Widgets along with its dependencies, including the default PyQt6.
-
-**Selecting a PyQt Version**
-
-BEC Widgets supports both PyQt5 and PyQt6. To install a specific version, use:
-
-For PyQt6:
 
 ```bash
 pip install bec_widgets[pyqt6]
 ```
 
-For PyQt5:
+In case you want to use PyQt5, you can install it by using the following command:
 
 ```bash
 pip install bec_widgets[pyqt5]

docs/user/getting_started/quick_start.md

@@ -0,0 +1,106 @@
+(user.command_line_introduction)=
+# Quick start
+In order to use BEC Widgets as a plotting tool for BEC, it needs to be [installed](#user.installation) in the same Python environment as the BEC IPython client (please refer to the [BEC documentation](https://bec.readthedocs.io/en/latest/user/command_line_interface.html#start-up) for more details). Upon startup, the client will automatically launch a GUI and store it as a `bec.gui` object in the client. The GUI backend will also be automatically connect to the BEC server, giving access to all information on the server and allowing the user to visualize the data in real-time.
+
+## BECDockArea
+The `bec.gui` object is your entry point to BEC Widgets. It is a [`BECDockArea`](/api_reference/_autosummary/bec_widgets.cli.client.BECDockArea) instance that can be composed of multiple [`BECDock`](/api_reference/_autosummary/bec_widgets.cli.client.BECDock)s that can be attached / detached to the main area. These docks allow users to freely arrange and customize the widgets they add to the gui, providing a flexible and customizable interface to visualize data. 
+
+## Widgets
+Widgets are the building blocks of the BEC Widgets framework. They are the visual components that allow users to interact with the data and control the behavior of the application. Each dock can contain multiple widgets, albeit we recommend for most use cases a single widget per dock. BEC Widgets provides a set of core widgets (cf. [widgets](#user.widgets)). More widgets can be added by the users, and we invite you to explore the [developer documentation](developer.widgets) to learn how to create custom widgets.
+For the introduction given here, we will focus on the `BECFigure` widget, as it is the most commonly used widget for visualizing data from BEC. The same access pattern can be used for all other widgets.
+
+**BECFigure**
+
+The [`BECFigure`](/api_reference/_autosummary/bec_widgets.cli.client.BECFigure) widget is one of the core widgets developed for BEC and can be used to visualize different plot types, such as [1D waveforms](user.widgets.waveform_1d), [2D scatter plots](user.widgets.scatter_2d), [position maps](user.widgets.motor_map) and [2D images](user.widgets.image_2d). 
+If BEC Widgets is installed, the default behaviour of BEC is to automatically add a BECFigure Widget to the existing GUI instance. This widget is directly accessible via the `fig` object from the client. Moreover, a best-effort attempt is made to automatically determine the best plot type based on the currently performed scan. This behaviour can be changed or disabled by the user. For more details, please refer to the [auto update](user.auto_updates) section.
+
+<!-- We also provide two methods [`plot()`](/api_reference/_autosummary/bec_widgets.cli.client.BECFigure.rst#bec_widgets.cli.client.BECFigure.plot), [`image()`](/api_reference/_autosummary/bec_widgets.cli.client.BECFigure.rst#bec_widgets.cli.client.BECFigure.image) and [`motor_map()`](/api_reference/_autosummary/bec_widgets.cli.client.BECFigure.rst#bec_widgets.cli.client.BECFigure.motor_map) as shortcuts to add a plot, image or motor map to the BECFigure. -->
+
+**Waveform Plot** 
+
+ The [`BECWaveForm`](/api_reference/_autosummary/bec_widgets.cli.client.BECWaveform) is a widget that can be used to visualize 1D waveform data, i.e. to plot data of a monitor against a motor position. The method [`plot()`](/api_reference/_autosummary/bec_widgets.cli.client.BECFigure.rst#bec_widgets.cli.client.BECFigure.plot) of BECFigure adds a BECWaveForm widget to the figure, and returns the plot object. 
+
+```python
+plt = fig.plot(x_name='samx', y_name='bpm4i')
+```
+Here, we create a new plot with a subscription to the devices `samx` and `bpm4i` and assign the plot to the object `plt`. We can now use this object to further customize the plot, e.g. changing the title ([`set_title()`](/api_reference/_autosummary/bec_widgets.cli.client.BECWaveform.rst#bec_widgets.cli.client.BECWaveform.set_title)), axis labels ([`set_x_label()`](/api_reference/_autosummary/bec_widgets.cli.client.BECWaveform.rst#bec_widgets.cli.client.BECWaveform.set_x_label)) or limits ([`set_x_lim()`](/api_reference/_autosummary/bec_widgets.cli.client.BECWaveform.rst#bec_widgets.cli.client.BECWaveform.set_x_lim)). We invite you to explore the API of the BECWaveForm in the [documentation](user.widgets.waveform_1d) or directly in the command line.
+
+To plot custom data, i.e. data that is not directly available through a scan in BEC, we can use the same method, but provide the data directly to the plot. 
+
+```python
+plt = fig.plot([1,2,3,4], [1,4,9,16])
+# or 
+plt = fig.plot(x=[1,2,3,4], y=[1,4,9,16])
+# or 
+plt = fig.plot(x=np.array([1,2,3,4]), y=np.array([1,4,9,16]))
+# or 
+plt = fig.plot(np.random.rand(10,2))
+```
+
+**Scatter Plot**
+
+The [`BECWaveForm`](/api_reference/_autosummary/bec_widgets.cli.client.BECWaveForm) widget can also be used to visualize 2D scatter plots. More details on setting up the scatter plot are available in the widget documentation of the [scatter plot](user.widgets.scatter_2d).
+
+**Motor Map**
+
+The [`BECMotorMap`](/api_reference/_autosummary/bec_widgets.cli.client.BECMotorMap) widget can be used to visualize the position of motors. It's focused on tracking and visualizing the position of motors, crucial for precise alignment and movement tracking during scans. More details on setting up the motor map are available in the widget documentation of the [motor map](user.widgets.motor_map).
+
+**Image Plot**
+
+The [`BECImageItem`](/api_reference/_autosummary/bec_widgets.cli.client.BECImageItem) widget can be used to visualize 2D image data for example a camera. More details on setting up the image plot are available in the widget documentation of the [image plot](user.widgets.image).
+
+### Useful Commands
+We recommend users to explore the API of the widgets by themselves since we assume that the user interface is supposed to be intuitive and self-explanatory. We appreciate feedback from user in order to constantly improve the experience and allow easy access to the gui, widgets and their functionality. We recommend checking the [API documentation](user.api_reference), but also by using BEC Widgets, exploring the available functions and check their dockstrings.
+```python
+gui.add_dock? # shows the dockstring of the add_dock method
+```
+
+In addition, we list below a few useful commands that can be used to interface with the widgets:
+
+```python
+gui.panels # returns a dictionary of all docks in the gui
+gui.add_dock() # adds a new dock to the gui
+
+dock = gui.panels['dock_2']
+dock.add_widget('BECFigure') # adds a new widget of BECFigure to the dock
+dock.widget_list # returns a list of all widgets in the dock
+
+figure = dock.widget_list[0] # assigns the created BECFigure to figure
+plt = figure.plot(x_name='samx', y_name='bpm4i') # adds a BECWaveForm plot to the figure
+plt.curves # returns a list of all curves in the plot
+```
+
+We note that commands can also be chained. For example, `gui.add_dock().add_widget('BECFigure')` will add a new dock to the gui and add a new widget of `BECFigure` to the dock. 
+
+## Composing a larger GUI
+The example given above introduces BEC Widgets with its different components, and provides an overview of how to interact with the widgets. Nevertheless, another power aspect of BEC Widgets lies in the ability to compose a larger GUI with multiple docks and widgets. This section aims to provide a tutorial like guide on how to compose a more complex GUI that (A) live-plots a 1D waveform, (B) plots data from a camera, and (C) tracks the positions of two motors.
+Let's assume BEC was just started and the `gui` object is available in the client. A single dock is already attached together with a BEC Figure. Let's add the 1D waveform to this dock, change the color of the line to white and add the title *1D Waveform* to the plot.
+
+```python
+plt = fig.plot(x_name='samx', y_name='bpm4i')
+plt.curves[0].set_color(color="white")
+plt.set_title('1D Waveform')
+```
+
+Next, we add 2 new docks to the gui, one to plot the data of a camera and one to track the positions of two motors. 
+```ipython
+cam_widget= gui.add_dock(name="cam_dock").add_widget('BECFigure').image("eiger")
+motor_widget = gui.add_dock(name="mot_dock").add_widget('BECFigure').motor_map("samx", "samy")
+```
+Note, we chain commands here which is possible since the `add_dock` and `add_widget` methods return the dock and the widget respectively. We can now further customize the widgets by changing the title, axis labels, etc.
+
+```python
+cam_widget.set_title("Camera Image Eiger")
+cam_widget.set_vrange(vmin=0, vmax=100)
+```
+As a final step, we can now add also a SpiralProgressBar to a new dock, and perform a grid_scan with the motors *samx* and *samy*.
+As you see in the example below, all docks are arranged below each other. This is the default behavior of the `add_dock` method. However, the docks can be freely arranged by drag and drop as desired by the user. We invite you to explore this by yourself following the example in the video, and build your custom GUI with BEC Widgets.
+
+```python
+prog_bar = gui.add_dock(name="prog_dock").add_widget('SpiralProgressBar')
+prog_bar.set_line_widths(15)
+scans.grid_scan(dev.samy, -2, 2, 10, dev.samx, -5, 5, 10, exp_time=0.1, relative=False)
+```
+
+![gui_complex_gui](./gui_complex_gui.gif)
+

docs/user/user.md

@@ -1,38 +1,67 @@
 (user)=
 # User
-
-**Overview**
-
 Welcome to the User section of the BEC Widgets documentation! BEC Widgets is a versatile GUI framework tailored for beamline scientists, enabling efficient and intuitive interaction with beamline experiments. This section is designed to guide both new and experienced users through the essential aspects of utilizing BEC Widgets.
 
-**Key Topics**
-
-- [Installing BEC Widgets](#user.installation): Instructions for installing BEC Widgets on your system.
-
-- [Example Applications](#user.apps): Overview of bespoke applications and demonstrations of BEC Widgets in action, showcasing its use in real-world beamline scenarios.
-
-- [Widgets Overview](#user.widgets): Detailed information on the variety of widgets available, their functions, and how to use them effectively.
-
-- [Customization and Configuration](#user.customisation): Tips on customizing and configuring BEC Widgets to suit your specific experimental needs using Qt Designer.
-
-**Bug Reports and Feature Requests**
-
-We value your feedback and contributions to improving BEC Widgets. If you encounter any issues or have ideas for new features, we encourage you to report them.
-
-- **Bug Reports:** If you find a bug or an issue, please report it on our repository's [Issues page](https://gitlab.psi.ch/bec/bec-widgets/-/issues?sort=created_date&state=opened). We have a template for bug reporting to help you provide all necessary information.
-- **Feature Requests:** Have an idea for a new feature or an enhancement? Share it with us on the [Issues page](https://gitlab.psi.ch/bec/bec-widgets/-/issues?sort=created_date&state=opened) of our repository. We have a feature request template that you can use to describe your proposal.
-
-**Development**
-
-For advanced details about BEC Widgets’ internal architecture, development contributions, or customization techniques, please explore the [Developer](#developer) section. 
-
 ```{toctree}
 ---
-maxdepth: 3
+maxdepth: 2
 hidden: true
 ---
 
-installation
-apps
-widgets
-customisation
+getting_started/getting_started.md
+applications/applications.md
+widgets/widgets.md
+api_reference/api_reference.md
+```
+
+
+***
+
+````{grid} 2
+:gutter: 5
+
+```{grid-item-card}
+:link: user.getting_started
+:link-type: ref
+:img-top: /assets/rocket_launch_48dp.svg
+:text-align: center
+
+## Getting Started
+
+Learn how to install BEC Widgets and get started with the framework.
+```
+
+```{grid-item-card}
+:link: user.applications
+:link-type: ref
+:img-top: /assets/display_settings_48dp.svg
+:text-align: center
+
+## Applications
+
+Learn how to use BEC Widgets Applications, to modify and create new applications.
+
+```
+
+```{grid-item-card}
+:link: user.widgets
+:link-type: ref
+:img-top: /assets/apps_48dp.svg
+:text-align: center
+
+## Widgets
+
+Learn about the building blocks of larger applications: widgets.
+```
+
+```{grid-item-card} 
+:link: user.api_reference
+:link-type: ref
+:img-top: /assets/index_api.svg
+:text-align: center
+
+## API reference
+
+Comprehensive reference of all user-facing classes, functions, and methods.
+```
+````

docs/user/widgets.md

@@ -1,41 +0,0 @@
-(user.widgets)=
-# Widgets
-
-## Visualization Widgets
-
-BEC Widgets includes a variety of visualization widgets designed to cater to diverse data representation needs in beamline experiments. These widgets enhance the user experience by providing intuitive and interactive data visualizations.
-
-### 1D Waveform Widget
-
-**Purpose:** This widget provides a straightforward visualization of 1D data. It is particularly useful for plotting positioner movements against detector readings, enabling users to observe correlations and patterns in a simple, linear format.
-
-**Key Features:**
-- Real-time plotting of positioner versus detector values.
-- Interactive controls for zooming and panning through the data.
-- Customizable visual elements such as line color and style.
-
-**Example of Use:**
-![Waveform 1D](./widgets/w1D.gif)
-### 2D Scatter Plot
-
-**Purpose:** The 2D scatter plot widget is designed for more complex data visualization. It employs a false color map to represent a third dimension (z-axis), making it an ideal tool for visualizing multidimensional data sets.
-
-**Key Features:**
-
-- 2D scatter plot with color-coded data points based on a third variable (two positioners for x/y vs. one detector for colormap).
-- Interactive false color map for enhanced data interpretation.
-- Tools for selecting and inspecting specific data points.
-
-**Example of Use:**
-![Waveform 1D](./widgets/scatter_2D.gif)
-### Motor Position Map
-
-**Purpose:** A specialized component derived from the Motor Alignment Tool. It's focused on tracking and visualizing the position of motors, crucial for precise alignment and movement tracking during scans.
-
-**Key Features:**
-- Real-time tracking of motor positions.
-- Visual representation of motor trajectories, aiding in alignment tasks.
-- Ability to record and recall specific motor positions for repetitive tasks.
-
-**Example of Use:**
-![Waveform 1D](./widgets/motor.gif)

docs/user/widgets/bec_figure.md

@@ -0,0 +1,100 @@
+(user.widgets.bec_figure)=
+# BECFigure
+[`BECFigure`](/api_reference/_autosummary/bec_widgets.cli.client.BECFigure) is a widget that provides a graphical user interface for creating and managing plots. It is a versatile tool that allows users to create a wide range of plots, from simple 1D waveforms to complex 2D scatter plots. BECFigure is designed to be user-friendly and interactive, enabling users to customize plots and visualize data in real-time.
+In the following, we describe 4 different type of widgets thaat are available in BECFigure. 
+
+(user.widgets.waveform_1d)=
+## [1D Waveform Widget](/api_reference/_autosummary/bec_widgets.cli.client.BECWaveform)
+
+**Purpose:** This widget provides a straightforward visualization of 1D data. It is particularly useful for plotting positioner movements against detector readings, enabling users to observe correlations and patterns in a simple, linear format.
+
+**Key Features:**
+- Real-time plotting of positioner versus detector values.
+- Interactive controls for zooming and panning through the data.
+- Customizable visual elements such as line color and style.
+
+**Example of Use:**
+![Waveform 1D](./w1D.gif)
+
+**Code example**
+The following code snipped demonstrates how to create a 1D waveform plot using BEC Widgets within BEC. More details about BEC Widgets in BEC can be found in the getting started section within the [introduction to the command line.](user.command_line_introduction)
+```python
+# adds a new dock, a new BECFigure and a BECWaveForm to the dock
+plt = gui.add_dock().add_widget('BECFigure').plot('samx', 'bpm4i')
+# add a second curve to the same plot 
+plt.add_curve_scan('samx', 'bpm3i')
+plt.set_title("Gauss plots vs. samx")
+plt.set_x_label("Motor X")
+plt.set_y_label("Gauss Signal (A.U.")
+```
+Note, the return value of the simulated devices *bpm4i* and *bpm3i* may not be gaussian signals, but they can be easily configured with the code snippet below. For more details please check the documentation of the [simulation](https://bec.readthedocs.io/en/latest/developer/devices/bec_sim.html).
+```python
+# bpm4i uses GaussianModel and samx as a reference; default settings
+dev.bpm4i.sim.select_sim_model("GaussianModel")
+# bpm3i uses StepModel and samx as a reference; default settings
+dev.bpm3i.sim.select_sim_model("StepModel")
+```
+
+(user.widgets.scatter_2d)=
+## [2D Scatter Plot](/api_reference/_autosummary/bec_widgets.cli.client.BECWaveform)
+
+**Purpose:** The 2D scatter plot widget is designed for more complex data visualization. It employs a false color map to represent a third dimension (z-axis), making it an ideal tool for visualizing multidimensional data sets.
+
+**Key Features:**
+
+- 2D scatter plot with color-coded data points based on a third variable (two positioners for x/y vs. one detector for colormap).
+- Interactive false color map for enhanced data interpretation.
+- Tools for selecting and inspecting specific data points.
+
+**Example of Use:**
+![Waveform 1D](./scatter_2D.gif)
+
+**Code example**
+The following code snipped demonstrates how to create a 2D scatter plot using BEC Widgets within BEC.
+```python
+# adds a new dock, a new BECFigure and a BECWaveForm to the dock
+plt = gui.add_dock().add_widget('BECFigure').add_plot('samx', 'samy', 'bpm4i')
+```
+
+(user.widgets.motor_map)=
+## [Motor Position Map](/api_reference/_autosummary/bec_widgets.cli.client.BECMotorMap)
+
+**Purpose:** A specialized component derived from the Motor Alignment Tool. It's focused on tracking and visualizing the position of motors, crucial for precise alignment and movement tracking during scans.
+
+**Key Features:**
+- Real-time tracking of motor positions.
+- Visual representation of motor trajectories, aiding in alignment tasks.
+
+**Example of Use:**
+![Waveform 1D](./motor.gif)
+
+**Code example**
+The following code snipped demonstrates how to create a motor map using BEC Widgets within BEC.
+```python
+# add a motor map to the gui
+mot_map = gui.add_dock().add_widget('BECFigure').motor_map('samx', 'samy')
+# change the number of points displayed
+```
+
+(user.widgets.image_2d)=
+## [Image Plot](/api_reference/_autosummary/bec_widgets.cli.client.BECImageItem)
+
+**Purpose:** A versatile widget for visualizing 2D image data, such as camera images. It provides a detailed representation of image data, with an attached color and scale bar to dynamically adjust the image display.
+
+**Key Features:**
+- Live-plotting of 2D image data from cameras (*if data stream is available in BEC*).
+- Color maps and scale bars for customizing image display.
+**Example of Use:**
+![Image 2D](./image_plot.gif)
+
+**Code example**
+The following code snipped demonstrates how to create a motor map using BEC Widgets within BEC.
+```python
+# add a camera view for the eiger camera to the gui
+cam_widget = gui.add_dock().add_widget('BECFigure').image('eiger')
+# set the title of the camera view
+cam_widget.set_title("Camera Image Eiger")
+# change the color map range, e.g. from 0 to 100, per default it is autoscaling
+# Note, the simulation has hot pixels on the detector
+cam_widget.set_vrange(vmin=0, vmax=100)
+```

docs/user/widgets/spiral_progress_bar.md

@@ -0,0 +1,54 @@
+(user.widgets.spiral_progress_bar)=
+# [Spiral Progress Bar](/api_reference/_autosummary/bec_widgets.cli.client.SpiralProgressBar)
+
+**Purpose:**
+
+The Spiral Progress Bar widget is a circular progress bar that can be used to visualize the progress of a task. The
+widget is designed to be used in applications where the progress of a task is represented as a percentage. The Spiral
+Progress Bar widget is a part of the BEC Widgets library and can be controlled directly using its API, or hooked up to
+the progress of a device readback or scan.
+
+**Key Features:**
+
+- circular progress bar to show updates on the progress of a task.
+- hooks to update the progress bar from a device readback or scan.
+- multiple progress rings to show different tasks in parallel.
+
+**Example of Use:**
+![SpiralProgressBar](./progress_bar.gif)
+
+**Code example:**
+
+The following code snipped demonstrates how to create a `SpiralProgressBar` using BEC Widgets within BEC.
+```python
+# adds a new dock with a spiral progress bar
+progress = gui.add_dock().add_widget("SpiralProgressBar")
+# customize the size of the ring
+progress.set_line_width(20)
+```
+
+By default, the Spiral Progress Bar widget will display a single ring. To add more rings, use the add_ring method:
+
+```python
+# adds a new dock with a spiral progress bar
+progress.add_ring()
+```
+
+To access rings and specify their properties, you can use `progress.rings` with an index specifying the ring index (
+starting from 0):
+
+```python
+progress.rings[0].set_line_width(20)  # set the width of the first ring
+progress.rings[1].set_line_width(10)  # set the width of the second ring
+```
+
+By default, the `SpiralProgressBar` widget is set with `progress.enable_auto_update(True)`, which will automatically
+update the bars in the widget. To manually set updates for each progress bar, use the set_update method. Note that
+manually updating a ring will disable the automatic update for the whole widget:
+
+```python
+progress.rings[0].set_update("scan")  # set the update of the first ring to be an overall scan progress
+progress.rings[1].set_update("device",
+                             "samx")  # set the update of the second ring to be a device readback (in this case, samx)
+```
+

docs/user/widgets/widgets.md

@@ -0,0 +1,15 @@
+(user.widgets)=
+# Widgets
+BEC Widgets includes a variety of visualization widgets designed to cater to diverse data representation needs in beamline experiments. These widgets enhance the user experience by providing intuitive and interactive data visualizations.
+
+```{toctree}
+---
+maxdepth: 2
+hidden: false
+---
+
+bec_figure/
+spiral_progress_bar/
+```
+
+

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec_widgets"
-version = "0.55.0"
+version = "0.57.3"
 description = "BEC Widgets"
 requires-python = ">=3.10"
 classifiers = [
@@ -31,6 +31,7 @@ dev = [
     "pytest",
     "pytest-random-order",
     "pytest-timeout",
+    "pytest-xvfb",
     "coverage",
     "pytest-qt",
     "isort",
@@ -38,6 +39,7 @@ dev = [
 ]
 pyqt5 = ["PyQt5>=5.9"]
 pyqt6 = ["PyQt6>=6.7"]
+pyside6 = ["PySide6>=6.7"]
 
 [project.urls]
 "Bug Tracker" = "https://gitlab.psi.ch/bec/bec_widgets/issues"

tests/end-2-end/conftest.py

@@ -1,40 +1,55 @@
-import pytest
+import random
+import time
+from contextlib import contextmanager
 
+import pytest
+from bec_lib.endpoints import MessageEndpoints
+
+from bec_widgets.cli.client_utils import _start_plot_process
 from bec_widgets.cli.rpc_register import RPCRegister
-from bec_widgets.cli.server import BECWidgetsCLIServer
 from bec_widgets.utils import BECDispatcher
 from bec_widgets.widgets import BECDockArea, BECFigure
 
 
+# make threads check in autouse, **will be executed at the end**; better than
+# having it in fixtures for each test, since it prevents from needing to
+# 'manually' shutdown bec_client_lib (for example) to make it happy, whereas
+# whereas in fact bec_client_lib makes its on cleanup
 @pytest.fixture(autouse=True)
-def rpc_register():
-    yield RPCRegister()
-    RPCRegister.reset_singleton()
+def threads_check_fixture(threads_check):
+    return
 
 
 @pytest.fixture
-def rpc_server_figure(qtbot, bec_client_lib, threads_check):
-    dispatcher = BECDispatcher(client=bec_client_lib)  # Has to init singleton with fixture client
-    server = BECWidgetsCLIServer(gui_id="figure", gui_class=BECFigure)
-    qtbot.addWidget(server.gui)
-    qtbot.waitExposed(server.gui)
-    qtbot.wait(1000)  # 1s long to wait until gui is ready
-    yield server
-    dispatcher.disconnect_all()
-    server.client.shutdown()
-    server.shutdown()
-    dispatcher.reset_singleton()
+def gui_id():
+    return f"figure_{random.randint(0,100)}"  # make a new gui id each time, to ensure no 'gui is alive' zombie key can perturbate
+
+
+@contextmanager
+def plot_server(gui_id, klass, client_lib):
+    dispatcher = BECDispatcher(client=client_lib)  # Has to init singleton with fixture client
+    process, output_thread = _start_plot_process(
+        gui_id, klass, client_lib._client._service_config.redis
+    )
+    try:
+        while client_lib._client.connector.get(MessageEndpoints.gui_heartbeat(gui_id)) is None:
+            time.sleep(0.3)
+        yield gui_id
+    finally:
+        process.terminate()
+        process.wait()
+        output_thread.join()
+        dispatcher.disconnect_all()
+        dispatcher.reset_singleton()
 
 
 @pytest.fixture
-def rpc_server_dock(qtbot, bec_client_lib, threads_check):
-    dispatcher = BECDispatcher(client=bec_client_lib)  # Has to init singleton with fixture client
-    server = BECWidgetsCLIServer(gui_id="figure", gui_class=BECDockArea)
-    qtbot.addWidget(server.gui)
-    qtbot.waitExposed(server.gui)
-    qtbot.wait(1000)  # 1s long to wait until gui is ready
-    yield server
-    dispatcher.disconnect_all()
-    server.client.shutdown()
-    server.shutdown()
-    dispatcher.reset_singleton()
+def rpc_server_figure(gui_id, bec_client_lib):
+    with plot_server(gui_id, BECFigure, bec_client_lib) as server:
+        yield server
+
+
+@pytest.fixture
+def rpc_server_dock(gui_id, bec_client_lib):
+    with plot_server(gui_id, BECDockArea, bec_client_lib) as server:
+        yield server

tests/end-2-end/test_bec_dock_rpc_e2e.py

@@ -1,17 +1,19 @@
+import time
+
 import numpy as np
 import pytest
+from bec_lib.client import BECClient
 from bec_lib.endpoints import MessageEndpoints
 
+from bec_widgets.cli.auto_updates import AutoUpdates
 from bec_widgets.cli.client import BECDockArea, BECFigure, BECImageShow, BECMotorMap, BECWaveform
 from bec_widgets.utils import Colors
 
 
-def test_rpc_add_dock_with_figure_e2e(rpc_server_dock, qtbot):
-    dock = BECDockArea(rpc_server_dock.gui_id)
-    dock_server = rpc_server_dock.gui
-
+def test_rpc_add_dock_with_figure_e2e(bec_client_lib, rpc_server_dock):
     # BEC client shortcuts
-    client = rpc_server_dock.client
+    dock = BECDockArea(rpc_server_dock)
+    client = bec_client_lib
     dev = client.device_manager.devices
     scans = client.scans
     queue = client.queue
@@ -21,17 +23,18 @@ def test_rpc_add_dock_with_figure_e2e(rpc_server_dock, qtbot):
     d1 = dock.add_dock("dock_1")
     d2 = dock.add_dock("dock_2")
 
-    assert len(dock_server.docks) == 3
-
+    dock_config = dock.config_dict
+    assert len(dock_config["docks"]) == 3
     # Add 3 figures with some widgets
-    fig0 = d0.add_widget_bec("BECFigure")
-    fig1 = d1.add_widget_bec("BECFigure")
-    fig2 = d2.add_widget_bec("BECFigure")
+    fig0 = d0.add_widget("BECFigure")
+    fig1 = d1.add_widget("BECFigure")
+    fig2 = d2.add_widget("BECFigure")
 
-    assert len(dock_server.docks) == 3
-    assert len(dock_server.docks["dock_0"].widgets) == 1
-    assert len(dock_server.docks["dock_1"].widgets) == 1
-    assert len(dock_server.docks["dock_2"].widgets) == 1
+    dock_config = dock.config_dict
+    assert len(dock_config["docks"]) == 3
+    assert len(dock_config["docks"]["dock_0"]["widgets"]) == 1
+    assert len(dock_config["docks"]["dock_1"]["widgets"]) == 1
+    assert len(dock_config["docks"]["dock_2"]["widgets"]) == 1
 
     assert fig1.__class__.__name__ == "BECFigure"
     assert fig1.__class__ == BECFigure
@@ -84,7 +87,7 @@ def test_rpc_add_dock_with_figure_e2e(rpc_server_dock, qtbot):
 
     # wait for scan to finish
     while not status.status == "COMPLETED":
-        qtbot.wait(200)
+        time.sleep(0.2)
 
     # plot
     plt_last_scan_data = queue.scan_storage.storage[-1].data
@@ -96,7 +99,7 @@ def test_rpc_add_dock_with_figure_e2e(rpc_server_dock, qtbot):
     last_image_device = client.connector.get_last(MessageEndpoints.device_monitor("eiger"))[
         "data"
     ].data
-    qtbot.wait(500)
+    time.sleep(0.5)
     last_image_plot = im.images[0].get_data()
     np.testing.assert_equal(last_image_device, last_image_plot)
 
@@ -115,93 +118,91 @@ def test_rpc_add_dock_with_figure_e2e(rpc_server_dock, qtbot):
     )
 
 
-def test_dock_manipulations_e2e(rpc_server_dock, qtbot):
-    dock = BECDockArea(rpc_server_dock.gui_id)
-    dock_server = rpc_server_dock.gui
+def test_dock_manipulations_e2e(rpc_server_dock):
+    dock = BECDockArea(rpc_server_dock)
 
     d0 = dock.add_dock("dock_0")
     d1 = dock.add_dock("dock_1")
     d2 = dock.add_dock("dock_2")
-    assert len(dock_server.docks) == 3
+    dock_config = dock.config_dict
+    assert len(dock_config["docks"]) == 3
 
     d0.detach()
     dock.detach_dock("dock_2")
-    assert len(dock_server.docks) == 3
-    assert len(dock_server.tempAreas) == 2
+    dock_config = dock.config_dict
+    assert len(dock_config["docks"]) == 3
+    assert len(dock.temp_areas) == 2
 
     d0.attach()
-    assert len(dock_server.docks) == 3
-    assert len(dock_server.tempAreas) == 1
+    dock_config = dock.config_dict
+    assert len(dock_config["docks"]) == 3
+    assert len(dock.temp_areas) == 1
 
     d2.remove()
-    qtbot.wait(200)
+    dock_config = dock.config_dict
+    assert len(dock_config["docks"]) == 2
 
-    assert len(dock_server.docks) == 2
-    docks_list = list(dict(dock_server.docks).keys())
-    assert ["dock_0", "dock_1"] == docks_list
+    assert ["dock_0", "dock_1"] == list(dock_config["docks"])
 
     dock.clear_all()
 
-    assert len(dock_server.docks) == 0
-    assert len(dock_server.tempAreas) == 0
+    dock_config = dock.config_dict
+    assert len(dock_config["docks"]) == 0
+    assert len(dock.temp_areas) == 0
 
 
 def test_spiral_bar(rpc_server_dock):
-    dock = BECDockArea(rpc_server_dock.gui_id)
-    dock_server = rpc_server_dock.gui
+    dock = BECDockArea(rpc_server_dock)
 
-    d0 = dock.add_dock("dock_0")
+    d0 = dock.add_dock(name="dock_0")
 
-    bar = d0.add_widget_bec("SpiralProgressBar")
+    bar = d0.add_widget("SpiralProgressBar")
     assert bar.__class__.__name__ == "SpiralProgressBar"
 
     bar.set_number_of_bars(5)
     bar.set_colors_from_map("viridis")
     bar.set_value([10, 20, 30, 40, 50])
 
-    bar_server = dock_server.docks["dock_0"].widgets[0]
+    bar_config = bar.config_dict
 
-    expected_colors = Colors.golden_angle_color("viridis", 5, "RGB")
-    bar_colors = [ring.color.getRgb() for ring in bar_server.rings]
-    bar_values = [ring.value for ring in bar_server.rings]
+    expected_colors = [list(color) for color in Colors.golden_angle_color("viridis", 5, "RGB")]
+    bar_colors = [ring.config_dict["color"] for ring in bar.rings]
+    bar_values = [ring.config_dict["value"] for ring in bar.rings]
+    assert bar_config["num_bars"] == 5
     assert bar_values == [10, 20, 30, 40, 50]
     assert bar_colors == expected_colors
 
 
-def test_spiral_bar_scan_update(rpc_server_dock, qtbot):
-    dock = BECDockArea(rpc_server_dock.gui_id)
-    dock_server = rpc_server_dock.gui
+def test_spiral_bar_scan_update(bec_client_lib, rpc_server_dock):
+    dock = BECDockArea(rpc_server_dock)
 
     d0 = dock.add_dock("dock_0")
 
-    d0.add_widget_bec("SpiralProgressBar")
+    bar = d0.add_widget("SpiralProgressBar")
 
-    client = rpc_server_dock.client
+    client = bec_client_lib
     dev = client.device_manager.devices
+    dev.samx.tolerance.set(0)
+    dev.samy.tolerance.set(0)
     scans = client.scans
 
     status = scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.05, relative=False)
+    status.wait()
 
-    while not status.status == "COMPLETED":
-        qtbot.wait(200)
-
-    qtbot.wait(200)
-    bar_server = dock_server.docks["dock_0"].widgets[0]
-    assert bar_server.config.num_bars == 1
-    np.testing.assert_allclose(bar_server.rings[0].value, 10, atol=0.1)
-    np.testing.assert_allclose(bar_server.rings[0].config.min_value, 0, atol=0.1)
-    np.testing.assert_allclose(bar_server.rings[0].config.max_value, 10, atol=0.1)
+    bar_config = bar.config_dict
+    assert bar_config["num_bars"] == 1
+    assert bar_config["rings"][0]["value"] == 10
+    assert bar_config["rings"][0]["min_value"] == 0
+    assert bar_config["rings"][0]["max_value"] == 10
 
     status = scans.grid_scan(dev.samx, -5, 5, 4, dev.samy, -10, 10, 4, relative=True, exp_time=0.1)
+    status.wait()
 
-    while not status.status == "COMPLETED":
-        qtbot.wait(200)
-
-    qtbot.wait(200)
-    assert bar_server.config.num_bars == 1
-    np.testing.assert_allclose(bar_server.rings[0].value, 16, atol=0.1)
-    np.testing.assert_allclose(bar_server.rings[0].config.min_value, 0, atol=0.1)
-    np.testing.assert_allclose(bar_server.rings[0].config.max_value, 16, atol=0.1)
+    bar_config = bar.config_dict
+    assert bar_config["num_bars"] == 1
+    assert bar_config["rings"][0]["value"] == 16
+    assert bar_config["rings"][0]["min_value"] == 0
+    assert bar_config["rings"][0]["max_value"] == 16
 
     init_samx = dev.samx.read()["samx"]["value"]
     init_samy = dev.samy.read()["samy"]["value"]
@@ -212,15 +213,60 @@ def test_spiral_bar_scan_update(rpc_server_dock, qtbot):
     dev.samy.velocity.put(5)
 
     status = scans.umv(dev.samx, 5, dev.samy, 10, relative=True)
+    status.wait()
 
-    while not status.status == "COMPLETED":
-        qtbot.wait(200)
+    bar_config = bar.config_dict
+    assert bar_config["num_bars"] == 2
+    assert bar_config["rings"][0]["value"] == final_samx
+    assert bar_config["rings"][1]["value"] == final_samy
+    assert bar_config["rings"][0]["min_value"] == init_samx
+    assert bar_config["rings"][0]["max_value"] == final_samx
+    assert bar_config["rings"][1]["min_value"] == init_samy
+    assert bar_config["rings"][1]["max_value"] == final_samy
 
-    qtbot.wait(200)
-    assert bar_server.config.num_bars == 2
-    np.testing.assert_allclose(bar_server.rings[0].value, final_samx, atol=0.1)
-    np.testing.assert_allclose(bar_server.rings[1].value, final_samy, atol=0.1)
-    np.testing.assert_allclose(bar_server.rings[0].config.min_value, init_samx, atol=0.1)
-    np.testing.assert_allclose(bar_server.rings[1].config.min_value, init_samy, atol=0.1)
-    np.testing.assert_allclose(bar_server.rings[0].config.max_value, final_samx, atol=0.1)
-    np.testing.assert_allclose(bar_server.rings[1].config.max_value, final_samy, atol=0.1)
+
+def test_auto_update(bec_client_lib, rpc_server_dock):
+    dock = BECDockArea(rpc_server_dock)
+
+    AutoUpdates.enabled = True
+    AutoUpdates.create_default_dock = True
+    dock.auto_updates = AutoUpdates(gui=dock)
+    dock.auto_updates.start_default_dock()
+    dock.selected_device = "bpm4i"
+
+    # we need to start the update script manually; normally this is done when the GUI is started
+    dock._start_update_script()
+
+    client = bec_client_lib
+    dev = client.device_manager.devices
+    scans = client.scans
+    queue = client.queue
+
+    status = scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.05, relative=False)
+    status.wait()
+
+    last_scan_data = queue.scan_storage.storage[-1].data
+
+    # get data from curves
+    plt = dock.auto_updates.get_default_figure()
+    widgets = plt.widget_list
+    plt_data = widgets[0].get_all_data()
+
+    # check plotted data
+    assert plt_data["bpm4i-bpm4i"]["x"] == last_scan_data["samx"]["samx"].val
+    assert plt_data["bpm4i-bpm4i"]["y"] == last_scan_data["bpm4i"]["bpm4i"].val
+
+    status = scans.grid_scan(
+        dev.samx, -10, 10, 5, dev.samy, -5, 5, 5, exp_time=0.05, relative=False
+    )
+    status.wait()
+
+    plt = dock.auto_updates.get_default_figure()
+    widgets = plt.widget_list
+    plt_data = widgets[0].get_all_data()
+
+    last_scan_data = queue.scan_storage.storage[-1].data
+
+    # check plotted data
+    assert plt_data[f"Scan {status.scan.scan_number}"]["x"] == last_scan_data["samx"]["samx"].val
+    assert plt_data[f"Scan {status.scan.scan_number}"]["y"] == last_scan_data["samy"]["samy"].val

tests/end-2-end/test_bec_figure_rpc_e2e.py

@@ -5,9 +5,8 @@ from bec_lib.endpoints import MessageEndpoints
 from bec_widgets.cli.client import BECFigure, BECImageShow, BECMotorMap, BECWaveform
 
 
-def test_rpc_waveform1d_custom_curve(rpc_server_figure, qtbot):
-    fig = BECFigure(rpc_server_figure.gui_id)
-    fig_server = rpc_server_figure.gui
+def test_rpc_waveform1d_custom_curve(rpc_server_figure):
+    fig = BECFigure(rpc_server_figure)
 
     ax = fig.add_plot()
     curve = ax.add_curve_custom([1, 2, 3], [1, 2, 3])
@@ -15,13 +14,12 @@ def test_rpc_waveform1d_custom_curve(rpc_server_figure, qtbot):
     curve = ax.curves[0]
     curve.set_color("blue")
 
-    assert len(fig_server.widgets) == 1
-    assert len(fig_server.widgets[ax.rpc_id].curves) == 1
+    assert len(fig.widgets) == 1
+    assert len(fig.widgets[ax.rpc_id].curves) == 1
 
 
 def test_rpc_plotting_shortcuts_init_configs(rpc_server_figure, qtbot):
-    fig = BECFigure(rpc_server_figure.gui_id)
-    fig_server = rpc_server_figure.gui
+    fig = BECFigure(rpc_server_figure)
 
     plt = fig.plot(x_name="samx", y_name="bpm4i")
     im = fig.image("eiger")
@@ -29,7 +27,7 @@ def test_rpc_plotting_shortcuts_init_configs(rpc_server_figure, qtbot):
     plt_z = fig.add_plot("samx", "samy", "bpm4i")
 
     # Checking if classes are correctly initialised
-    assert len(fig_server.widgets) == 4
+    assert len(fig.widgets) == 4
     assert plt.__class__.__name__ == "BECWaveform"
     assert plt.__class__ == BECWaveform
     assert im.__class__.__name__ == "BECImageShow"
@@ -75,24 +73,21 @@ def test_rpc_plotting_shortcuts_init_configs(rpc_server_figure, qtbot):
     }
 
 
-def test_rpc_waveform_scan(rpc_server_figure, qtbot):
-    fig = BECFigure(rpc_server_figure.gui_id)
+def test_rpc_waveform_scan(rpc_server_figure, bec_client_lib):
+    fig = BECFigure(rpc_server_figure)
 
     # add 3 different curves to track
     plt = fig.plot(x_name="samx", y_name="bpm4i")
     fig.plot(x_name="samx", y_name="bpm3a")
     fig.plot(x_name="samx", y_name="bpm4d")
 
-    client = rpc_server_figure.client
+    client = bec_client_lib
     dev = client.device_manager.devices
     scans = client.scans
     queue = client.queue
 
     status = scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.05, relative=False)
-
-    # wait for scan to finish
-    while not status.status == "COMPLETED":
-        qtbot.wait(200)
+    status.wait()
 
     last_scan_data = queue.scan_storage.storage[-1].data
 
@@ -108,38 +103,33 @@ def test_rpc_waveform_scan(rpc_server_figure, qtbot):
     assert plt_data["bpm4d-bpm4d"]["y"] == last_scan_data["bpm4d"]["bpm4d"].val
 
 
-def test_rpc_image(rpc_server_figure, qtbot):
-    fig = BECFigure(rpc_server_figure.gui_id)
+def test_rpc_image(rpc_server_figure, bec_client_lib):
+    fig = BECFigure(rpc_server_figure)
 
     im = fig.image("eiger")
 
-    client = rpc_server_figure.client
+    client = bec_client_lib
     dev = client.device_manager.devices
     scans = client.scans
 
     status = scans.line_scan(dev.samx, -5, 5, steps=10, exp_time=0.05, relative=False)
-
-    # wait for scan to finish
-    while not status.status == "COMPLETED":
-        qtbot.wait(200)
+    status.wait()
 
     last_image_device = client.connector.get_last(MessageEndpoints.device_monitor("eiger"))[
         "data"
     ].data
-    qtbot.wait(500)
     last_image_plot = im.images[0].get_data()
 
     # check plotted data
     np.testing.assert_equal(last_image_device, last_image_plot)
 
 
-def test_rpc_motor_map(rpc_server_figure, qtbot):
-    fig = BECFigure(rpc_server_figure.gui_id)
-    fig_server = rpc_server_figure.gui
+def test_rpc_motor_map(rpc_server_figure, bec_client_lib):
+    fig = BECFigure(rpc_server_figure)
 
     motor_map = fig.motor_map("samx", "samy")
 
-    client = rpc_server_figure.client
+    client = bec_client_lib
     dev = client.device_manager.devices
     scans = client.scans
 
@@ -147,10 +137,8 @@ def test_rpc_motor_map(rpc_server_figure, qtbot):
     initial_pos_y = dev.samy.read()["samy"]["value"]
 
     status = scans.mv(dev.samx, 1, dev.samy, 2, relative=True)
+    status.wait()
 
-    # wait for scan to finish
-    while not status.status == "COMPLETED":
-        qtbot.wait(200)
     final_pos_x = dev.samx.read()["samx"]["value"]
     final_pos_y = dev.samy.read()["samy"]["value"]
 

tests/end-2-end/test_rpc_register_e2e.py

@@ -3,40 +3,30 @@ import pytest
 from bec_widgets.cli.client import BECFigure, BECImageShow, BECMotorMap, BECWaveform
 
 
-def find_deepest_value(d: dict):
-    """
-    Recursively find the deepest value in a dictionary
-    Args:
-        d(dict): Dictionary to search
-
-    Returns:
-        The deepest value in the dictionary.
-    """
-    if isinstance(d, dict):
-        if d:
-            return find_deepest_value(next(iter(d.values())))
-    return d
-
-
-def test_rpc_register_list_connections(rpc_server_figure, rpc_register, qtbot):
-    fig = BECFigure(rpc_server_figure.gui_id)
-    fig_server = rpc_server_figure.gui
+def test_rpc_register_list_connections(rpc_server_figure):
+    fig = BECFigure(rpc_server_figure)
 
     plt = fig.plot(x_name="samx", y_name="bpm4i")
     im = fig.image("eiger")
     motor_map = fig.motor_map("samx", "samy")
     plt_z = fig.add_plot("samx", "samy", "bpm4i")
 
-    all_connections = rpc_register.list_all_connections()
+    # keep only class names from objects, since objects on server and client are different
+    # so the best we can do is to compare types (rpc register is unit-tested elsewhere)
+    all_connections = {obj_id: type(obj).__name__ for obj_id, obj in fig.get_all_rpc().items()}
 
-    # Construct dict of all rpc items manually
-    all_subwidgets_expected = dict(fig_server.widgets)
-    curve_1D = find_deepest_value(fig_server.widgets[plt.rpc_id]._curves_data)
-    curve_2D = find_deepest_value(fig_server.widgets[plt_z.rpc_id]._curves_data)
-    curves_expected = {curve_1D.rpc_id: curve_1D, curve_2D.rpc_id: curve_2D}
-    fig_expected = {fig.rpc_id: fig_server}
+    all_subwidgets_expected = {wid: type(widget).__name__ for wid, widget in fig.widgets.items()}
+    curve_1D = fig.widgets[plt.rpc_id]
+    curve_2D = fig.widgets[plt_z.rpc_id]
+    curves_expected = {
+        curve_1D.rpc_id: type(curve_1D).__name__,
+        curve_2D.rpc_id: type(curve_2D).__name__,
+    }
+    curves_expected.update({curve._gui_id: type(curve).__name__ for curve in curve_1D.curves})
+    curves_expected.update({curve._gui_id: type(curve).__name__ for curve in curve_2D.curves})
+    fig_expected = {fig.rpc_id: type(fig).__name__}
     image_item_expected = {
-        fig_server.widgets[im.rpc_id].images[0].rpc_id: fig_server.widgets[im.rpc_id].images[0]
+        fig.widgets[im.rpc_id].images[0].rpc_id: type(fig.widgets[im.rpc_id].images[0]).__name__
     }
 
     all_connections_expected = {

tests/unit_tests/test_bec_dock.py

@@ -58,7 +58,7 @@ def test_bec_dock_area_add_remove_dock(bec_dock_area, qtbot):
 
 def test_add_remove_bec_figure_to_dock(bec_dock_area):
     d0 = bec_dock_area.add_dock()
-    fig = d0.add_widget_bec("BECFigure")
+    fig = d0.add_widget("BECFigure")
     plt = fig.plot(x_name="samx", y_name="bpm4i")
     im = fig.image("eiger")
     mm = fig.motor_map("samx", "samy")

tests/unit_tests/test_client_utils.py

@@ -17,13 +17,13 @@ def cli_figure():
 
 def test_rpc_call_plot(cli_figure):
     fig, mock_rpc_call = cli_figure
-    fig.plot("samx", "bpm4i")
-    mock_rpc_call.assert_called_with("plot", "samx", "bpm4i")
+    fig.plot(x_name="samx", y_name="bpm4i")
+    mock_rpc_call.assert_called_with("plot", x_name="samx", y_name="bpm4i")
 
 
 def test_rpc_call_accepts_device_as_input(cli_figure):
     dev1 = FakeDevice("samx")
     dev2 = FakeDevice("bpm4i")
     fig, mock_rpc_call = cli_figure
-    fig.plot(dev1, dev2)
-    mock_rpc_call.assert_called_with("plot", "samx", "bpm4i")
+    fig.plot(x_name=dev1, y_name=dev2)
+    mock_rpc_call.assert_called_with("plot", x_name="samx", y_name="bpm4i")

tests/unit_tests/test_crosshair.py

@@ -44,8 +44,8 @@ def test_mouse_moved_signals(qtbot):
     # Create a slot that will store the emitted values as tuples
     emitted_values_1D = []
 
-    def slot(x, y_values):
-        emitted_values_1D.append((x, y_values))
+    def slot(coordinates):
+        emitted_values_1D.append(coordinates)
 
     # Connect the signal to the custom slot
     crosshair.coordinatesChanged1D.connect(slot)
@@ -59,7 +59,7 @@ def test_mouse_moved_signals(qtbot):
     crosshair.mouse_moved(event_mock)
 
     # Assert the expected behavior
-    assert emitted_values_1D == [(2.0, [5.0])]
+    assert emitted_values_1D == [(2, [5])]
 
 
 def test_mouse_moved_signals_outside(qtbot):
@@ -106,8 +106,8 @@ def test_mouse_moved_signals_2D(qtbot):
     # Create a slot that will store the emitted values as tuples
     emitted_values_2D = []
 
-    def slot(x, y):
-        emitted_values_2D.append((x, y))
+    def slot(coordinates):
+        emitted_values_2D.append(coordinates)
 
     # Connect the signal to the custom slot
     crosshair.coordinatesChanged2D.connect(slot)

tests/unit_tests/test_eiger_plot.py

@@ -1,115 +0,0 @@
-# pylint: disable = no-name-in-module,missing-class-docstring, missing-module-docstring
-import json
-from unittest.mock import MagicMock, patch
-
-import numpy as np
-import pyqtgraph as pg
-import pytest
-import zmq
-
-from bec_widgets.examples.eiger_plot.eiger_plot import EigerPlot
-
-
-# Common fixture for all tests
-@pytest.fixture
-def eiger_plot_instance(qtbot):
-    widget = EigerPlot()
-    qtbot.addWidget(widget)
-    qtbot.waitExposed(widget)
-    yield widget
-    widget.close()
-
-
-@pytest.mark.parametrize(
-    "fft_checked, rotation_index, transpose_checked, log_checked, expected_image",
-    [
-        (False, 0, False, False, np.array([[2, 1], [1, 5]], dtype=float)),  # just mask
-        (False, 1, False, False, np.array([[1, 5], [2, 1]], dtype=float)),  # 90 deg rotation
-        (False, 2, False, False, np.array([[5, 1], [1, 2]], dtype=float)),  # 180 deg rotation
-        (False, 0, True, False, np.array([[2, 1], [1, 5]], dtype=float)),  # transposed
-        (False, 0, False, True, np.array([[0.30103, 0.0], [0.0, 0.69897]], dtype=float)),  # log
-        (True, 0, False, False, np.array([[5.0, 3.0], [3.0, 9.0]], dtype=float)),  # FFT
-    ],
-)
-def test_on_image_update(
-    qtbot,
-    eiger_plot_instance,
-    fft_checked,
-    rotation_index,
-    transpose_checked,
-    log_checked,
-    expected_image,
-):
-    # Initialize image and mask
-    eiger_plot_instance.image = np.array([[1, 2], [3, 4]], dtype=float)
-    eiger_plot_instance.mask = np.array([[0, 1], [1, 0]], dtype=float)
-
-    # Mock UI elements
-    eiger_plot_instance.checkBox_FFT = MagicMock()
-    eiger_plot_instance.checkBox_FFT.isChecked.return_value = fft_checked
-    eiger_plot_instance.comboBox_rotation = MagicMock()
-    eiger_plot_instance.comboBox_rotation.currentIndex.return_value = rotation_index
-    eiger_plot_instance.checkBox_transpose = MagicMock()
-    eiger_plot_instance.checkBox_transpose.isChecked.return_value = transpose_checked
-    eiger_plot_instance.checkBox_log = MagicMock()
-    eiger_plot_instance.checkBox_log.isChecked.return_value = log_checked
-    eiger_plot_instance.imageItem = MagicMock()
-
-    # Call the method
-    eiger_plot_instance.on_image_update()
-
-    # Validate the transformations
-    np.testing.assert_array_almost_equal(eiger_plot_instance.image, expected_image, decimal=5)
-
-    # Validate that setImage was called
-    eiger_plot_instance.imageItem.setImage.assert_called_with(
-        eiger_plot_instance.image, autoLevels=False
-    )
-
-
-def test_init_ui(eiger_plot_instance):
-    assert isinstance(eiger_plot_instance.plot_item, pg.PlotItem)
-    assert isinstance(eiger_plot_instance.imageItem, pg.ImageItem)
-    assert isinstance(eiger_plot_instance.hist, pg.HistogramLUTItem)
-
-
-def test_start_zmq_consumer(eiger_plot_instance):
-    with patch("threading.Thread") as MockThread:
-        eiger_plot_instance.start_zmq_consumer()
-        MockThread.assert_called_once()
-        MockThread.return_value.start.assert_called_once()
-
-
-def test_zmq_consumer(eiger_plot_instance, qtbot):
-    fake_meta = json.dumps({"type": "int32", "shape": (2, 2)}).encode("utf-8")
-    fake_data = np.array([[1, 2], [3, 4]], dtype="int32").tobytes()
-
-    with patch("zmq.Context", autospec=True) as MockContext:
-        mock_socket = MagicMock()
-        mock_socket.recv_multipart.side_effect = ((fake_meta, fake_data),)
-        MockContext.return_value.socket.return_value = mock_socket
-
-        # Mocking the update_signal to check if it gets emitted
-        eiger_plot_instance.update_signal = MagicMock()
-
-        with patch("zmq.Poller"):
-            # will do only 1 iteration of the loop in the thread
-            eiger_plot_instance._zmq_consumer_exit_event.set()
-            # Run the method under test
-            consumer_thread = eiger_plot_instance.start_zmq_consumer()
-            consumer_thread.join()
-
-        # Check if zmq methods are called
-        # MockContext.assert_called_once()
-        assert MockContext.call_count == 1
-        mock_socket.connect.assert_called_with("tcp://129.129.95.38:20000")
-        mock_socket.setsockopt_string.assert_called_with(zmq.SUBSCRIBE, "")
-        mock_socket.recv_multipart.assert_called()
-
-        # Check if update_signal was emitted
-        eiger_plot_instance.update_signal.emit.assert_called_once()
-
-        # Validate the image data
-        np.testing.assert_array_equal(
-            eiger_plot_instance.image, np.array([[1, 2], [3, 4]], dtype="int32")
-        )

tests/unit_tests/test_motor_control.py

@@ -239,14 +239,14 @@ def test_absolute_save_current_coordinates(motor_absolute_widget):
     motor_absolute_widget.coordinates_signal.connect(capture_emit)
 
     # Trigger saving current coordinates
-    motor_absolute_widget.pushButton_save.click()
+    motor_absolute_widget.ui.pushButton_save.click()
 
     assert emitted_coordinates == [(motor_x_value, motor_y_value)]
 
 
 def test_absolute_set_absolute_coordinates(motor_absolute_widget):
-    motor_absolute_widget.spinBox_absolute_x.setValue(5)
-    motor_absolute_widget.spinBox_absolute_y.setValue(10)
+    motor_absolute_widget.ui.spinBox_absolute_x.setValue(5)
+    motor_absolute_widget.ui.spinBox_absolute_y.setValue(10)
 
     # Connect to the coordinates_signal to capture emitted values
     emitted_values = []
@@ -257,7 +257,7 @@ def test_absolute_set_absolute_coordinates(motor_absolute_widget):
     motor_absolute_widget.coordinates_signal.connect(capture_coordinates)
 
     # Simulate button click for absolute movement
-    motor_absolute_widget.pushButton_set.click()
+    motor_absolute_widget.ui.pushButton_set.click()
 
     assert emitted_values == [(5, 10)]
 
@@ -265,14 +265,14 @@ def test_absolute_set_absolute_coordinates(motor_absolute_widget):
 def test_absolute_go_absolute_coordinates(motor_absolute_widget):
     motor_absolute_widget.change_motors("samx", "samy")
 
-    motor_absolute_widget.spinBox_absolute_x.setValue(5)
-    motor_absolute_widget.spinBox_absolute_y.setValue(10)
+    motor_absolute_widget.ui.spinBox_absolute_x.setValue(5)
+    motor_absolute_widget.ui.spinBox_absolute_y.setValue(10)
 
     with patch(
         "bec_widgets.widgets.motor_control.motor_control.MotorThread.move_absolute",
         new_callable=MagicMock,
     ) as mock_move_absolute:
-        motor_absolute_widget.pushButton_go_absolute.click()
+        motor_absolute_widget.ui.pushButton_go_absolute.click()
         mock_move_absolute.assert_called_once_with("samx", "samy", (5, 10))
 
 
@@ -292,8 +292,8 @@ def test_set_precision(motor_absolute_widget):
     motor_absolute_widget.on_config_update(CONFIG_DEFAULT)
     motor_absolute_widget.set_precision(2)
 
-    assert motor_absolute_widget.spinBox_absolute_x.decimals() == 2
-    assert motor_absolute_widget.spinBox_absolute_y.decimals() == 2
+    assert motor_absolute_widget.ui.spinBox_absolute_x.decimals() == 2
+    assert motor_absolute_widget.ui.spinBox_absolute_y.decimals() == 2
 
 
 #######################################################
@@ -338,29 +338,29 @@ def test_initialization_and_config_update(motor_relative_widget):
 def test_move_motor_relative(motor_relative_widget):
     motor_relative_widget.on_config_update(CONFIG_DEFAULT)
     # Set step sizes
-    motor_relative_widget.spinBox_step_x.setValue(1)
-    motor_relative_widget.spinBox_step_y.setValue(1)
+    motor_relative_widget.ui.spinBox_step_x.setValue(1)
+    motor_relative_widget.ui.spinBox_step_y.setValue(1)
 
     # Mock the move_relative method
     motor_relative_widget.motor_thread.move_relative = MagicMock()
 
     # Simulate button clicks
-    motor_relative_widget.toolButton_right.click()
+    motor_relative_widget.ui.toolButton_right.click()
     motor_relative_widget.motor_thread.move_relative.assert_called_with(
         motor_relative_widget.motor_x, 1
     )
 
-    motor_relative_widget.toolButton_left.click()
+    motor_relative_widget.ui.toolButton_left.click()
     motor_relative_widget.motor_thread.move_relative.assert_called_with(
         motor_relative_widget.motor_x, -1
     )
 
-    motor_relative_widget.toolButton_up.click()
+    motor_relative_widget.ui.toolButton_up.click()
     motor_relative_widget.motor_thread.move_relative.assert_called_with(
         motor_relative_widget.motor_y, 1
     )
 
-    motor_relative_widget.toolButton_down.click()
+    motor_relative_widget.ui.toolButton_down.click()
     motor_relative_widget.motor_thread.move_relative.assert_called_with(
         motor_relative_widget.motor_y, -1
     )
@@ -376,21 +376,21 @@ def test_precision_update(motor_relative_widget):
     motor_relative_widget.precision_signal.connect(capture_precision)
 
     # Update precision
-    motor_relative_widget.spinBox_precision.setValue(1)
+    motor_relative_widget.ui.spinBox_precision.setValue(1)
 
     assert emitted_values == [1]
-    assert motor_relative_widget.spinBox_step_x.decimals() == 1
-    assert motor_relative_widget.spinBox_step_y.decimals() == 1
+    assert motor_relative_widget.ui.spinBox_step_x.decimals() == 1
+    assert motor_relative_widget.ui.spinBox_step_y.decimals() == 1
 
 
 def test_sync_step_sizes(motor_relative_widget):
     motor_relative_widget.on_config_update(CONFIG_DEFAULT)
-    motor_relative_widget.checkBox_same_xy.setChecked(True)
+    motor_relative_widget.ui.checkBox_same_xy.setChecked(True)
 
     # Change step size for X
-    motor_relative_widget.spinBox_step_x.setValue(2)
+    motor_relative_widget.ui.spinBox_step_x.setValue(2)
 
-    assert motor_relative_widget.spinBox_step_y.value() == 2
+    assert motor_relative_widget.ui.spinBox_step_y.value() == 2
 
 
 def test_change_motor_relative(motor_relative_widget):
@@ -420,11 +420,11 @@ def test_delete_selected_row(motor_coordinate_table):
     motor_coordinate_table.add_coordinate((3.0, 4.0))
 
     # Select the row
-    motor_coordinate_table.table.selectRow(0)
+    motor_coordinate_table.ui.table.selectRow(0)
 
     # Delete the selected row
     motor_coordinate_table.delete_selected_row()
-    assert motor_coordinate_table.table.rowCount() == 1
+    assert motor_coordinate_table.ui.table.rowCount() == 1
 
 
 def test_add_coordinate_and_table_update(motor_coordinate_table):
@@ -433,20 +433,24 @@ def test_add_coordinate_and_table_update(motor_coordinate_table):
 
     # Add coordinate in Individual mode
     motor_coordinate_table.add_coordinate((1.0, 2.0))
-    assert motor_coordinate_table.table.rowCount() == 1
+    assert motor_coordinate_table.ui.table.rowCount() == 1
 
     # Check if the coordinates match
-    x_item_individual = motor_coordinate_table.table.cellWidget(0, 3)  # Assuming X is in column 3
-    y_item_individual = motor_coordinate_table.table.cellWidget(0, 4)  # Assuming Y is in column 4
+    x_item_individual = motor_coordinate_table.ui.table.cellWidget(
+        0, 3
+    )  # Assuming X is in column 3
+    y_item_individual = motor_coordinate_table.ui.table.cellWidget(
+        0, 4
+    )  # Assuming Y is in column 4
     assert float(x_item_individual.text()) == 1.0
     assert float(y_item_individual.text()) == 2.0
 
     # Switch to Start/Stop and add coordinates
-    motor_coordinate_table.comboBox_mode.setCurrentIndex(1)  # Switch mode
+    motor_coordinate_table.ui.comboBox_mode.setCurrentIndex(1)  # Switch mode
 
     motor_coordinate_table.add_coordinate((3.0, 4.0))
     motor_coordinate_table.add_coordinate((5.0, 6.0))
-    assert motor_coordinate_table.table.rowCount() == 1
+    assert motor_coordinate_table.ui.table.rowCount() == 1
 
 
 def test_plot_coordinates_signal(motor_coordinate_table):
@@ -466,26 +470,26 @@ def test_plot_coordinates_signal(motor_coordinate_table):
     assert received
 
 
-def test_move_motor_action(motor_coordinate_table):
-    # Add a coordinate
-    motor_coordinate_table.add_coordinate((1.0, 2.0))
-
-    # Mock the motor thread move_absolute function
-    motor_coordinate_table.motor_thread.move_absolute = MagicMock()
-
-    # Trigger the move action
-    move_button = motor_coordinate_table.table.cellWidget(0, 1)
-    move_button.click()
-
-    motor_coordinate_table.motor_thread.move_absolute.assert_called_with(
-        motor_coordinate_table.motor_x, motor_coordinate_table.motor_y, (1.0, 2.0)
-    )
+# def test_move_motor_action(motor_coordinate_table,qtbot):#TODO enable again after table refactor
+#     # Add a coordinate
+#     motor_coordinate_table.add_coordinate((1.0, 2.0))
+#
+#     # Mock the motor thread move_absolute function
+#     motor_coordinate_table.motor_thread.move_absolute = MagicMock()
+#
+#     # Trigger the move action
+#     move_button = motor_coordinate_table.table.cellWidget(0, 1)
+#     move_button.click()
+#
+#     motor_coordinate_table.motor_thread.move_absolute.assert_called_with(
+#         motor_coordinate_table.motor_x, motor_coordinate_table.motor_y, (1.0, 2.0)
+#     )
 
 
 def test_plot_coordinates_signal_individual(motor_coordinate_table, qtbot):
     motor_coordinate_table.warning_message = False
     motor_coordinate_table.set_precision(3)
-    motor_coordinate_table.comboBox_mode.setCurrentIndex(0)
+    motor_coordinate_table.ui.comboBox_mode.setCurrentIndex(0)
 
     # This list will store the signals emitted during the test
     emitted_signals = []
@@ -506,8 +510,8 @@ def test_plot_coordinates_signal_individual(motor_coordinate_table, qtbot):
         assert len(coordinates) > 0, "Coordinates list is empty."
         assert reference_tag == "Individual"
         assert color == "green"
-        assert motor_coordinate_table.table.cellWidget(0, 3).text() == "1.000"
-        assert motor_coordinate_table.table.cellWidget(0, 4).text() == "2.000"
+        assert motor_coordinate_table.ui.table.cellWidget(0, 3).text() == "1.000"
+        assert motor_coordinate_table.ui.table.cellWidget(0, 4).text() == "2.000"
 
 
 #######################################################

tests/unit_tests/test_spiral_progress_bar.py

@@ -145,12 +145,12 @@ def test_bar_set_value(spiral_progress_bar):
     assert len(spiral_progress_bar.rings) == 5
 
     spiral_progress_bar.set_value([10, 20, 30, 40, 50])
-    ring_values = [ring.value for ring in spiral_progress_bar.rings]
+    ring_values = [ring.config.value for ring in spiral_progress_bar.rings]
     assert ring_values == [10, 20, 30, 40, 50]
 
     # update just one bar
     spiral_progress_bar.set_value(90, 1)
-    ring_values = [ring.value for ring in spiral_progress_bar.rings]
+    ring_values = [ring.config.value for ring in spiral_progress_bar.rings]
     assert ring_values == [10, 90, 30, 40, 50]
 
 
@@ -166,7 +166,7 @@ def test_bar_set_precision(spiral_progress_bar):
     assert ring_precision == [2, 2, 2]
 
     spiral_progress_bar.set_value([10.1234, 20.1234, 30.1234])
-    ring_values = [ring.value for ring in spiral_progress_bar.rings]
+    ring_values = [ring.config.value for ring in spiral_progress_bar.rings]
     assert ring_values == [10.12, 20.12, 30.12]
 
     spiral_progress_bar.set_precision(4, 1)
@@ -174,7 +174,7 @@ def test_bar_set_precision(spiral_progress_bar):
     assert ring_precision == [2, 4, 2]
 
     spiral_progress_bar.set_value([10.1234, 20.1234, 30.1234])
-    ring_values = [ring.value for ring in spiral_progress_bar.rings]
+    ring_values = [ring.config.value for ring in spiral_progress_bar.rings]
     assert ring_values == [10.12, 20.1234, 30.12]
 
 
@@ -189,7 +189,7 @@ def test_set_min_max_value(spiral_progress_bar):
     assert ring_max_values == [10, 10]
 
     spiral_progress_bar.set_value([5, 15])
-    ring_values = [ring.value for ring in spiral_progress_bar.rings]
+    ring_values = [ring.config.value for ring in spiral_progress_bar.rings]
     assert ring_values == [5, 10]
 
 

tests/unit_tests/test_stream_plot.py

@@ -1,158 +0,0 @@
-# pylint: disable = no-name-in-module,missing-class-docstring, missing-module-docstring
-import threading
-from unittest import mock
-
-import numpy as np
-import pytest
-from bec_lib import messages
-from bec_lib.redis_connector import RedisConnector
-from pytestqt import qtbot
-
-from bec_widgets.examples.stream_plot.stream_plot import StreamPlot
-
-
-@pytest.fixture(scope="function")
-def stream_app(qtbot):
-    """Helper function to set up the StreamPlot widget."""
-    client = mock.MagicMock()
-    widget = StreamPlot(client=client)
-    qtbot.addWidget(widget)
-    qtbot.waitExposed(widget)
-    yield widget
-    widget.close()
-
-
-def test_roi_signals_emitted(qtbot, stream_app):
-    region = (0.1, 0.9)
-    with qtbot.waitSignal(stream_app.roi_signal, timeout=1000) as blocker:
-        stream_app.roi_signal.emit(region)
-    assert blocker.signal_triggered
-    assert blocker.args == [region]
-
-
-def test_update_signals_emitted(qtbot, stream_app):
-    # Mimic data coming from the data stream
-    stream_app.plotter_data_x = [list(range(10))]  # Replace with the actual x data
-    stream_app.plotter_data_y = [list(range(10))]  # Replace with the actual y data
-
-    # Initialize curves
-    stream_app.init_curves()
-
-    with qtbot.waitSignal(stream_app.update_signal, timeout=1000) as blocker:
-        stream_app.update_signal.emit()
-    assert blocker.signal_triggered
-
-
-def test_ui_initialization(qtbot, stream_app):
-    """Checking the UI creation."""
-
-    # Check if UI elements are initialized correctly
-    assert stream_app.label_plot is not None
-    assert stream_app.label_plot_moved is not None
-    assert stream_app.label_plot_clicked is not None
-    assert stream_app.label_image_moved is not None
-    assert stream_app.label_image_clicked is not None
-
-    # Check if plots are initialized correctly
-    assert stream_app.plot is not None
-    assert stream_app.plot_image is not None
-
-    # Check if ROI selector is initialized correctly
-    assert stream_app.roi_selector is not None
-
-
-def test_1d_plotting_data(qtbot, stream_app):
-    # Set up some mock data
-    x_data = [list(range(10))]
-    y_data = [list(range(10))]
-
-    # Manually set the data attributes
-    stream_app.plotter_data_x = x_data
-    stream_app.plotter_data_y = y_data
-    stream_app.y_value_list = ["Curve 1"]
-
-    # Initialize curves and update the plot
-    stream_app.init_curves()
-    stream_app.update()  # This should update the plot with the new data
-
-    # Check the data on the plot
-    for idx, curve in enumerate(stream_app.curves):
-        np.testing.assert_array_equal(curve.xData, x_data[0])  # Access the first list of x_data
-        np.testing.assert_array_equal(
-            curve.yData, y_data[idx]
-        )  # Access the list of y_data for each curve without additional indexing
-
-
-def test_flip_even_rows(qtbot, stream_app):
-    # Create a numpy array with some known data
-    original_array = np.array(
-        [[1, 2, 3, 4, 5], [6, 7, 8, 9, 10], [11, 12, 13, 14, 15], [16, 17, 18, 19, 20]]
-    )
-
-    # Call flip_even_rows on the original array
-    flipped_array = stream_app.flip_even_rows(original_array)
-
-    # Expected array flipped along the rows with even indices
-    expected_array = np.array(
-        [[1, 2, 3, 4, 5], [10, 9, 8, 7, 6], [11, 12, 13, 14, 15], [20, 19, 18, 17, 16]]
-    )
-
-    # Check that flip_even_rows returned the expected result
-    np.testing.assert_array_equal(flipped_array, expected_array)
-
-
-def test_on_dap_update(qtbot, stream_app):
-    """2D image rendering by dap update"""
-    # Create some mock data to be "received" by the slot
-    data_dict = {"data": {"z": np.random.rand(10, 10)}}
-    metadata_dict = {}
-
-    # Trigger the slot
-    stream_app.on_dap_update(data_dict, metadata_dict)
-
-    # Apply the same transformation to the test data
-    expected_data = stream_app.flip_even_rows(data_dict["data"]["z"])
-
-    # Now check the state of the StreamPlot object
-    # For example, check the data of the image plot:
-    np.testing.assert_array_equal(stream_app.img.image, expected_data)
-
-
-####################
-# Until Here
-####################
-
-# def test_new_proj(qtbot, stream_app): #TODO this test is not working, does it make sense testing even?
-#     # Create some mock content to be "received" by the slot
-#     content_dict = {"signals": {"proj_nr": 1}}
-#     metadata_dict = {}
-#
-#     # Manually create some mock data that new_proj would work with
-#     # This step may need to be adjusted to fit the actual behavior of new_proj
-#     mock_data = {
-#         "q": np.array([1, 2, 3, 4, 5]),
-#         "norm_sum": np.array([6, 7, 8, 9, 10]),
-#         "metadata": "some_metadata",
-#     }
-#
-#     # Assume the RedisConnector client would return this data when new_proj is called
-#     mock_message = mock.MagicMock(spec=messages.DeviceMessage)
-#     mock_message.__getitem__.side_effect = lambda key: mock_data[key]
-#     stream_app.client.producer.get = mock.MagicMock(return_value=mock_message.dumps())
-#
-#     # Trigger the slot
-#     stream_app.new_proj(content_dict, metadata_dict)
-#
-#     # Now check the state of the StreamPlot object
-#     # For example, check that the plotter_data_x attribute was updated correctly:
-#     np.testing.assert_array_equal(stream_app.plotter_data_x, [mock_data["q"]])
-#     assert stream_app._current_proj == 1
-#     assert stream_app._current_q == mock_data["q"]
-#     assert stream_app._current_norm == mock_data["norm_sum"]
-#     assert stream_app._current_metadata == mock_data["metadata"]
-
-
-# def test_connection_creation(qtbot, stream_app): #TODO maybe test connections in a different way?
-#     assert isinstance(stream_app.producer, RedisConnector)
-#     assert isinstance(stream_app.data_retriever, threading.Thread)
-#     assert stream_app.data_retriever.is_alive()