feat:added launch script

.gitlab-ci.yml

@@ -22,13 +22,6 @@ workflow:
 
 include:
   - template: Security/Secret-Detection.gitlab-ci.yml
-  - project: "bec/awi_utils"
-    file: "/templates/check-packages-job.yml"
-    inputs:
-      stage: test
-      path: "."
-      pytest_args: "-v --random-order tests/"
-      exclude_packages: ""
 
 # different stages in the pipeline
 stages:
@@ -38,22 +31,8 @@ stages:
   - End2End
   - Deploy
 
-.install-qt-webengine-deps: &install-qt-webengine-deps
-  - apt-get -y install libnss3 libxdamage1 libasound2 libatomic1 libxcursor1
-  - export QTWEBENGINE_DISABLE_SANDBOX=1
-
-.clone-repos: &clone-repos
-  - 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
-
-.install-os-packages: &install-os-packages
-  - apt-get update
-  - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
-  - *install-qt-webengine-deps
-
 before_script:
-  - if [[ "$CI_PROJECT_PATH" != "bec/bec_widgets" ]]; then
+  - if [[ "$CI_PROJECT_PATH" != "bec/bec_widgets" ]]; then 
     echo -e "\033[35;1m Using branch $CHILD_PIPELINE_BRANCH of BEC Widgets \033[0;m";
     test -d bec_widgets || git clone --branch $CHILD_PIPELINE_BRANCH https://gitlab.psi.ch/bec/bec_widgets.git; cd bec_widgets;
     fi
@@ -96,21 +75,18 @@ pylint-check:
     - apt-get update
     - apt-get install -y bc
   script:
-    - git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME
     # Identify changed Python files
     - if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then
-      TARGET_BRANCH_COMMIT_SHA=$(git rev-parse origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME);
-      CHANGED_FILES=$(git diff --name-only $TARGET_BRANCH_COMMIT_SHA HEAD | grep '\.py$' || true);
+        TARGET_BRANCH_COMMIT_SHA=$(git rev-parse $CI_MERGE_REQUEST_TARGET_BRANCH_NAME);
+        CHANGED_FILES=$(git diff --name-only $SOURCE_BRANCH_COMMIT_SHA $TARGET_BRANCH_COMMIT_SHA | grep '\.py$' || true);
       else
-      CHANGED_FILES=$(git diff --name-only $CI_COMMIT_BEFORE_SHA $CI_COMMIT_SHA | grep '\.py$' || true);
+        CHANGED_FILES=$(git diff --name-only $CI_COMMIT_BEFORE_SHA $CI_COMMIT_SHA | grep '\.py$' || true);
       fi
     - if [ -z "$CHANGED_FILES" ]; then echo "No Python files changed."; exit 0; fi
 
-    - echo "Changed Python files:"
-      - $CHANGED_FILES
     # Run pylint only on changed files
     - mkdir ./pylint
-    - pylint $CHANGED_FILES --output-format=text | tee ./pylint/pylint_changed_files.log || pylint-exit $?
+    - pylint $CHANGED_FILES --output-format=text . | tee ./pylint/pylint_changed_files.log || pylint-exit $?
     - PYLINT_SCORE=$(sed -n 's/^Your code has been rated at \([-0-9.]*\)\/.*/\1/p' ./pylint/pylint_changed_files.log)
     - echo "Pylint score is $PYLINT_SCORE"
 
@@ -127,13 +103,15 @@ tests:
   stage: test
   needs: []
   variables:
-    QT_QPA_PLATFORM: "offscreen"
+      QT_QPA_PLATFORM: "offscreen"
   script:
-    - *clone-repos
-    - *install-os-packages
+    - 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 ./bec/bec_ipython_client
-    - pip install -e .[dev,pyqt6]
+    - pip install -e .[dev,pyside6]
     - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
     - coverage report
     - coverage xml
@@ -145,32 +123,140 @@ tests:
         coverage_format: cobertura
         path: coverage.xml
 
-test-matrix:
-  parallel:
-    matrix:
-      - PYTHON_VERSION:
-          - "3.10"
-          - "3.11"
-          - "3.12"
-        QT_PCKG:
-          - "pyside6"
-          - "pyqt5"
-          - "pyqt6"
-
+tests-3.10-pyside6:
+  extends: "tests"
   stage: AdditionalTests
-  needs: []
-  variables:
-    QT_QPA_PLATFORM: "offscreen"
-    PYTHON_VERSION: ""
-    QT_PCKG: ""
-  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:$PYTHON_VERSION
+  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/python:3.10
   script:
-    - *clone-repos
-    - *install-os-packages
+    - 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 ./bec/bec_ipython_client
-    - pip install -e .[dev,$QT_PCKG]
-    - pytest -v --junitxml=report.xml --random-order ./tests/unit_tests
+    - pip install -e .[dev,pyside6]
+    - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
+    - coverage report
+    - coverage xml
+  allow_failure: true
+
+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]
+    - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
+    - coverage report
+    - coverage xml
+  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]
+    - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
+    - coverage report
+    - coverage xml
+  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]
+    - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
+    - coverage report
+    - coverage xml
+  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]
+    - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
+    - coverage report
+    - coverage xml
+  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]
+    - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
+    - coverage report
+    - coverage xml
+  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]
+    - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
+    - coverage report
+    - coverage xml
+  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]
+    - coverage run --source=./bec_widgets -m pytest -v --junitxml=report.xml --random-order --full-trace ./tests/unit_tests
+    - coverage report
+    - coverage xml
   allow_failure: true
 
 end-2-end-conda:
@@ -181,25 +267,29 @@ end-2-end-conda:
   variables:
     QT_QPA_PLATFORM: "offscreen"
   script:
-    - *clone-repos
-    - *install-os-packages
+    - apt-get update
+    - apt-get install -y libgl1-mesa-glx libegl1-mesa x11-utils libxkbcommon-x11-0 libdbus-1-3
     - 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.11
+    - conda create -q -n test-environment python=3.10
     - conda init bash
     - source ~/.bashrc
     - conda activate test-environment
 
+    - 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
+
     - cd ./bec
     - source ./bin/install_bec_dev.sh -t
 
     - pip install -e ./bec_lib[dev]
     - pip install -e ./bec_ipython_client[dev]
     - cd ../
-    - pip install -e .[dev,pyqt6]
+    - pip install -e .[dev,pyside6]
     - cd ./tests/end-2-end
-    - pytest -v --start-servers --flush-redis --random-order
+    - pytest --start-servers --flush-redis --random-order
 
   artifacts:
     when: on_failure
@@ -233,7 +323,7 @@ semver:
     - pip install python-semantic-release==9.* wheel build twine
     - export GL_TOKEN=$CI_UPDATES
     - semantic-release -vv version
-
+    
     # check if any artifacts were created
     - if [ ! -d dist ]; then echo No release will be made; exit 0; fi
     - twine upload dist/* -u __token__ -p $CI_PYPI_TOKEN --skip-existing
@@ -249,7 +339,7 @@ pages:
   variables:
     TARGET_BRANCH: $CI_COMMIT_REF_NAME
   rules:
-    - if: "$CI_COMMIT_TAG != null"
+    - if: '$CI_COMMIT_TAG != null'
       variables:
         TARGET_BRANCH: $CI_COMMIT_TAG
     - if: '$CI_COMMIT_REF_NAME == "main" && $CI_PROJECT_PATH == "bec/bec_widgets"'

CHANGELOG.md

@@ -1,155 +1,171 @@
 # CHANGELOG
 
-## v0.77.0 (2024-07-02)
+
+
+## v0.55.0 (2024-05-24)
 
 ### Feature
 
-* feat(bec_connector): export config to yaml ([`a391f30`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a391f3018c50fee6a4a06884491b957df80c3cd3))
+* feat(widgets/progressbar): SpiralProgressBar added with rpc interface ([`76bd0d3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/76bd0d339ac9ae9e8a3baa0d0d4e951ec1d09670))
 
-* feat(utils): colors added convertor for rgba to hex ([`572f2fb`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/572f2fb8110d5cb0e80f3ca45ce57ef405572456))
 
-### Fix
-
-* fix(waveform): scatter 2D brush error ([`215d59c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/215d59c8bfe7fda9aff8cec8353bef9e1ce2eca1))
-
-* fix(figure): API cleanup ([`008a33a`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/008a33a9b192473cc58e90cd6d98c5bcb5f7b8c0))
-
-* fix(figure): if/else logic corrected in subplot_factory ([`3e78723`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3e787234c7274b0698423d7bf9a4c54ec46bad5f))
-
-* fix(image): processing of already displayed data; closes #106 ([`1173510`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1173510105d2d70d7e498c2ac1e122cea3a16597))
-
-* fix(bec_figure): full reconstruction with config from other bec figure ([`b6e1e20`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b6e1e20b7c8549bb092e981062329e601411dda6))
-
-* fix(motor_map): API changes updates current visualisation; motor_map can be initialised from config ([`2e2d422`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2e2d422910685a2527a3d961a468c787f771ca44))
-
-* fix(image): image add_custom_image fixed, closes #225 ([`f0556e4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f0556e44113ffee66cf735aa2dd758c62cb634f4))
-
-* fix(figure): subplot methods consolidated; added subplot factory ([`4a97105`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4a97105e4bd2ce77d72dfe5f8307dd9ee65b21b0))
-
-* fix(image): image can be fully reconstructed from config ([`797f73c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/797f73c39aa73e07d6311f3de4baea53f6c380e0))
-
-* fix(image_item): vrange added int for pydantic model check ([`b8f796f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b8f796fd3fcc15641e8fc6a3ca75c344ce90fc45))
-
-* fix(bec_figure): waveforms can be initialised from the config; widgets are deleteLater after removal ([`78673ea`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/78673ea11a47aad878128197ae6213925228ed59))
-
-### Unknown
-
-* Resolve "add VT100 console executing BEC as a widget" ([`c6a14c0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c6a14c0768a90695567a83a7895247ed0c64f3ce))
-
-## v0.76.1 (2024-06-29)
-
-### Fix
-
-* fix(plugins): fixes and tests for auto-gen plugins ([`c42511d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c42511dd44cc13577e108a6cef3166376e594f54))
-
-## v0.76.0 (2024-06-28)
-
-### Feature
-
-* feat(designer): added support for creating designer plugins automatically ([`c1dd0ee`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c1dd0ee1906dba1f2e2ae9ce40a84d55c26a1cce))
-
-### Fix
-
-* fix: fixed qwidget inheritance for ring progress bar ([`0610d2f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0610d2f9f027f8659e7149f2dfbb316ff30e337d))
-
-### Unknown
-
-* fix:parent set as first kwarg TextBox and WebsiteWidget ([`a45c407`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a45c4075684b93bfdcee03e5a416b84f61d3bc6f))
-
-## v0.75.0 (2024-06-26)
-
-### Feature
-
-* feat(widgets): added simple bec queue widget ([`3faee98`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3faee98ec80041a27e4c1f1156178de6f9dcdc63))
-
-### Refactor
-
-* refactor(dispatcher): cleanup ([`ca02132`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ca02132c8d18535b37e9192e00459d2aca6ba5cf))
-
-## v0.74.1 (2024-06-26)
+## v0.54.0 (2024-05-24)
 
 ### Build
 
-* build: added missing pytest-bec-e2e dependency; closes #219 ([`56fdae4`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/56fdae42757bdb9fa301c1e425a77e98b6eaf92b))
+* build: added pyqt6 as sphinx build dependency ([`a47a8ec`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a47a8ec413934cf7fce8d5b7a5913371d4b3b4a5))
 
-* build: fixed dependency ranges; closes #135 ([`e6a06c9`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e6a06c9f43e0ad6bbfcfa550a2f580d2a27aff66))
+### Feature
 
-### Chore
+* feat(figure): changes to support direct plot functionality ([`fc4d0f3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fc4d0f3bb2a7c2fca9c326d86eb68b305bcd548b))
 
-* chore: sorted dependencies alphabetically ([`21c807f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/21c807f35831fdd1ef2e488ab90edae4719f0cb7))
+### Refactor
+
+* refactor(reconstruction): repository structure is changed to separate assets needed for each widget ([`3455c60`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3455c602361d3b5cc3ff9190f9d2870474becf8a))
+
+* refactor(clean-up): 1st generation widgets are removed ([`edc25fb`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/edc25fbf9d5a0321e5f0a80b492b6337df807849))
+
+
+## v0.53.3 (2024-05-16)
+
+### 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: fixed doc string ([`f979a63`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f979a63d3d1a008f80e500510909750878ff4303))
-
-### Fix
-
-* fix(rings): rings properties updated right after setting ([`c8b7367`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c8b7367815b095f8e4aa8b819481efb701f2e542))
-
-* fix(motor_map): motor map can be removed from BECFigure with .remove() ([`6b25abf`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/6b25abff70280271e2eeb70450553c05d4b7c99c))
-
-### Test
-
-* test(bec_figure): tests for removing widgets with rpc e2e ([`a268caa`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a268caaa30711fcc7ece542d24578d74cbf65c77))
-
-## v0.74.0 (2024-06-25)
-
-### Documentation
-
-* docs(becfigure): docs added ([`a51b15d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a51b15da3f5e83e0c897a0342bdb05b9c677a179))
+* docs: update install instructions ([`57ee735`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/57ee735e5c2436d45a285507cdc939daa20e8e8f))
 
 ### Feature
 
-* feat(waveform1d): dap LMFit model can be added to plot ([`1866ba6`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1866ba66c8e3526661beb13fff3e13af6a0ae562))
-
-### Test
-
-* test(waveform1d): dap e2e test added ([`7271b42`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7271b422f98ef9264970d708811c414b69a644db))
-
-## v0.73.2 (2024-06-25)
+* feat: moved to pyproject.toml; closes #162 ([`c86ce30`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c86ce302a964d71ee631f0817609ab5aa0e3ab0f))
 
 ### Fix
 
-* fix(vscode): only run terminate if the process is still alive ([`7120f3e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7120f3e93b054b788f15e2d5bcd688e3c140c1ce))
+* fix: fixed semver job and upgraded to v9 ([`32e1a9d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/32e1a9d8472eb1c25d30697d407a8ffecd04e75d))
 
-* fix(rpc): trigger shutdown of server when gui is terminated ([`acc1318`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/acc13183e28030e3ca9af21bb081e1eed081622b))
+### Refactor
 
-* fix(rpc): remove of calling "close" and waiting for gui_is_alive ([`f75fc19`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f75fc19c5b10022763252917ca473f404a25165a))
+* refactor: applied formatter ([`4117fd7`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4117fd7b5b2090ff4fb7ad9e0d92cc87cd13ed5f))
 
-## v0.73.1 (2024-06-25)
+
+## v0.52.1 (2024-05-08)
 
 ### Fix
 
-* fix(ringprogressbar): removed hard-coded endpoint strings ([`1de3cbf`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1de3cbf65a1832150917a7549a1bf3efdee6371a))
+* fix(docstrings): docstrings formating fixed for sphinx to properly format readdocs ([`7f2f7cd`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/7f2f7cd07a14876617cd83cedde8c281fdc52c3a))
 
-## v0.73.0 (2024-06-25)
+
+## 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: add new default scaling of image_item ([`df812ea`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/df812eaad5989f2930dde41d87491868505af946))
+* feat(utils/layout_manager): added GridLayoutManager to extend functionalities of native QGridLayout ([`fcd6ef0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/fcd6ef0975dc872f69c9d6fb2b8a1ad04a423aae))
 
-### Test
-
-* test: add test for imageitem ([`88ecd05`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/88ecd05b95974938ef1efff40e81854baf004cb4))
-
-## v0.72.2 (2024-06-25)
+* feat(widget/dock): BECDock and BECDock area for dockable windows ([`d8ff8af`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/d8ff8afcd474660a6069bbdab05f10a65f221727))
 
 ### Fix
 
-* fix(designer): fixed designer for pyenv and venv; closes #237 ([`e631fc1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e631fc15d8707b73d58cb64316e115a7e43961ea))
+* fix(widgets/dock): BECDockArea close overwrites the default pyqtgraph Container close + minor improvements ([`ceae979`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/ceae979f375ecc33c5c97148f197655c1ca57b6c))
 
-## v0.72.1 (2024-06-24)
+### Refactor
 
-### Fix
+* refactor(widget/plots): WidgetConfig changed to SubplotConfig ([`03fa1f2`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/03fa1f26d0fa6b58ed05556fb2438d1e62f6c107))
 
-* fix: renamed spiral progress bar to ring progress bar; closes #235 ([`e5c0087`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e5c0087c9aed831edbe1c172746325a772a3bafa))
 
-### Test
+## v0.51.0 (2024-05-07)
 
-* test: bugfix to prohibit leackage of mock ([`4348ed1`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4348ed1bb2182da6bdecaf372d6db85279e60af8))
+### Build
 
-## v0.72.0 (2024-06-24)
+* 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(connector): added threadpool wrapper ([`4ca1efe`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/4ca1efeeb8955604069f7b98374c7f82e1a8da67))
+* 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 +1,8 @@
-from .client import *
+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 BECDockArea, BECFigure
+    from .client import BECFigure
 
 
 class ScanInfo(BaseModel):
@@ -15,24 +15,12 @@ class ScanInfo(BaseModel):
     scan_report_devices: list
     monitored_devices: list
     status: str
-    model_config: dict = {"validate_assignment": True}
 
 
 class AutoUpdates:
-    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"
+    def __init__(self, figure: BECFigure, enabled: bool = True):
+        self.enabled = enabled
+        self.figure = figure
 
     @staticmethod
     def get_scan_info(msg) -> ScanInfo:
@@ -56,18 +44,6 @@ 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.
@@ -110,44 +86,33 @@ 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.gui.selected_device)
+        dev_y = self.get_selected_device(info.monitored_devices, self.figure.selected_device)
         if not dev_y:
             return
-        fig.clear_all()
-        plt = fig.plot(x_name=dev_x, y_name=dev_y, label=f"Scan {info.scan_number} - {dev_y}")
+        self.figure.clear_all()
+        plt = self.figure.plot(dev_x, 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.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} - {dev_z}"
-        )
+        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}")
         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.gui.selected_device)
+        dev_y = self.get_selected_device(info.monitored_devices, self.figure.selected_device)
         if not dev_y:
             return
-        fig.clear_all()
-        plt = fig.plot(x_name=dev_x, y_name=dev_y, label=f"Scan {info.scan_number} - {dev_y}")
+        self.figure.clear_all()
+        plt = self.figure.plot(dev_x, 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_utils.py

@@ -13,27 +13,19 @@ from functools import wraps
 from typing import TYPE_CHECKING
 
 from bec_lib.endpoints import MessageEndpoints
-from bec_lib.logger import bec_logger
 from bec_lib.utils.import_utils import isinstance_based_on_class_name, lazy_import, lazy_import_from
-from qtpy.QtCore import QEventLoop, QSocketNotifier, QTimer
+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
-
-from bec_lib.serialization import MsgpackSerialization
-
 messages = lazy_import("bec_lib.messages")
 # from bec_lib.connector import MessageObject
 MessageObject = lazy_import_from("bec_lib.connector", ("MessageObject",))
 BECDispatcher = lazy_import_from("bec_widgets.utils.bec_dispatcher", ("BECDispatcher",))
 
-logger = bec_logger.logger
-
 
 def rpc_call(func):
     """
@@ -66,88 +58,20 @@ def rpc_call(func):
     return wrapper
 
 
-def _get_output(process, logger) -> None:
-    log_func = {process.stdout: logger.debug, process.stderr: logger.error}
-    stream_buffer = {process.stdout: [], process.stderr: []}
-    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)
-            for stream in (process.stdout, process.stderr):
-                buf = stream_buffer[stream]
-                if stream in readylist:
-                    buf.append(stream.read(4096))
-                output, _, remaining = "".join(buf).rpartition("\n")
-                if output:
-                    log_func[stream](output)
-                    buf.clear()
-                    buf.append(remaining)
-    except Exception as e:
-        print(f"Error reading process output: {str(e)}")
-
-
-def _start_plot_process(gui_id, gui_class, config, logger=None) -> None:
-    """
-    Start the plot in a new process.
-
-    Logger must be a logger object with "debug" and "error" functions,
-    or it can be left to "None" as default. None means output from the
-    process will not be captured.
-    """
-    # pylint: disable=subprocess-run-check
-    command = ["bec-gui-server", "--id", gui_id, "--gui_class", gui_class.__name__]
-    if config:
-        command.extend(["--config", config])
-
-    env_dict = os.environ.copy()
-    env_dict["PYTHONUNBUFFERED"] = "1"
-    if logger is None:
-        stdout_redirect = subprocess.DEVNULL
-        stderr_redirect = subprocess.DEVNULL
-    else:
-        stdout_redirect = subprocess.PIPE
-        stderr_redirect = subprocess.PIPE
-
-    process = subprocess.Popen(
-        command,
-        text=True,
-        start_new_session=True,
-        stdout=stdout_redirect,
-        stderr=stderr_redirect,
-        env=env_dict,
-    )
-    if logger is None:
-        process_output_processing_thread = None
-    else:
-        process_output_processing_thread = threading.Thread(
-            target=_get_output, args=(process, logger)
-        )
-        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._process_output_processing_thread = None
-        self.auto_updates = self._get_update_script()
+        self.update_script = self._get_update_script()
         self._target_endpoint = MessageEndpoints.scan_status()
         self._selected_device = None
+        self.stderr_output = []
 
-    def _get_update_script(self) -> AutoUpdates | None:
+    def _get_update_script(self) -> AutoUpdates:
         eps = imd.entry_points(group="bec.widgets.auto_updates")
         for ep in eps:
             if ep.name == "plugin_widgets_update":
-                try:
-                    spec = importlib.util.find_spec(ep.module)
-                    # if the module is not found, we skip it
-                    if spec is None:
-                        continue
-                    return ep.load()(gui=self)
-                except Exception as e:
-                    print(f"Error loading auto update script from plugin: {str(e)}")
+                return ep.load()(figure=self)
         return None
 
     @property
@@ -173,7 +97,7 @@ class BECGuiClientMixin:
 
     @staticmethod
     def _handle_msg_update(msg: MessageObject, parent: BECGuiClientMixin) -> None:
-        if parent.auto_updates is not None:
+        if parent.update_script is not None:
             # pylint: disable=protected-access
             parent._update_script_msg_parser(msg.value)
 
@@ -181,35 +105,90 @@ class BECGuiClientMixin:
         if isinstance(msg, messages.ScanStatusMessage):
             if not self.gui_is_alive():
                 return
-            self.auto_updates.run(msg)
+            self.update_script.run(msg)
 
     def show(self) -> None:
         """
         Show the figure.
         """
         if self._process is None or self._process.poll() is not None:
-            self._start_update_script()
-            self._process, self._process_output_processing_thread = _start_plot_process(
-                self._gui_id, self.__class__, self._client._service_config.config_path
-            )
+            self._start_plot_process()
         while not self.gui_is_alive():
             print("Waiting for GUI to start...")
             time.sleep(1)
 
     def close(self) -> None:
         """
-        Close the gui window.
+        Close the figure.
         """
         if self._process is None:
             return
-
+        if self.gui_is_alive():
+            self._run_rpc("close", (), wait_for_rpc_response=True)
+        else:
+            self._run_rpc("close", (), wait_for_rpc_response=False)
+        self._process.terminate()
+        self._process_output_processing_thread.join()
+        self._process = None
         self._client.shutdown()
-        if self._process:
-            self._process.terminate()
-            if self._process_output_processing_thread:
-                self._process_output_processing_thread.join()
-            self._process.wait()
-            self._process = None
+
+    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.
+        """
+        if self._process is None:
+            return
+        print("".join(self.stderr_output))
+        # 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):
@@ -221,48 +200,6 @@ class RPCResponseTimeoutError(Exception):
         )
 
 
-class QtRedisMessageWaiter:
-    def __init__(self, redis_connector, message_to_wait):
-        self.ev_loop = QEventLoop()
-        self.response = None
-        self.connector = redis_connector
-        self.message_to_wait = message_to_wait
-        self.pubsub = redis_connector._redis_conn.pubsub()
-        self.pubsub.subscribe(self.message_to_wait.endpoint)
-        fd = self.pubsub.connection._sock.fileno()
-        self.notifier = QSocketNotifier(fd, QSocketNotifier.Read)
-        self.notifier.activated.connect(self._pubsub_readable)
-
-    def _msg_received(self, msg_obj):
-        self.response = msg_obj.value
-        self.ev_loop.quit()
-
-    def wait(self, timeout=1):
-        timer = QTimer()
-        timer.singleShot(timeout * 1000, self.ev_loop.quit)
-        self.ev_loop.exec_()
-        timer.stop()
-        self.notifier.setEnabled(False)
-        self.pubsub.close()
-        return self.response
-
-    def _pubsub_readable(self, fd):
-        while True:
-            msg = self.pubsub.get_message()
-            if msg:
-                if msg["type"] == "subscribe":
-                    # get_message buffers, so we may already have the answer
-                    # let's check...
-                    continue
-                else:
-                    break
-            else:
-                return
-        channel = msg["channel"].decode()
-        msg = MessageObject(topic=channel, value=MsgpackSerialization.loads(msg["data"]))
-        self.connector._execute_callback(self._msg_received, msg, {})
-
-
 class RPCBase:
     def __init__(self, gui_id: str = None, config: dict = None, parent=None) -> None:
         self._client = BECDispatcher().client
@@ -289,7 +226,7 @@ class RPCBase:
             parent = parent._parent
         return parent
 
-    def _run_rpc(self, method, *args, wait_for_rpc_response=True, timeout=3, **kwargs):
+    def _run_rpc(self, method, *args, wait_for_rpc_response=True, **kwargs):
         """
         Run the RPC call.
 
@@ -311,24 +248,16 @@ class RPCBase:
 
         # pylint: disable=protected-access
         receiver = self._root._gui_id
-        if wait_for_rpc_response:
-            redis_msg = QtRedisMessageWaiter(
-                self._client.connector, MessageEndpoints.gui_instruction_response(request_id)
-            )
-
         self._client.connector.set_and_publish(MessageEndpoints.gui_instructions(receiver), rpc_msg)
 
-        if wait_for_rpc_response:
-            response = redis_msg.wait(timeout)
-
-            if response is None:
-                raise RPCResponseTimeoutError(request_id, timeout)
-
-            # get class name
-            if not response.accepted:
-                raise ValueError(response.message["error"])
-            msg_result = response.message.get("result")
-            return self._create_widget_from_msg_result(msg_result)
+        if not wait_for_rpc_response:
+            return None
+        response = self._wait_for_response(request_id)
+        # get class name
+        if not response.content["accepted"]:
+            raise ValueError(response.content["message"]["error"])
+        msg_result = response.content["message"].get("result")
+        return self._create_widget_from_msg_result(msg_result)
 
     def _create_widget_from_msg_result(self, msg_result):
         if msg_result is None:
@@ -351,6 +280,30 @@ class RPCBase:
             return cls(parent=self, **msg_result)
         return msg_result
 
+    def _wait_for_response(self, request_id: str, timeout: int = 5):
+        """
+        Wait for the response from the server.
+
+        Args:
+            request_id(str): The request ID.
+            timeout(int): The timeout in seconds.
+
+        Returns:
+            The response from the server.
+        """
+        start_time = time.time()
+        response = None
+
+        while response is None and self.gui_is_alive() and (time.time() - start_time) < timeout:
+            response = self._client.connector.get(
+                MessageEndpoints.gui_instruction_response(request_id)
+            )
+            QCoreApplication.processEvents()  # keep UI responsive (and execute signals/slots)
+        if response is None and (time.time() - start_time) >= timeout:
+            raise RPCResponseTimeoutError(request_id, timeout)
+
+        return response
+
     def gui_is_alive(self):
         """
         Check if the GUI is alive.

bec_widgets/cli/generate_cli.py

@@ -1,17 +1,10 @@
 # pylint: disable=missing-module-docstring
 from __future__ import annotations
 
-import argparse
 import inspect
-import os
 import sys
-from typing import Literal
 
 import black
-import isort
-
-from bec_widgets.utils.generate_designer_plugin import DesignerPluginGenerator
-from bec_widgets.utils.plugin_utils import get_rpc_classes
 
 if sys.version_info >= (3, 11):
     from typing import get_overloads
@@ -21,52 +14,30 @@ else:
         "If you want to use the real function 'typing.get_overloads()', please use Python 3.11 or later."
     )
 
-    def get_overloads(_obj):
-        """
-        Dummy function for Python versions before 3.11.
-        """
+    def get_overloads(obj):
+        # Dummy function for Python versions before 3.11
         return []
 
 
 class ClientGenerator:
     def __init__(self):
         self.header = """# This file was automatically generated by generate_cli.py\n
-import enum
-from typing import Literal, Optional, overload
-
-from bec_widgets.cli.client_utils import RPCBase, rpc_call, BECGuiClientMixin
-
-# pylint: skip-file"""
+from bec_widgets.cli.client_utils import rpc_call, RPCBase, BECGuiClientMixin
+from typing import Literal, Optional, overload"""
 
         self.content = ""
 
-    def generate_client(
-        self, published_classes: dict[Literal["connector_classes", "top_level_classes"], list[type]]
-    ):
+    def generate_client(self, published_classes: list):
         """
         Generate the client for the published classes.
 
         Args:
-            published_classes(dict): A dictionary with keys "connector_classes" and "top_level_classes" and values as lists of classes.
+            published_classes(list): The list of published classes (e.g. [BECWaveform1D, BECFigure]).
         """
-        self.write_client_enum(published_classes["top_level_classes"])
-        for cls in published_classes["connector_classes"]:
+        for cls in published_classes:
             self.content += "\n\n"
             self.generate_content_for_class(cls)
 
-    def write_client_enum(self, published_classes: list[type]):
-        """
-        Write the client enum to the content.
-        """
-        self.content += """
-class Widgets(str, enum.Enum):
-    \"\"\"
-    Enum for the available widgets.
-    \"\"\"
-    """
-        for cls in published_classes:
-            self.content += f'{cls.__name__} = "{cls.__name__}"\n    '
-
     def generate_content_for_class(self, cls):
         """
         Generate the content for the class.
@@ -76,6 +47,11 @@ class Widgets(str, enum.Enum):
         """
 
         class_name = cls.__name__
+        module = cls.__module__
+
+        # Generate the header
+        #         self.header += f"""
+        # from {module} import {class_name}"""
 
         # Generate the content
         if cls.__name__ == "BECDockArea":
@@ -84,9 +60,6 @@ class {class_name}(RPCBase, BECGuiClientMixin):"""
         else:
             self.content += f"""
 class {class_name}(RPCBase):"""
-        if not cls.USER_ACCESS:
-            self.content += """...
-    """
         for method in cls.USER_ACCESS:
             obj = getattr(cls, method)
             if isinstance(obj, property):
@@ -128,61 +101,39 @@ class {class_name}(RPCBase):"""
         except black.NothingChanged:
             formatted_content = full_content
 
-        isort.Config(
-            profile="black",
-            line_length=100,
-            multi_line_output=3,
-            include_trailing_comma=True,
-            known_first_party=["bec_widgets"],
-        )
-        formatted_content = isort.code(formatted_content)
-
         with open(file_name, "w", encoding="utf-8") as file:
             file.write(formatted_content)
 
 
-def main():
-    """
-    Main entry point for the script, controlled by command line arguments.
-    """
-
-    parser = argparse.ArgumentParser(description="Auto-generate the client for RPC widgets")
-    parser.add_argument("--core", action="store_true", help="Whether to generate the core client")
-
-    args = parser.parse_args()
-
-    if args.core:
-        current_path = os.path.dirname(__file__)
-        client_path = os.path.join(current_path, "client.py")
-
-        rpc_classes = get_rpc_classes("bec_widgets")
-        rpc_classes["connector_classes"].sort(key=lambda x: x.__name__)
-
-        generator = ClientGenerator()
-        generator.generate_client(rpc_classes)
-        generator.write(client_path)
-
-        for cls in rpc_classes["top_level_classes"]:
-            plugin = DesignerPluginGenerator(cls)
-            if not hasattr(plugin, "info"):
-                continue
-
-            # if the class directory already has a register, plugin and pyproject file, skip
-            if os.path.exists(
-                os.path.join(plugin.info.base_path, f"register_{plugin.info.plugin_name_snake}.py")
-            ):
-                continue
-            if os.path.exists(
-                os.path.join(plugin.info.base_path, f"{plugin.info.plugin_name_snake}_plugin.py")
-            ):
-                continue
-            if os.path.exists(
-                os.path.join(plugin.info.base_path, f"{plugin.info.plugin_name_snake}.pyproject")
-            ):
-                continue
-            plugin.run()
-
-
 if __name__ == "__main__":  # pragma: no cover
-    sys.argv = ["generate_cli.py", "--core"]
-    main()
+    import os
+
+    from bec_widgets.utils import BECConnector
+    from bec_widgets.widgets import BECDock, BECDockArea, BECFigure, SpiralProgressBar
+    from bec_widgets.widgets.figure.plots.image.image import BECImageShow
+    from bec_widgets.widgets.figure.plots.image.image_item import BECImageItem
+    from bec_widgets.widgets.figure.plots.motor_map.motor_map import BECMotorMap
+    from bec_widgets.widgets.figure.plots.plot_base import BECPlotBase
+    from bec_widgets.widgets.figure.plots.waveform.waveform import BECWaveform
+    from bec_widgets.widgets.figure.plots.waveform.waveform_curve import BECCurve
+    from bec_widgets.widgets.spiral_progress_bar.ring import Ring
+
+    current_path = os.path.dirname(__file__)
+    client_path = os.path.join(current_path, "client.py")
+    clss = [
+        BECPlotBase,
+        BECWaveform,
+        BECFigure,
+        BECCurve,
+        BECImageShow,
+        BECConnector,
+        BECImageItem,
+        BECMotorMap,
+        BECDock,
+        BECDockArea,
+        SpiralProgressBar,
+        Ring,
+    ]
+    generator = ClientGenerator()
+    generator.generate_client(clss)
+    generator.write(client_path)

bec_widgets/cli/rpc_wigdet_handler.py

@@ -1,37 +1,15 @@
 from bec_widgets.utils import BECConnector
+from bec_widgets.widgets.figure import BECFigure
+from bec_widgets.widgets.spiral_progress_bar.spiral_progress_bar import SpiralProgressBar
 
 
 class RPCWidgetHandler:
     """Handler class for creating widgets from RPC messages."""
 
-    def __init__(self):
-        self._widget_classes = None
+    widget_classes = {"BECFigure": BECFigure, "SpiralProgressBar": SpiralProgressBar}
 
-    @property
-    def widget_classes(self):
-        """
-        Get the available widget classes.
-
-        Returns:
-            dict: The available widget classes.
-        """
-        if self._widget_classes is None:
-            self.update_available_widgets()
-        return self._widget_classes
-
-    def update_available_widgets(self):
-        """
-        Update the available widgets.
-
-        Returns:
-            None
-        """
-        from bec_widgets.utils.plugin_utils import get_rpc_classes
-
-        clss = get_rpc_classes("bec_widgets")
-        self._widget_classes = {cls.__name__: cls for cls in clss["top_level_classes"]}
-
-    def create_widget(self, widget_type, **kwargs) -> BECConnector:
+    @staticmethod
+    def create_widget(widget_type, **kwargs) -> BECConnector:
         """
         Create a widget from an RPC message.
 
@@ -42,12 +20,7 @@ class RPCWidgetHandler:
         Returns:
             widget(BECConnector): The created widget.
         """
-        if self._widget_classes is None:
-            self.update_available_widgets()
-        widget_class = self._widget_classes.get(widget_type)
+        widget_class = RPCWidgetHandler.widget_classes.get(widget_type)
         if widget_class:
             return widget_class(**kwargs)
         raise ValueError(f"Unknown widget type: {widget_type}")
-
-
-widget_handler = RPCWidgetHandler()

bec_widgets/cli/server.py

@@ -1,26 +1,17 @@
-from __future__ import annotations
-
 import inspect
-import signal
-import sys
-from contextlib import redirect_stderr, redirect_stdout
 from typing import Union
 
 from bec_lib.endpoints import MessageEndpoints
-from bec_lib.logger import bec_logger
-from bec_lib.service_config import ServiceConfig
 from bec_lib.utils.import_utils import lazy_import
 from qtpy.QtCore import QTimer
 
 from bec_widgets.cli.rpc_register import RPCRegister
 from bec_widgets.utils import BECDispatcher
 from bec_widgets.utils.bec_connector import BECConnector
-from bec_widgets.utils.bec_dispatcher import QtRedisConnector
 from bec_widgets.widgets.dock.dock_area import BECDockArea
 from bec_widgets.widgets.figure import BECFigure
 
 messages = lazy_import("bec_lib.messages")
-logger = bec_logger.logger
 
 
 class BECWidgetsCLIServer:
@@ -31,7 +22,7 @@ class BECWidgetsCLIServer:
         dispatcher: BECDispatcher = None,
         client=None,
         config=None,
-        gui_class: Union[BECFigure, BECDockArea] = BECFigure,
+        gui_class: Union["BECFigure", "BECDockArea"] = BECFigure,
     ) -> None:
         self.dispatcher = BECDispatcher(config=config) if dispatcher is None else dispatcher
         self.client = self.dispatcher.client if client is None else client
@@ -49,7 +40,7 @@ class BECWidgetsCLIServer:
         self._shutdown_event = False
         self._heartbeat_timer = QTimer()
         self._heartbeat_timer.timeout.connect(self.emit_heartbeat)
-        self._heartbeat_timer.start(200)
+        self._heartbeat_timer.start(200)  # Emit heartbeat every 1 seconds
 
     def on_rpc_update(self, msg: dict, metadata: dict):
         request_id = metadata.get("request_id")
@@ -114,34 +105,16 @@ class BECWidgetsCLIServer:
             self.client.connector.set(
                 MessageEndpoints.gui_heartbeat(self.gui_id),
                 messages.StatusMessage(name=self.gui_id, status=1, info={}),
-                expire=1,
+                expire=10,
             )
 
     def shutdown(self):  # TODO not sure if needed when cleanup is done at level of BECConnector
         self._shutdown_event = True
         self._heartbeat_timer.stop()
-        self.gui.close()
         self.client.shutdown()
 
 
-class SimpleFileLikeFromLogOutputFunc:
-    def __init__(self, log_func):
-        self._log_func = log_func
-
-    def write(self, buffer):
-        for line in buffer.rstrip().splitlines():
-            line = line.rstrip()
-            if line:
-                self._log_func(line)
-
-    def flush(self):
-        return
-
-    def close(self):
-        return
-
-
-def main():
+if __name__ == "__main__":  # pragma: no cover
     import argparse
     import os
     import sys
@@ -152,6 +125,16 @@ def main():
 
     import bec_widgets
 
+    app = QApplication(sys.argv)
+    app.setApplicationName("BEC Figure")
+    module_path = os.path.dirname(bec_widgets.__file__)
+    icon = QIcon()
+    icon.addFile(os.path.join(module_path, "assets", "bec_widgets_icon.png"), size=QSize(48, 48))
+    app.setWindowIcon(icon)
+
+    win = QMainWindow()
+    win.setWindowTitle("BEC Widgets")
+
     parser = argparse.ArgumentParser(description="BEC Widgets CLI Server")
     parser.add_argument("--id", type=str, help="The id of the server")
     parser.add_argument(
@@ -159,7 +142,7 @@ def main():
         type=str,
         help="Name of the gui class to be rendered. Possible values: \n- BECFigure\n- BECDockArea",
     )
-    parser.add_argument("--config", type=str, help="Config file")
+    parser.add_argument("--config", type=str, help="Config to connect to redis.")
 
     args = parser.parse_args()
 
@@ -174,46 +157,12 @@ def main():
         )
         gui_class = BECFigure
 
-    with redirect_stdout(SimpleFileLikeFromLogOutputFunc(logger.debug)):
-        with redirect_stderr(SimpleFileLikeFromLogOutputFunc(logger.error)):
-            app = QApplication(sys.argv)
-            app.setApplicationName("BEC Figure")
-            module_path = os.path.dirname(bec_widgets.__file__)
-            icon = QIcon()
-            icon.addFile(
-                os.path.join(module_path, "assets", "bec_widgets_icon.png"), size=QSize(48, 48)
-            )
-            app.setWindowIcon(icon)
+    server = BECWidgetsCLIServer(gui_id=args.id, config=args.config, gui_class=gui_class)
 
-            win = QMainWindow()
-            win.setWindowTitle("BEC Widgets")
+    gui = server.gui
+    win.setCentralWidget(gui)
+    win.resize(800, 600)
+    win.show()
 
-            service_config = ServiceConfig(args.config)
-            bec_logger.configure(
-                service_config.redis,
-                QtRedisConnector,
-                service_name="BECWidgetsCLIServer",
-                service_config=service_config.service_config,
-            )
-            server = BECWidgetsCLIServer(gui_id=args.id, config=service_config, gui_class=gui_class)
-
-            gui = server.gui
-            win.setCentralWidget(gui)
-            win.resize(800, 600)
-            win.show()
-
-            app.aboutToQuit.connect(server.shutdown)
-
-            def sigint_handler(*args):
-                # display message, for people to let it terminate gracefully
-                print("Caught SIGINT, exiting")
-                app.quit()
-
-            signal.signal(signal.SIGINT, sigint_handler)
-            signal.signal(signal.SIGTERM, sigint_handler)
-
-            sys.exit(app.exec())
-
-
-if __name__ == "__main__":  # pragma: no cover
-    main()
+    app.aboutToQuit.connect(server.shutdown)
+    sys.exit(app.exec())

bec_widgets/examples/eiger_plot/eiger_plot.py

@@ -0,0 +1,313 @@
+import json
+import os
+import threading
+
+import h5py
+import numpy as np
+import pyqtgraph as pg
+import zmq
+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 bec_widgets.utils import UILoader
+
+# 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__)
+        self.ui = UILoader().load_ui(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_layout = QVBoxLayout(self.ui.glw_placeholder)
+        self.glw = pg.GraphicsLayoutWidget()
+        self.glw_layout.addWidget(self.glw)
+        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.ui.pushButton_mask.clicked.connect(self.load_mask_dialog)
+        self.ui.pushButton_delete_mask.clicked.connect(self.delete_mask)
+        self.ui.pushButton_help.clicked.connect(self.show_help_dialog)
+
+        # SpinBoxes
+        self.ui.doubleSpinBox_hist_min.valueChanged.connect(self.update_hist)
+        self.ui.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.ui.comboBox_rotation.setToolTip("Increase rotation: Ctrl+A\nDecrease rotation: Ctrl+Z")
+        self.ui.checkBox_transpose.setToolTip("Toggle transpose: Ctrl+T")
+
+        max_index = self.ui.comboBox_rotation.count() - 1  # Maximum valid index
+
+        rotate_plus.activated.connect(
+            lambda: self.ui.comboBox_rotation.setCurrentIndex(
+                min(self.ui.comboBox_rotation.currentIndex() + 1, max_index)
+            )
+        )
+
+        rotate_minus.activated.connect(
+            lambda: self.ui.comboBox_rotation.setCurrentIndex(
+                max(self.ui.comboBox_rotation.currentIndex() - 1, 0)
+            )
+        )
+
+        # Key bindings for transpose
+        transpose = QShortcut(QKeySequence("Ctrl+T"), self)
+        transpose.activated.connect(self.ui.checkBox_transpose.toggle)
+
+        FFT = QShortcut(QKeySequence("Ctrl+F"), self)
+        FFT.activated.connect(self.ui.checkBox_FFT.toggle)
+        self.ui.checkBox_FFT.setToolTip("Toggle FFT: Ctrl+F")
+
+        log = QShortcut(QKeySequence("Ctrl+L"), self)
+        log.activated.connect(self.ui.checkBox_log.toggle)
+        self.ui.checkBox_log.setToolTip("Toggle log: Ctrl+L")
+
+        mask = QShortcut(QKeySequence("Ctrl+M"), self)
+        mask.activated.connect(self.ui.pushButton_mask.click)
+        self.ui.pushButton_mask.setToolTip("Load mask: Ctrl+M")
+
+        delete_mask = QShortcut(QKeySequence("Ctrl+D"), self)
+        delete_mask.activated.connect(self.ui.pushButton_delete_mask.click)
+        self.ui.pushButton_delete_mask.setToolTip("Delete mask: Ctrl+D")
+
+    def update_hist(self):
+        self.hist_levels = [
+            self.ui.doubleSpinBox_hist_min.value(),
+            self.ui.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.ui.checkBox_FFT.isChecked():
+            self.image = np.abs(np.fft.fftshift(np.fft.fft2(self.image)))
+
+        if self.ui.comboBox_rotation.currentIndex() > 0:  # rotate
+            self.image = np.rot90(
+                self.image, k=self.ui.comboBox_rotation.currentIndex(), axes=(0, 1)
+            )
+
+        if self.ui.checkBox_transpose.isChecked():  # transpose
+            self.image = np.transpose(self.image)
+
+        if self.ui.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

@@ -0,0 +1,200 @@
+<?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" stretch="1,4">
+   <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="QWidget" name="glw_placeholder" native="true"/>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

bec_widgets/examples/jupyter_console/jupyter_console_window.py

@@ -2,17 +2,35 @@ import os
 
 import numpy as np
 import pyqtgraph as pg
-import qdarktheme
+from pyqtgraph.Qt import QtWidgets
 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, UILoader
+from bec_widgets.widgets import BECFigure
 from bec_widgets.widgets.dock.dock_area import BECDockArea
-from bec_widgets.widgets.figure import BECFigure
-from bec_widgets.widgets.jupyter_console.jupyter_console import BECJupyterConsole
+from bec_widgets.widgets.spiral_progress_bar.spiral_progress_bar import SpiralProgressBar
+
+
+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 JupyterConsoleWindow(QWidget):  # pragma: no cover:
@@ -28,29 +46,32 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
 
         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
-        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,
-                    "w1_c": self.w1_c,
-                    "w2_c": self.w2_c,
-                    "w3_c": self.w3_c,
-                    "w4": self.w4,
-                    "d0": self.d0,
-                    "d1": self.d1,
-                    "d2": self.d2,
-                    "plt": self.plt,
-                    "bar": self.bar,
-                }
-            )
+        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,
+            }
+        )
 
     def _init_ui(self):
         # Plotting window
@@ -69,63 +90,46 @@ class JupyterConsoleWindow(QWidget):  # pragma: no cover:
         self._init_dock()
 
         self.console_layout = QVBoxLayout(self.ui.widget_console)
-        self.console = BECJupyterConsole(inprocess=True)
+        self.console = JupyterConsoleWidget()
         self.console_layout.addWidget(self.console)
+        self.console.set_default_style("linux")
 
     def _init_figure(self):
-        self.figure.plot(x_name="samx", y_name="samy", z_name="bpm4i", color_map_z="cividis")
+        self.figure.plot(x_name="samx", y_name="bpm4d")
         self.figure.motor_map("samx", "samy")
         self.figure.image("eiger", color_map="viridis", vrange=(0, 100))
-        self.figure.plot(
-            x_name="samx", y_name="samy", z_name="bpm4i", color_map_z="magma", new=True
-        )
 
         self.figure.change_layout(2, 2)
 
         self.w1 = self.figure[0, 0]
         self.w2 = self.figure[0, 1]
         self.w3 = self.figure[1, 0]
-        self.w4 = self.figure[1, 1]
-
-        # Plot Customisation
-        self.w1.set_title("Waveform 1")
-        self.w1.set_x_label("Motor Position (samx)")
-        self.w1.set_y_label("Intensity A.U.")
-
-        # Image Customisation
-        self.w3.set_title("Eiger Image")
-        self.w3.set_x_label("X")
-        self.w3.set_y_label("Y")
-
-        # Configs to try to pass
-        self.w1_c = self.w1._config_dict
-        self.w2_c = self.w2._config_dict
-        self.w3_c = self.w3._config_dict
 
         # curves for w1
+        self.w1.add_curve_scan("samx", "samy", "bpm4i", pen_style="dash")
+        self.w1.add_curve_scan("samx", "samy", "bpm3a", pen_style="dash")
         self.c1 = self.w1.get_config()
 
-        self.fig_c = self.figure._config_dict
-
     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.d0 = self.dock.add_dock(name="dock_0")
-        self.fig0 = self.d0.add_widget("BECFigure")
-        data = np.random.rand(10, 2)
-        self.fig0.plot(data, label="2d Data")
-        self.fig0.image("eiger", vrange=(0, 100))
+        self.label_2 = QtWidgets.QLabel("label which is added separately")
+        self.label_3 = QtWidgets.QLabel("Label above figure")
 
-        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.plt = self.fig2.plot(x_name="samx", y_name="bpm3a")
-        self.plt.plot(x_name="samx", y_name="bpm4i", dap="GaussianModel")
-        self.bar = self.d2.add_widget("RingProgressBar", row=0, col=1)
-        self.bar.set_diameter(200)
+        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.dock.save_state()
 
@@ -144,18 +148,16 @@ if __name__ == "__main__":  # pragma: no cover
 
     module_path = os.path.dirname(bec_widgets.__file__)
 
-    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_dispatcher = BECDispatcher()
     client = bec_dispatcher.client
     client.start()
 
+    app = QApplication(sys.argv)
+    app.setApplicationName("Jupyter Console")
+    app.setApplicationDisplayName("Jupyter Console")
+    icon = QIcon()
+    icon.addFile(os.path.join(module_path, "assets", "terminal_icon.png"), size=QSize(48, 48))
+    app.setWindowIcon(icon)
     win = JupyterConsoleWindow()
     win.show()
 

bec_widgets/examples/mca_readout/mca_plot.py

@@ -0,0 +1,159 @@
+# 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

@@ -0,0 +1,28 @@
+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/motor_movement/config_example.yaml

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,10 @@
+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

@@ -0,0 +1,17 @@
+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/stream_plot/line_plot.ui

@@ -0,0 +1,148 @@
+<?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="QWidget" name="glw_plot_placeholder" native="true"/>
+      <widget class="QWidget" name="glw_image_placeholder" native="true"/>
+     </widget>
+     <widget class="QWidget" name="layoutWidget">
+      <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>
+ <resources/>
+ <connections/>
+</ui>

bec_widgets/examples/stream_plot/stream_plot.py

@@ -0,0 +1,342 @@
+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
+from qtpy.QtCore import Signal, Slot
+from qtpy.QtWidgets import QTableWidgetItem, QVBoxLayout
+
+from bec_widgets.utils import Colors, Crosshair, UILoader
+from bec_widgets.utils.bec_dispatcher import BECDispatcher
+
+
+class StreamPlot(QtWidgets.QWidget):
+    update_signal = Signal()
+    roi_signal = Signal(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__)
+        self.ui = UILoader().load_ui(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_layout = QVBoxLayout(self.ui.glw_plot_placeholder)
+        self.glw_plot = pg.GraphicsLayoutWidget()
+        self.glw_plot_layout.addWidget(self.glw_plot)
+        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_layout = QVBoxLayout(self.ui.glw_image_placeholder)
+        self.glw_image = pg.GraphicsLayoutWidget()
+        self.glw_plot_layout.addWidget(self.glw_image)
+        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.ui.cursor_table.setRowCount(len(self.y_value_list))
+        # self.table.setHorizontalHeaderLabels(["(X, Y) - Moved", "(X, Y) - Clicked"]) #TODO can be dynamic
+        self.ui.cursor_table.setVerticalHeaderLabels(self.y_value_list)
+        self.ui.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()
+
+    @Slot(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)
+
+    @Slot(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/plugin/main.py

@@ -6,10 +6,10 @@
 import sys
 
 from bec_ipython_client.main import BECIPythonClient
-from qtpy.QtWidgets import QApplication
+from PySide6.QtWidgets import QApplication
 from tictactoe import TicTacToe
 
-if __name__ == "__main__":  # pragma: no cover
+if __name__ == "__main__":
     app = QApplication(sys.argv)
     window = TicTacToe()
     window.state = "-X-XO----"

bec_widgets/plugin/plugin_launch.py

@@ -0,0 +1,24 @@
+import os
+import subprocess
+import sys
+
+from PySide6.scripts.pyside_tool import designer
+
+import bec_widgets
+
+
+def main():
+    # os.environ["PYSIDE_DESIGNER_PLUGINS"] = os.path.join(
+    #     "/Users/janwyzula/PSI/bec_widgets/bec_widgets/plugin"
+    # )
+    os.environ["PYSIDE_DESIGNER_PLUGINS"] = os.path.join(
+        os.path.dirname(bec_widgets.__file__), "widgets/motor_control/selection"
+    )
+    # os.environ["PYTHONFRAMEWORKPREFIX"] = os.path.join(
+    #     os.path.dirname(bec_widgets.__file__), "widgets/motor_control/selection"
+    # )
+    designer()
+
+
+if __name__ == "__main__":
+    main()

bec_widgets/plugin/registertictactoe.py

@@ -1,12 +1,12 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-from qtpy.QtDesigner import QPyDesignerCustomWidgetCollection
+from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 from tictactoe import TicTacToe
 from tictactoeplugin import TicTacToePlugin
 
 # Set PYSIDE_DESIGNER_PLUGINS to point to this directory and load the plugin
 
 
-if __name__ == "__main__":  # pragma: no cover
+if __name__ == "__main__":
     QPyDesignerCustomWidgetCollection.addCustomWidget(TicTacToePlugin())

bec_widgets/plugin/tictactoe.py

@@ -1,9 +1,9 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-from qtpy.QtCore import Property, QPoint, QRect, QSize, Qt, Slot
-from qtpy.QtGui import QPainter, QPen
-from qtpy.QtWidgets import QWidget
+from PySide6.QtCore import Property, QPoint, QRect, QSize, Qt, Slot
+from PySide6.QtGui import QPainter, QPen
+from PySide6.QtWidgets import QWidget
 
 EMPTY = "-"
 CROSS = "X"
@@ -11,7 +11,7 @@ NOUGHT = "O"
 DEFAULT_STATE = "---------"
 
 
-class TicTacToe(QWidget):  # pragma: no cover
+class TicTacToe(QWidget):
     def __init__(self, parent=None):
         super().__init__(parent)
         self._state = DEFAULT_STATE

bec_widgets/plugin/tictactoeplugin.py

@@ -1,8 +1,8 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
+from PySide6.QtDesigner import QDesignerCustomWidgetInterface
+from PySide6.QtGui import QIcon
 from tictactoe import TicTacToe
 from tictactoetaskmenu import TicTacToeTaskMenuFactory
 
@@ -25,7 +25,7 @@ DOM_XML = """
 """
 
 
-class TicTacToePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+class TicTacToePlugin(QDesignerCustomWidgetInterface):
     def __init__(self):
         super().__init__()
         self._form_editor = None

bec_widgets/plugin/tictactoetaskmenu.py

@@ -1,14 +1,14 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-from qtpy.QtCore import Slot
-from qtpy.QtDesigner import QExtensionFactory, QPyDesignerTaskMenuExtension
-from qtpy.QtGui import QAction
-from qtpy.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout
+from PySide6.QtCore import Slot
+from PySide6.QtDesigner import QExtensionFactory, QPyDesignerTaskMenuExtension
+from PySide6.QtGui import QAction
+from PySide6.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout
 from tictactoe import TicTacToe
 
 
-class TicTacToeDialog(QDialog):  # pragma: no cover
+class TicTacToeDialog(QDialog):
     def __init__(self, parent):
         super().__init__(parent)
         layout = QVBoxLayout(self)

bec_widgets/utils/__init__.py

@@ -1,5 +1,3 @@
-from qtpy.QtWebEngineWidgets import QWebEngineView
-
 from .bec_connector import BECConnector, ConnectionConfig
 from .bec_dispatcher import BECDispatcher
 from .bec_table import BECTable

bec_widgets/utils/bec_connector.py

@@ -1,19 +1,14 @@
 # pylint: disable = no-name-in-module,missing-module-docstring
 from __future__ import annotations
 
-import os
 import time
-import uuid
-from typing import Optional
+from typing import Optional, Type
 
-import yaml
-from bec_lib.utils.import_utils import lazy_import_from
+from bec_lib.utils.import_utils import lazy_import, lazy_import_from
 from pydantic import BaseModel, Field, field_validator
-from qtpy.QtCore import QObject, QRunnable, QThreadPool, Signal
 from qtpy.QtCore import Slot as pyqtSlot
 
 from bec_widgets.cli.rpc_register import RPCRegister
-from bec_widgets.utils.yaml_dialog import load_yaml, load_yaml_gui, save_yaml, save_yaml_gui
 
 BECDispatcher = lazy_import_from("bec_widgets.utils.bec_dispatcher", ("BECDispatcher",))
 
@@ -25,10 +20,8 @@ class ConnectionConfig(BaseModel):
     gui_id: Optional[str] = Field(
         default=None, validate_default=True, description="The GUI ID of the widget."
     )
-    model_config: dict = {"validate_assignment": True}
 
     @field_validator("gui_id")
-    @classmethod
     def generate_gui_id(cls, v, values):
         """Generate a GUI ID if none is provided."""
         if v is None:
@@ -38,35 +31,10 @@ class ConnectionConfig(BaseModel):
         return v
 
 
-class WorkerSignals(QObject):
-    progress = Signal(dict)
-    completed = Signal()
-
-
-class Worker(QRunnable):
-    """
-    Worker class to run a function in a separate thread.
-    """
-
-    def __init__(self, func, *args, **kwargs):
-        super().__init__()
-        self.signals = WorkerSignals()
-        self.func = func
-        self.args = args
-        self.kwargs = kwargs
-
-    def run(self):
-        """
-        Run the specified function in the thread.
-        """
-        self.func(*self.args, **self.kwargs)
-        self.signals.completed.emit()
-
-
 class BECConnector:
     """Connection mixin class for all BEC widgets, to handle BEC client and device manager"""
 
-    USER_ACCESS = ["_config_dict", "_get_all_rpc"]
+    USER_ACCESS = ["config_dict", "get_all_rpc"]
 
     def __init__(self, client=None, config: ConnectionConfig = None, gui_id: str = None):
         # BEC related connections
@@ -93,60 +61,23 @@ class BECConnector:
         self.rpc_register = RPCRegister()
         self.rpc_register.add_rpc(self)
 
-        self._thread_pool = QThreadPool.globalInstance()
-
-    def submit_task(self, fn, *args, on_complete: pyqtSlot = None, **kwargs) -> Worker:
-        """
-        Submit a task to run in a separate thread. The task will run the specified
-        function with the provided arguments and emit the completed signal when done.
-
-        Use this method if you want to wait for a task to complete without blocking the
-        main thread.
-
-        Args:
-            fn: Function to run in a separate thread.
-            *args: Arguments for the function.
-            on_complete: Slot to run when the task is complete.
-            **kwargs: Keyword arguments for the function.
-
-        Returns:
-            worker: The worker object that will run the task.
-
-        Examples:
-            >>> def my_function(a, b):
-            >>>     print(a + b)
-            >>> self.submit_task(my_function, 1, 2)
-
-            >>> def my_function(a, b):
-            >>>     print(a + b)
-            >>> def on_complete():
-            >>>     print("Task complete")
-            >>> self.submit_task(my_function, 1, 2, on_complete=on_complete)
-
-        """
-        worker = Worker(fn, *args, **kwargs)
-        if on_complete:
-            worker.signals.completed.connect(on_complete)
-        self._thread_pool.start(worker)
-        return worker
-
-    def _get_all_rpc(self) -> dict:
+    def get_all_rpc(self) -> dict:
         """Get all registered RPC objects."""
         all_connections = self.rpc_register.list_all_connections()
         return dict(all_connections)
 
     @property
-    def _rpc_id(self) -> str:
+    def rpc_id(self) -> str:
         """Get the RPC ID of the widget."""
         return self.gui_id
 
-    @_rpc_id.setter
-    def _rpc_id(self, rpc_id: str) -> None:
+    @rpc_id.setter
+    def rpc_id(self, rpc_id: str) -> None:
         """Set the RPC ID of the widget."""
         self.gui_id = rpc_id
 
     @property
-    def _config_dict(self) -> dict:
+    def config_dict(self) -> dict:
         """
         Get the configuration of the widget.
 
@@ -155,8 +86,8 @@ class BECConnector:
         """
         return self.config.model_dump()
 
-    @_config_dict.setter
-    def _config_dict(self, config: BaseModel) -> None:
+    @config_dict.setter
+    def config_dict(self, config: BaseModel) -> None:
         """
         Get the configuration of the widget.
 
@@ -165,60 +96,6 @@ class BECConnector:
         """
         self.config = config
 
-    def apply_config(self, config: dict, generate_new_id: bool = True) -> None:
-        """
-        Apply the configuration to the widget.
-
-        Args:
-            config(dict): Configuration settings.
-            generate_new_id(bool): If True, generate a new GUI ID for the widget.
-        """
-        self.config = ConnectionConfig(**config)
-        if generate_new_id is True:
-            gui_id = str(uuid.uuid4())
-            self.rpc_register.remove_rpc(self)
-            self.set_gui_id(gui_id)
-            self.rpc_register.add_rpc(self)
-        else:
-            self.gui_id = self.config.gui_id
-
-    def load_config(self, path: str | None = None, gui: bool = False):
-        """
-        Load the configuration of the widget from YAML.
-
-        Args:
-            path(str): Path to the configuration file for non-GUI dialog mode.
-            gui(bool): If True, use the GUI dialog to load the configuration file.
-        """
-        if gui is True:
-            config = load_yaml_gui(self)
-        else:
-            config = load_yaml(path)
-
-        if config is not None:
-            if config.get("widget_class") != self.__class__.__name__:
-                raise ValueError(
-                    f"Configuration file is not for {self.__class__.__name__}. Got configuration for {config.get('widget_class')}."
-                )
-            self.apply_config(config)
-
-    def save_config(self, path: str | None = None, gui: bool = False):
-        """
-        Save the configuration of the widget to YAML.
-
-        Args:
-            path(str): Path to save the configuration file for non-GUI dialog mode.
-            gui(bool): If True, use the GUI dialog to save the configuration file.
-        """
-        if gui is True:
-            save_yaml_gui(self, self._config_dict)
-        else:
-            if path is None:
-                path = os.getcwd()
-            file_path = os.path.join(path, f"{self.__class__.__name__}_config.yaml")
-
-            save_yaml(file_path, self._config_dict)
-
     @pyqtSlot(str)
     def set_gui_id(self, gui_id: str) -> None:
         """
@@ -286,7 +163,6 @@ class BECConnector:
         all_connections = self.rpc_register.list_all_connections()
         if len(all_connections) == 0:
             print("No more connections. Shutting down GUI BEC client.")
-            self.bec_dispatcher.disconnect_all()
             self.client.shutdown()
 
     # def closeEvent(self, event):

bec_widgets/utils/bec_designer.py

@@ -1,136 +0,0 @@
-import importlib.metadata
-import json
-import os
-import site
-import sys
-import sysconfig
-from pathlib import Path
-
-from qtpy import PYSIDE6
-
-if PYSIDE6:
-    from PySide6.scripts.pyside_tool import (
-        _extend_path_var,
-        init_virtual_env,
-        qt_tool_wrapper,
-        is_pyenv_python,
-        is_virtual_env,
-        ui_tool_binary,
-    )
-
-import bec_widgets
-
-
-def list_editable_packages() -> set[str]:
-    """
-    List all editable packages in the environment.
-
-    Returns:
-        set: A set of paths to editable packages.
-    """
-
-    editable_packages = set()
-
-    # Get site-packages directories
-    site_packages = site.getsitepackages()
-    if hasattr(site, "getusersitepackages"):
-        site_packages.append(site.getusersitepackages())
-
-    for dist in importlib.metadata.distributions():
-        location = dist.locate_file("").resolve()
-        is_editable = all(not str(location).startswith(site_pkg) for site_pkg in site_packages)
-
-        if is_editable:
-            editable_packages.add(str(location))
-
-    for packages in site_packages:
-        # all dist-info directories in site-packages that contain a direct_url.json file
-        dist_info_dirs = Path(packages).rglob("*.dist-info")
-        for dist_info_dir in dist_info_dirs:
-            direct_url = dist_info_dir / "direct_url.json"
-            if not direct_url.exists():
-                continue
-            # load the json file and get the path to the package
-            with open(direct_url, "r", encoding="utf-8") as f:
-                data = json.load(f)
-                path = data.get("url", "")
-                if path.startswith("file://"):
-                    path = path[7:]
-                    editable_packages.add(path)
-
-    return editable_packages
-
-
-def patch_designer():  # pragma: no cover
-    if not PYSIDE6:
-        print("PYSIDE6 is not available in the environment. Cannot patch designer.")
-        return
-
-    init_virtual_env()
-
-    major_version = sys.version_info[0]
-    minor_version = sys.version_info[1]
-    os.environ["PY_MAJOR_VERSION"] = str(major_version)
-    os.environ["PY_MINOR_VERSION"] = str(minor_version)
-
-    if sys.platform == "linux":
-        version = f"{major_version}.{minor_version}"
-        library_name = f"libpython{version}{sys.abiflags}.so"
-        if is_pyenv_python():
-            library_name = str(Path(sysconfig.get_config_var("LIBDIR")) / library_name)
-        os.environ["LD_PRELOAD"] = library_name
-    elif sys.platform == "darwin":
-        library_name = f"libpython{major_version}.{minor_version}.dylib"
-        lib_path = str(Path(sysconfig.get_config_var("LIBDIR")) / library_name)
-        os.environ["DYLD_INSERT_LIBRARIES"] = lib_path
-
-        if is_pyenv_python() or is_virtual_env():
-            # append all editable packages to the PYTHONPATH
-            editable_packages = list_editable_packages()
-            for pckg in editable_packages:
-                _extend_path_var("PYTHONPATH", pckg, True)
-    elif sys.platform == "win32":
-        if is_virtual_env():
-            _extend_path_var("PATH", os.fspath(Path(sys._base_executable).parent), True)
-
-    qt_tool_wrapper(ui_tool_binary("designer"), sys.argv[1:])
-
-
-def find_plugin_paths(base_path: Path):
-    """
-    Recursively find all directories containing a .pyproject file.
-    """
-    plugin_paths = []
-    for path in base_path.rglob("*.pyproject"):
-        plugin_paths.append(str(path.parent))
-    return plugin_paths
-
-
-def set_plugin_environment_variable(plugin_paths):
-    """
-    Set the PYSIDE_DESIGNER_PLUGINS environment variable with the given plugin paths.
-    """
-    current_paths = os.environ.get("PYSIDE_DESIGNER_PLUGINS", "")
-    if current_paths:
-        current_paths = current_paths.split(os.pathsep)
-    else:
-        current_paths = []
-
-    current_paths.extend(plugin_paths)
-    os.environ["PYSIDE_DESIGNER_PLUGINS"] = os.pathsep.join(current_paths)
-
-
-# Patch the designer function
-def main():  # pragma: no cover
-    if not PYSIDE6:
-        print("PYSIDE6 is not available in the environment. Exiting...")
-        return
-    base_dir = Path(os.path.dirname(bec_widgets.__file__)).resolve()
-    plugin_paths = find_plugin_paths(base_dir)
-    set_plugin_environment_variable(plugin_paths)
-
-    patch_designer()
-
-
-if __name__ == "__main__":  # pragma: no cover
-    main()

bec_widgets/utils/bec_dispatcher.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import argparse
 import collections
 from collections.abc import Callable
 from typing import TYPE_CHECKING, Union
@@ -8,7 +9,7 @@ import redis
 from bec_lib.client import BECClient
 from bec_lib.redis_connector import MessageObject, RedisConnector
 from bec_lib.service_config import ServiceConfig
-from qtpy.QtCore import PYQT5, PYQT6, PYSIDE2, PYSIDE6, QCoreApplication, QObject
+from qtpy.QtCore import QObject
 from qtpy.QtCore import Signal as pyqtSignal
 
 if TYPE_CHECKING:
@@ -65,17 +66,11 @@ class QtRedisConnector(RedisConnector):
             cb(msg.content, msg.metadata)
 
 
-class BECClientWithoutLoggerInit(BECClient):
-    def _initialize_logger(self):
-        return
-
-
 class BECDispatcher:
     """Utility class to keep track of slots connected to a particular redis connector"""
 
     _instance = None
     _initialized = False
-    qapp = None
 
     def __new__(cls, client=None, config: str = None, *args, **kwargs):
         if cls._instance is None:
@@ -83,28 +78,22 @@ class BECDispatcher:
             cls._initialized = False
         return cls._instance
 
-    def __init__(self, client=None, config: str | ServiceConfig = None):
+    def __init__(self, client=None, config: str = None):
         if self._initialized:
             return
 
-        if not QCoreApplication.instance():
-            BECDispatcher.qapp = QCoreApplication([])
-
         self._slots = collections.defaultdict(set)
         self.client = client
 
         if self.client is None:
             if config is not None:
-                if not isinstance(config, ServiceConfig):
-                    # config is supposed to be a path
-                    config = ServiceConfig(config)
-                self.client = BECClientWithoutLoggerInit(
-                    config=config, connector_cls=QtRedisConnector
+                host, port = config.split(":")
+                redis_config = {"host": host, "port": port}
+                self.client = BECClient(
+                    config=ServiceConfig(redis=redis_config), connector_cls=QtRedisConnector
                 )  # , forced=True)
             else:
-                self.client = BECClientWithoutLoggerInit(
-                    connector_cls=QtRedisConnector
-                )  # , forced=True)
+                self.client = BECClient(connector_cls=QtRedisConnector)  # , forced=True)
         else:
             if self.client.started:
                 # have to reinitialize client to use proper connector
@@ -123,16 +112,6 @@ class BECDispatcher:
         cls._instance = None
         cls._initialized = False
 
-        if not cls.qapp:
-            return
-
-        # shutdown QCoreApp if it exists
-        if PYQT5 or PYQT6:
-            cls.qapp.exit()
-        elif PYSIDE2 or PYSIDE6:
-            cls.qapp.shutdown()
-        cls.qapp = None
-
     def connect_slot(
         self, slot: Callable, topics: Union[EndpointInfo, str, list[Union[EndpointInfo, str]]]
     ) -> None:

bec_widgets/utils/colors.py

@@ -1,14 +1,11 @@
-import re
 from typing import Literal
 
 import numpy as np
 import pyqtgraph as pg
-from pydantic_core import PydanticCustomError
 from qtpy.QtGui import QColor
 
 
 class Colors:
-
     @staticmethod
     def golden_ratio(num: int) -> list:
         """Calculate the golden ratio for a given number of angles.
@@ -66,249 +63,3 @@ class Colors:
             else:
                 raise ValueError("Unsupported format. Please choose 'RGB', 'HEX', or 'QColor'.")
         return colors
-
-    @staticmethod
-    def hex_to_rgba(hex_color: str, alpha=255) -> tuple:
-        """
-        Convert HEX color to RGBA.
-
-        Args:
-            hex_color(str): HEX color string.
-            alpha(int): Alpha value (0-255). Default is 255 (opaque).
-
-        Returns:
-            tuple: RGBA color tuple (r, g, b, a).
-        """
-        hex_color = hex_color.lstrip("#")
-        if len(hex_color) == 6:
-            r, g, b = tuple(int(hex_color[i : i + 2], 16) for i in (0, 2, 4))
-        elif len(hex_color) == 8:
-            r, g, b, a = tuple(int(hex_color[i : i + 2], 16) for i in (0, 2, 4, 6))
-            return (r, g, b, a)
-        else:
-            raise ValueError("HEX color must be 6 or 8 characters long.")
-        return (r, g, b, alpha)
-
-    @staticmethod
-    def rgba_to_hex(r: int, g: int, b: int, a: int = 255) -> str:
-        """
-        Convert RGBA color to HEX.
-
-        Args:
-            r(int): Red value (0-255).
-            g(int): Green value (0-255).
-            b(int): Blue value (0-255).
-            a(int): Alpha value (0-255). Default is 255 (opaque).
-
-        Returns:
-            hec_color(str): HEX color string.
-        """
-        return "#{:02X}{:02X}{:02X}{:02X}".format(r, g, b, a)
-
-    @staticmethod
-    def validate_color(color: tuple | str) -> tuple | str:
-        """
-        Validate the color input if it is HEX or RGBA compatible. Can be used in any pydantic model as a field validator.
-
-        Args:
-            color(tuple|str): The color to be validated. Can be a tuple of RGBA values or a HEX string.
-
-        Returns:
-            tuple|str: The validated color.
-        """
-        CSS_COLOR_NAMES = {
-            "aliceblue",
-            "antiquewhite",
-            "aqua",
-            "aquamarine",
-            "azure",
-            "beige",
-            "bisque",
-            "black",
-            "blanchedalmond",
-            "blue",
-            "blueviolet",
-            "brown",
-            "burlywood",
-            "cadetblue",
-            "chartreuse",
-            "chocolate",
-            "coral",
-            "cornflowerblue",
-            "cornsilk",
-            "crimson",
-            "cyan",
-            "darkblue",
-            "darkcyan",
-            "darkgoldenrod",
-            "darkgray",
-            "darkgreen",
-            "darkgrey",
-            "darkkhaki",
-            "darkmagenta",
-            "darkolivegreen",
-            "darkorange",
-            "darkorchid",
-            "darkred",
-            "darksalmon",
-            "darkseagreen",
-            "darkslateblue",
-            "darkslategray",
-            "darkslategrey",
-            "darkturquoise",
-            "darkviolet",
-            "deeppink",
-            "deepskyblue",
-            "dimgray",
-            "dimgrey",
-            "dodgerblue",
-            "firebrick",
-            "floralwhite",
-            "forestgreen",
-            "fuchsia",
-            "gainsboro",
-            "ghostwhite",
-            "gold",
-            "goldenrod",
-            "gray",
-            "green",
-            "greenyellow",
-            "grey",
-            "honeydew",
-            "hotpink",
-            "indianred",
-            "indigo",
-            "ivory",
-            "khaki",
-            "lavender",
-            "lavenderblush",
-            "lawngreen",
-            "lemonchiffon",
-            "lightblue",
-            "lightcoral",
-            "lightcyan",
-            "lightgoldenrodyellow",
-            "lightgray",
-            "lightgreen",
-            "lightgrey",
-            "lightpink",
-            "lightsalmon",
-            "lightseagreen",
-            "lightskyblue",
-            "lightslategray",
-            "lightslategrey",
-            "lightsteelblue",
-            "lightyellow",
-            "lime",
-            "limegreen",
-            "linen",
-            "magenta",
-            "maroon",
-            "mediumaquamarine",
-            "mediumblue",
-            "mediumorchid",
-            "mediumpurple",
-            "mediumseagreen",
-            "mediumslateblue",
-            "mediumspringgreen",
-            "mediumturquoise",
-            "mediumvioletred",
-            "midnightblue",
-            "mintcream",
-            "mistyrose",
-            "moccasin",
-            "navajowhite",
-            "navy",
-            "oldlace",
-            "olive",
-            "olivedrab",
-            "orange",
-            "orangered",
-            "orchid",
-            "palegoldenrod",
-            "palegreen",
-            "paleturquoise",
-            "palevioletred",
-            "papayawhip",
-            "peachpuff",
-            "peru",
-            "pink",
-            "plum",
-            "powderblue",
-            "purple",
-            "red",
-            "rosybrown",
-            "royalblue",
-            "saddlebrown",
-            "salmon",
-            "sandybrown",
-            "seagreen",
-            "seashell",
-            "sienna",
-            "silver",
-            "skyblue",
-            "slateblue",
-            "slategray",
-            "slategrey",
-            "snow",
-            "springgreen",
-            "steelblue",
-            "tan",
-            "teal",
-            "thistle",
-            "tomato",
-            "turquoise",
-            "violet",
-            "wheat",
-            "white",
-            "whitesmoke",
-            "yellow",
-            "yellowgreen",
-        }
-        if isinstance(color, str):
-            hex_pattern = re.compile(r"^#(?:[0-9a-fA-F]{3}){1,2}$")
-            if hex_pattern.match(color):
-                return color
-            elif color.lower() in CSS_COLOR_NAMES:
-                return color
-            else:
-                raise PydanticCustomError(
-                    "unsupported color",
-                    "The color must be a valid HEX string or CSS Color.",
-                    {"wrong_value": color},
-                )
-        elif isinstance(color, tuple):
-            if len(color) != 4:
-                raise PydanticCustomError(
-                    "unsupported color",
-                    "The color must be a tuple of 4 elements (R, G, B, A).",
-                    {"wrong_value": color},
-                )
-            for value in color:
-                if not 0 <= value <= 255:
-                    raise PydanticCustomError(
-                        "unsupported color",
-                        f"The color values must be between 0 and 255 in RGBA format (R,G,B,A)",
-                        {"wrong_value": color},
-                    )
-            return color
-
-    @staticmethod
-    def validate_color_map(color_map: str) -> str:
-        """
-        Validate the colormap input if it is supported by pyqtgraph. Can be used in any pydantic model as a field validator. If validation fails it prints all available colormaps from pyqtgraph instance.
-
-        Args:
-            color_map(str): The colormap to be validated.
-
-        Returns:
-            str: The validated colormap.
-        """
-        available_colormaps = pg.colormap.listMaps()
-        if color_map not in available_colormaps:
-            raise PydanticCustomError(
-                "unsupported colormap",
-                f"Colormap '{color_map}' not found in the current installation of pyqtgraph. Choose on the following: {available_colormaps}.",
-                {"wrong_value": color_map},
-            )
-        return color_map

bec_widgets/utils/crosshair.py

@@ -174,11 +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
-                    coordinate_to_emit = (
+                    coordinance_to_emit = (
                         round(x, self.precision),
                         [round(y_val, self.precision) for y_val in y_values],
                     )
-                    self.coordinatesChanged1D.emit(coordinate_to_emit)
+                    self.coordinatesChanged1D.emit(coordinance_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)],
@@ -187,8 +187,8 @@ class Crosshair(QObject):
                 elif isinstance(item, pg.ImageItem):
                     if x is None or y_values is None:
                         return
-                    coordinate_to_emit = (x, y_values)
-                    self.coordinatesChanged2D.emit(coordinate_to_emit)
+                    coordinance_to_emit = (x, y_values)
+                    self.coordinatesChanged2D.emit(coordinance_to_emit)
 
     def mouse_clicked(self, event):
         """Handles the mouse clicked event, updating the crosshair position and emitting signals.

bec_widgets/utils/generate_designer_plugin.py

@@ -1,148 +0,0 @@
-import inspect
-import os
-import re
-
-from qtpy.QtCore import QObject
-
-EXCLUDED_PLUGINS = ["BECConnector", "BECDockArea", "BECDock"]
-
-
-class DesignerPluginInfo:
-    def __init__(self, plugin_class):
-        self.plugin_class = plugin_class
-        self.plugin_name_pascal = plugin_class.__name__
-        self.plugin_name_snake = self.pascal_to_snake(self.plugin_name_pascal)
-        self.widget_import = f"from {plugin_class.__module__} import {self.plugin_name_pascal}"
-        plugin_module = (
-            ".".join(plugin_class.__module__.split(".")[:-1]) + f".{self.plugin_name_snake}_plugin"
-        )
-        self.plugin_import = f"from {plugin_module} import {self.plugin_name_pascal}Plugin"
-
-        # first sentence / line of the docstring is used as tooltip
-        self.plugin_tooltip = (
-            plugin_class.__doc__.split("\n")[0].strip().replace('"', "'")
-            if plugin_class.__doc__
-            else self.plugin_name_pascal
-        )
-
-        self.base_path = os.path.dirname(inspect.getfile(plugin_class))
-
-    @staticmethod
-    def pascal_to_snake(name: str) -> str:
-        """
-        Convert PascalCase to snake_case.
-
-        Args:
-            name (str): The name to be converted.
-
-        Returns:
-            str: The converted name.
-        """
-        s1 = re.sub(r"([a-z0-9])([A-Z])", r"\1_\2", name)
-        s2 = re.sub(r"([A-Z]+)([A-Z][a-z])", r"\1_\2", s1)
-        return s2.lower()
-
-
-class DesignerPluginGenerator:
-    def __init__(self, widget: type):
-        self._excluded = False
-        self.widget = widget
-        self.info = DesignerPluginInfo(widget)
-        if widget.__name__ in EXCLUDED_PLUGINS:
-
-            self._excluded = True
-            return
-
-        self.templates = {}
-        self.template_path = os.path.join(
-            os.path.dirname(os.path.abspath(__file__)), "plugin_templates"
-        )
-
-    def run(self):
-        if self._excluded:
-            print(f"Plugin {self.widget.__name__} is excluded from generation.")
-            return
-        self._check_class_validity()
-        self._load_templates()
-        self._write_templates()
-
-    def _check_class_validity(self):
-
-        # Check if the widget is a QWidget subclass
-        if not issubclass(self.widget, QObject):
-            return
-
-        # Check if the widget class has parent as the first argument. This is a strict requirement of Qt!
-        signature = list(inspect.signature(self.widget.__init__).parameters.values())
-        if len(signature) == 1 or signature[1].name != "parent":
-            raise ValueError(
-                f"Widget class {self.widget.__name__} must have parent as the first argument."
-            )
-
-        base_cls = [val for val in self.widget.__bases__ if issubclass(val, QObject)]
-        if not base_cls:
-            raise ValueError(
-                f"Widget class {self.widget.__name__} must inherit from a QObject subclass."
-            )
-
-        # Check if the widget class calls the super constructor with parent argument
-        init_source = inspect.getsource(self.widget.__init__)
-        cls_init_found = (
-            bool(init_source.find(f"{base_cls[0].__name__}.__init__(self, parent=parent") > 0)
-            or bool(init_source.find(f"{base_cls[0].__name__}.__init__(self, parent)") > 0)
-            or bool(init_source.find(f"{base_cls[0].__name__}.__init__(self, parent,") > 0)
-        )
-        super_init_found = (
-            bool(
-                init_source.find(f"super({base_cls[0].__name__}, self).__init__(parent=parent") > 0
-            )
-            or bool(init_source.find(f"super({base_cls[0].__name__}, self).__init__(parent,") > 0)
-            or bool(init_source.find(f"super({base_cls[0].__name__}, self).__init__(parent)") > 0)
-        )
-        if issubclass(self.widget.__bases__[0], QObject) and not super_init_found:
-            super_init_found = (
-                bool(init_source.find("super().__init__(parent=parent") > 0)
-                or bool(init_source.find("super().__init__(parent,") > 0)
-                or bool(init_source.find("super().__init__(parent)") > 0)
-            )
-
-        if not cls_init_found and not super_init_found:
-            raise ValueError(
-                f"Widget class {self.widget.__name__} must call the super constructor with parent."
-            )
-
-    def _write_templates(self):
-        self._write_register()
-        self._write_plugin()
-        self._write_pyproject()
-
-    def _write_register(self):
-        file_path = os.path.join(self.info.base_path, f"register_{self.info.plugin_name_snake}.py")
-        with open(file_path, "w", encoding="utf-8") as f:
-            f.write(self.templates["register"].format(**self.info.__dict__))
-
-    def _write_plugin(self):
-        file_path = os.path.join(self.info.base_path, f"{self.info.plugin_name_snake}_plugin.py")
-        with open(file_path, "w", encoding="utf-8") as f:
-            f.write(self.templates["plugin"].format(**self.info.__dict__))
-
-    def _write_pyproject(self):
-        file_path = os.path.join(self.info.base_path, f"{self.info.plugin_name_snake}.pyproject")
-        out = {"files": [f"{self.info.plugin_class.__module__.split('.')[-1]}.py"]}
-        with open(file_path, "w", encoding="utf-8") as f:
-            f.write(str(out))
-
-    def _load_templates(self):
-        for file in os.listdir(self.template_path):
-            if not file.endswith(".template"):
-                continue
-            with open(os.path.join(self.template_path, file), "r", encoding="utf-8") as f:
-                self.templates[file.split(".")[0]] = f.read()
-
-
-if __name__ == "__main__":  # pragma: no cover
-    # from bec_widgets.widgets.bec_queue.bec_queue import BECQueue
-    from bec_widgets.widgets.dock import BECDockArea
-
-    generator = DesignerPluginGenerator(BECDockArea)
-    generator.run()

bec_widgets/utils/plugin_templates/plugin.template

@@ -1,54 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-
-from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
-
-{widget_import}
-
-DOM_XML = """
-<ui language='c++'>
-    <widget class='{plugin_name_pascal}' name='{plugin_name_snake}'>
-    </widget>
-</ui>
-"""
-
-
-class {plugin_name_pascal}Plugin(QDesignerCustomWidgetInterface):  # pragma: no cover
-    def __init__(self):
-        super().__init__()
-        self._form_editor = None
-
-    def createWidget(self, parent):
-        t = {plugin_name_pascal}(parent)
-        return t
-
-    def domXml(self):
-        return DOM_XML
-
-    def group(self):
-        return ""
-
-    def icon(self):
-        return QIcon()
-
-    def includeFile(self):
-        return "{plugin_name_snake}"
-
-    def initialize(self, form_editor):
-        self._form_editor = form_editor
-
-    def isContainer(self):
-        return False
-
-    def isInitialized(self):
-        return self._form_editor is not None
-
-    def name(self):
-        return "{plugin_name_pascal}"
-
-    def toolTip(self):
-        return "{plugin_tooltip}"
-
-    def whatsThis(self):
-        return self.toolTip()

bec_widgets/utils/plugin_templates/register.template

@@ -1,15 +0,0 @@
-def main():  # pragma: no cover
-    from qtpy import PYSIDE6
-
-    if not PYSIDE6:
-        print("PYSIDE6 is not available in the environment. Cannot patch designer.")
-        return
-    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
-
-    {plugin_import}
-
-    QPyDesignerCustomWidgetCollection.addCustomWidget({plugin_name_pascal}Plugin())
-
-
-if __name__ == "__main__":  # pragma: no cover
-    main()

bec_widgets/utils/plugin_utils.py

@@ -1,10 +1,6 @@
-import importlib
 import inspect
-import os
-from typing import Literal
 
 from bec_lib.plugin_helper import _get_available_plugins
-from qtpy.QtWidgets import QGraphicsWidget, QWidget
 
 from bec_widgets.utils import BECConnector
 
@@ -42,47 +38,3 @@ def get_plugin_widgets() -> dict[str, BECConnector]:
 
 def _filter_plugins(obj):
     return inspect.isclass(obj) and issubclass(obj, BECConnector)
-
-
-def get_rpc_classes(
-    repo_name: str,
-) -> dict[Literal["connector_classes", "top_level_classes"], list[type]]:
-    """
-    Get all RPC-enabled classes in the specified repository.
-
-    Args:
-        repo_name(str): The name of the repository.
-
-    Returns:
-        dict: A dictionary with keys "connector_classes" and "top_level_classes" and values as lists of classes.
-    """
-    connector_classes = []
-    top_level_classes = []
-    anchor_module = importlib.import_module(f"{repo_name}.widgets")
-    directory = os.path.dirname(anchor_module.__file__)
-    for root, _, files in sorted(os.walk(directory)):
-        for file in files:
-            if not file.endswith(".py") or file.startswith("__"):
-                continue
-
-            path = os.path.join(root, file)
-            subs = os.path.dirname(os.path.relpath(path, directory)).split("/")
-            if len(subs) == 1 and not subs[0]:
-                module_name = file.split(".")[0]
-            else:
-                module_name = ".".join(subs + [file.split(".")[0]])
-
-            module = importlib.import_module(f"{repo_name}.widgets.{module_name}")
-
-            for name in dir(module):
-                obj = getattr(module, name)
-                if not hasattr(obj, "__module__") or obj.__module__ != module.__name__:
-                    continue
-                if isinstance(obj, type) and issubclass(obj, BECConnector):
-                    connector_classes.append(obj)
-                    if len(subs) == 1 and (
-                        issubclass(obj, QWidget) or issubclass(obj, QGraphicsWidget)
-                    ):
-                        top_level_classes.append(obj)
-
-    return {"connector_classes": connector_classes, "top_level_classes": top_level_classes}

bec_widgets/utils/widget_io.py

@@ -119,7 +119,7 @@ class WidgetIO:
             widget: Widget instance.
             ignore_errors(bool, optional): Whether to ignore if no handler is found.
         """
-        handler_class = WidgetIO._find_handler(widget)
+        handler_class = WidgetIO._handlers.get(type(widget))
         if handler_class:
             return handler_class().get_value(widget)  # Instantiate the handler
         if not ignore_errors:
@@ -136,28 +136,12 @@ class WidgetIO:
             value: Value to set.
             ignore_errors(bool, optional): Whether to ignore if no handler is found.
         """
-        handler_class = WidgetIO._find_handler(widget)
+        handler_class = WidgetIO._handlers.get(type(widget))
         if handler_class:
             handler_class().set_value(widget, value)  # Instantiate the handler
         elif not ignore_errors:
             raise ValueError(f"No handler for widget type: {type(widget)}")
 
-    @staticmethod
-    def _find_handler(widget):
-        """
-        Find the appropriate handler for the widget by checking its base classes.
-
-        Args:
-            widget: Widget instance.
-
-        Returns:
-            handler_class: The handler class if found, otherwise None.
-        """
-        for base in type(widget).__mro__:
-            if base in WidgetIO._handlers:
-                return WidgetIO._handlers[base]
-        return None
-
 
 ################## for exporting and importing widget hierarchies ##################
 

bec_widgets/utils/yaml_dialog.py

@@ -6,7 +6,7 @@ import yaml
 from qtpy.QtWidgets import QFileDialog
 
 
-def load_yaml_gui(instance) -> Union[dict, None]:
+def load_yaml(instance) -> Union[dict, None]:
     """
     Load YAML file from disk.
 
@@ -20,25 +20,12 @@ def load_yaml_gui(instance) -> Union[dict, None]:
     file_path, _ = QFileDialog.getOpenFileName(
         instance, "Load Settings", "", "YAML Files (*.yaml *.yml);;All Files (*)", options=options
     )
-    config = load_yaml(file_path)
-    return config
 
-
-def load_yaml(file_path: str) -> Union[dict, None]:
-    """
-    Load YAML file from disk.
-
-    Args:
-        file_path(str): Path to the YAML file.
-
-    Returns:
-        dict: Configuration data loaded from the YAML file.
-    """
     if not file_path:
         return None
     try:
         with open(file_path, "r") as file:
-            config = yaml.load(file, Loader=yaml.FullLoader)
+            config = yaml.safe_load(file)
         return config
 
     except FileNotFoundError:
@@ -51,7 +38,7 @@ def load_yaml(file_path: str) -> Union[dict, None]:
         print(f"An error occurred while loading the settings from {file_path}: {e}")
 
 
-def save_yaml_gui(instance, config: dict) -> None:
+def save_yaml(instance, config: dict) -> None:
     """
     Save YAML file to disk.
 
@@ -64,17 +51,6 @@ def save_yaml_gui(instance, config: dict) -> None:
         instance, "Save Settings", "", "YAML Files (*.yaml *.yml);;All Files (*)", options=options
     )
 
-    save_yaml(file_path, config)
-
-
-def save_yaml(file_path: str, config: dict) -> None:
-    """
-    Save YAML file to disk.
-
-    Args:
-        file_path(str): Path to the YAML file.
-        config(dict): Configuration data to be saved.
-    """
     if not file_path:
         return
     try:

bec_widgets/widgets/__init__.py

@@ -1 +1,4 @@
-
+from .dock import BECDock, BECDockArea
+from .figure import BECFigure, FigureConfig
+from .scan_control import ScanControl
+from .spiral_progress_bar import SpiralProgressBar

bec_widgets/widgets/bec_queue/bec_queue.py

@@ -1,111 +0,0 @@
-from bec_lib.endpoints import MessageEndpoints
-from qtpy.QtCore import Qt, Slot
-from qtpy.QtWidgets import QHeaderView, QTableWidget, QTableWidgetItem, QWidget
-
-from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig
-
-
-class BECQueue(BECConnector, QTableWidget):
-    """
-    Widget to display the BEC queue.
-    """
-
-    def __init__(
-        self,
-        parent: QWidget | None = None,
-        client=None,
-        config: ConnectionConfig = None,
-        gui_id: str = None,
-    ):
-        super().__init__(client, config, gui_id)
-        QTableWidget.__init__(self, parent=parent)
-        self.setColumnCount(3)
-        self.setHorizontalHeaderLabels(["Scan Number", "Type", "Status"])
-        header = self.horizontalHeader()
-        header.setSectionResizeMode(QHeaderView.Stretch)
-        self.bec_dispatcher.connect_slot(self.update_queue, MessageEndpoints.scan_queue_status())
-        self.reset_content()
-
-    @Slot(dict, dict)
-    def update_queue(self, content, _metadata):
-        """
-        Update the queue table with the latest queue information.
-
-        Args:
-            content (dict): The queue content.
-            _metadata (dict): The metadata.
-        """
-        # only show the primary queue for now
-        queue_info = content.get("queue", {}).get("primary", {}).get("info", [])
-        self.setRowCount(len(queue_info))
-        self.clearContents()
-
-        if not queue_info:
-            self.reset_content()
-            return
-
-        for index, item in enumerate(queue_info):
-            blocks = item.get("request_blocks", [])
-            scan_types = []
-            scan_numbers = []
-            status = item.get("status", "")
-            for request_block in blocks:
-                scan_type = request_block.get("content", {}).get("scan_type", "")
-                if scan_type:
-                    scan_types.append(scan_type)
-                scan_number = request_block.get("scan_number", "")
-                if scan_number:
-                    scan_numbers.append(str(scan_number))
-            if scan_types:
-                scan_types = ", ".join(scan_types)
-            if scan_numbers:
-                scan_numbers = ", ".join(scan_numbers)
-            self.set_row(index, scan_numbers, scan_types, status)
-
-    def format_item(self, content: str) -> QTableWidgetItem:
-        """
-        Format the content of the table item.
-
-        Args:
-            content (str): The content to be formatted.
-
-        Returns:
-            QTableWidgetItem: The formatted item.
-        """
-        item = QTableWidgetItem(content)
-        item.setTextAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
-        return item
-
-    def set_row(self, index: int, scan_number: str, scan_type: str, status: str):
-        """
-        Set the row of the table.
-
-        Args:
-            index (int): The index of the row.
-            scan_number (str): The scan number.
-            scan_type (str): The scan type.
-            status (str): The status.
-        """
-
-        self.setItem(index, 0, self.format_item(scan_number))
-        self.setItem(index, 1, self.format_item(scan_type))
-        self.setItem(index, 2, self.format_item(status))
-
-    def reset_content(self):
-        """
-        Reset the content of the table.
-        """
-
-        self.setRowCount(1)
-        self.set_row(0, "", "", "")
-
-
-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
-    from qtpy.QtWidgets import QApplication
-
-    app = QApplication(sys.argv)
-    widget = BECQueue()
-    widget.show()
-    sys.exit(app.exec_())

bec_widgets/widgets/bec_queue/bec_queue.pyproject

@@ -1 +0,0 @@
-{'files': ['bec_queue.py']}

bec_widgets/widgets/bec_queue/register_bec_queue.py

@@ -1,15 +0,0 @@
-def main():  # pragma: no cover
-    from qtpy import PYSIDE6
-
-    if not PYSIDE6:
-        print("PYSIDE6 is not available in the environment. Cannot patch designer.")
-        return
-    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
-
-    from bec_widgets.widgets.bec_queue.bec_queue_plugin import BECQueuePlugin
-
-    QPyDesignerCustomWidgetCollection.addCustomWidget(BECQueuePlugin())
-
-
-if __name__ == "__main__":  # pragma: no cover
-    main()

bec_widgets/widgets/bec_status_box/bec_status_box.py

@@ -1,356 +0,0 @@
-"""This module contains the BECStatusBox widget, which displays the status of different BEC services in a collapsible tree widget.
-The widget automatically updates the status of all running BEC services, and displays their status.
-"""
-
-from __future__ import annotations
-
-import sys
-from typing import TYPE_CHECKING
-
-import qdarktheme
-from bec_lib.utils.import_utils import lazy_import_from
-from pydantic import BaseModel, Field, field_validator
-from qtpy.QtCore import QObject, QTimer, Signal, Slot
-from qtpy.QtWidgets import QTreeWidget, QTreeWidgetItem
-
-from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig
-from bec_widgets.widgets.bec_status_box.status_item import StatusItem
-
-if TYPE_CHECKING:
-    from bec_lib.client import BECClient
-
-# TODO : Put normal imports back when Pydantic gets faster
-BECStatus = lazy_import_from("bec_lib.messages", ("BECStatus",))
-
-
-class BECStatusBoxConfig(ConnectionConfig):
-    pass
-
-
-class BECServiceInfoContainer(BaseModel):
-    """Container to store information about the BEC services."""
-
-    service_name: str
-    status: BECStatus | str = Field(
-        default="NOTCONNECTED",
-        description="The status of the service. Can be any of the BECStatus names, or NOTCONNECTED.",
-    )
-    info: dict
-    metrics: dict | None
-    model_config: dict = {"validate_assignment": True}
-
-    @field_validator("status")
-    @classmethod
-    def validate_status(cls, v):
-        """Validate input for status. Accept BECStatus and NOTCONNECTED.
-
-        Args:
-            v (BECStatus | str): The input value.
-
-        Returns:
-            str: The validated status.
-        """
-        if v in list(BECStatus.__members__.values()):
-            return v.name
-        if v in list(BECStatus.__members__.keys()) or v == "NOTCONNECTED":
-            return v
-        raise ValueError(
-            f"Status must be one of {BECStatus.__members__.values()} or 'NOTCONNECTED'. Input {v}"
-        )
-
-
-class BECServiceStatusMixin(QObject):
-    """A mixin class to update the service status, and metrics.
-    It emits a signal 'services_update' when the service status is updated.
-
-    Args:
-        client (BECClient): The client object to connect to the BEC server.
-    """
-
-    services_update = Signal(dict, dict)
-
-    def __init__(self, client: BECClient):
-        super().__init__()
-        self.client = client
-        self._service_update_timer = QTimer()
-        self._service_update_timer.timeout.connect(self._get_service_status)
-        self._service_update_timer.start(1000)
-
-    def _get_service_status(self):
-        """Pull latest service and metrics updates from REDIS for all services, and emit both via 'services_update' signal."""
-        # pylint: disable=protected-access
-        self.client._update_existing_services()
-        self.services_update.emit(self.client._services_info, self.client._services_metric)
-
-
-class BECStatusBox(BECConnector, QTreeWidget):
-    """A widget to display the status of different BEC services.
-    This widget automatically updates the status of all running BEC services, and displays their status.
-    Information about the individual services is collapsible, and double clicking on
-    the individual service will display the metrics about the service.
-
-    Args:
-        parent Optional : The parent widget for the BECStatusBox. Defaults to None.
-        service_name Optional(str): The name of the top service label. Defaults to "BEC Server".
-        client Optional(BECClient): The client object to connect to the BEC server. Defaults to None
-        config Optional(BECStatusBoxConfig | dict): The configuration for the status box. Defaults to None.
-        gui_id Optional(str): The unique id for the widget. Defaults to None.
-    """
-
-    CORE_SERVICES = ["DeviceServer", "ScanServer", "SciHub", "ScanBundler", "FileWriterManager"]
-
-    service_update = Signal(dict)
-    bec_core_state = Signal(str)
-
-    def __init__(
-        self,
-        parent=None,
-        service_name: str = "BEC Server",
-        client: BECClient = None,
-        config: BECStatusBoxConfig | dict = None,
-        bec_service_status_mixin: BECServiceStatusMixin = None,
-        gui_id: str = None,
-    ):
-        if config is None:
-            config = BECStatusBoxConfig(widget_class=self.__class__.__name__)
-        else:
-            if isinstance(config, dict):
-                config = BECStatusBoxConfig(**config)
-        super().__init__(client=client, config=config, gui_id=gui_id)
-        QTreeWidget.__init__(self, parent=parent)
-
-        self.service_name = service_name
-        self.config = config
-
-        self.bec_service_info_container = {}
-        self.tree_items = {}
-        self.tree_top_item = None
-
-        if not bec_service_status_mixin:
-            bec_service_status_mixin = BECServiceStatusMixin(client=self.client)
-        self.bec_service_status = bec_service_status_mixin
-
-        self.init_ui()
-        self.bec_service_status.services_update.connect(self.update_service_status)
-        self.bec_core_state.connect(self.update_top_item_status)
-        self.itemDoubleClicked.connect(self.on_tree_item_double_clicked)
-
-    def init_ui(self) -> None:
-        """Initialize the UI for the status box, and add QTreeWidget as the basis for the status box."""
-        self.init_ui_tree_widget()
-        top_label = self._create_status_widget(self.service_name, status=BECStatus.IDLE)
-        self.tree_top_item = QTreeWidgetItem()
-        self.tree_top_item.setExpanded(True)
-        self.tree_top_item.setDisabled(True)
-        self.addTopLevelItem(self.tree_top_item)
-        self.setItemWidget(self.tree_top_item, 0, top_label)
-        self.service_update.connect(top_label.update_config)
-
-    def _create_status_widget(
-        self, service_name: str, status=BECStatus, info: dict = None, metrics: dict = None
-    ) -> StatusItem:
-        """Creates a StatusItem (QWidget) for the given service, and stores all relevant
-        information about the service in the bec_service_info_container.
-
-        Args:
-            service_name (str): The name of the service.
-            status (BECStatus): The status of the service.
-            info Optional(dict): The information about the service. Default is {}
-            metric Optional(dict): Metrics for the respective service. Default is None
-
-        Returns:
-            StatusItem: The status item widget.
-        """
-        if info is None:
-            info = {}
-        self._update_bec_service_container(service_name, status, info, metrics)
-        item = StatusItem(
-            parent=self,
-            config={
-                "service_name": service_name,
-                "status": status.name,
-                "info": info,
-                "metrics": metrics,
-            },
-        )
-        return item
-
-    @Slot(str)
-    def update_top_item_status(self, status: BECStatus) -> None:
-        """Method to update the status of the top item in the tree widget.
-        Gets the status from the Signal 'bec_core_state' and updates the StatusItem via the signal 'service_update'.
-
-        Args:
-            status (BECStatus): The state of the core services.
-        """
-        self.bec_service_info_container[self.service_name].status = status
-        self.service_update.emit(self.bec_service_info_container[self.service_name].model_dump())
-
-    def _update_bec_service_container(
-        self, service_name: str, status: BECStatus, info: dict, metrics: dict = None
-    ) -> None:
-        """Update the bec_service_info_container with the newest status and metrics for the BEC service.
-        If information about the service already exists, it will create a new entry.
-
-        Args:
-            service_name (str): The name of the service.
-            service_info (StatusMessage): A class containing the service status.
-            service_metric (ServiceMetricMessage): A class containing the service metrics.
-        """
-        container = self.bec_service_info_container.get(service_name, None)
-        if container:
-            container.status = status
-            container.info = info
-            container.metrics = metrics
-            return
-        service_info_item = BECServiceInfoContainer(
-            service_name=service_name, status=status, info=info, metrics=metrics
-        )
-        self.bec_service_info_container.update({service_name: service_info_item})
-
-    @Slot(dict, dict)
-    def update_service_status(self, services_info: dict, services_metric: dict) -> None:
-        """Callback function services_metric from BECServiceStatusMixin.
-        It updates the status of all services.
-
-        Args:
-            services_info (dict): A dictionary containing the service status for all running BEC services.
-            services_metric (dict): A dictionary containing the service metrics for all running BEC services.
-        """
-        checked = []
-        services_info = self.update_core_services(services_info, services_metric)
-        checked.extend(self.CORE_SERVICES)
-
-        for service_name, msg in sorted(services_info.items()):
-            checked.append(service_name)
-            metric_msg = services_metric.get(service_name, None)
-            metrics = metric_msg.metrics if metric_msg else None
-            if service_name in self.tree_items:
-                self._update_bec_service_container(
-                    service_name=service_name, status=msg.status, info=msg.info, metrics=metrics
-                )
-                self.service_update.emit(self.bec_service_info_container[service_name].model_dump())
-                continue
-
-            item_widget = self._create_status_widget(
-                service_name=service_name, status=msg.status, info=msg.info, metrics=metrics
-            )
-            item = QTreeWidgetItem()
-            item.setDisabled(True)
-            self.service_update.connect(item_widget.update_config)
-            self.tree_top_item.addChild(item)
-            self.setItemWidget(item, 0, item_widget)
-            self.tree_items.update({service_name: (item, item_widget)})
-
-        self.check_redundant_tree_items(checked)
-
-    def update_core_services(self, services_info: dict, services_metric: dict) -> dict:
-        """Method to process status and metrics updates of core services (stored in CORE_SERVICES).
-        If a core services is not connected, it should not be removed from the status widget
-
-        Args:
-            services_info (dict): A dictionary containing the service status of different services.
-            services_metric (dict): A dictionary containing the service metrics of different services.
-
-        Returns:
-            dict: The services_info dictionary after removing the info updates related to the CORE_SERVICES
-        """
-        bec_core_state = "RUNNING"
-        for service_name in sorted(self.CORE_SERVICES):
-            metric_msg = services_metric.get(service_name, None)
-            metrics = metric_msg.metrics if metric_msg else None
-            if service_name not in services_info:
-                self.bec_service_info_container[service_name].status = "NOTCONNECTED"
-                bec_core_state = "ERROR"
-            else:
-                msg = services_info.pop(service_name)
-                self._update_bec_service_container(
-                    service_name=service_name, status=msg.status, info=msg.info, metrics=metrics
-                )
-                bec_core_state = (
-                    "RUNNING" if (msg.status.value > 1 and bec_core_state == "RUNNING") else "ERROR"
-                )
-
-            if service_name in self.tree_items:
-                self.service_update.emit(self.bec_service_info_container[service_name].model_dump())
-                continue
-            self.add_tree_item(service_name, msg.status, msg.info, metrics)
-
-        self.bec_core_state.emit(bec_core_state)
-        return services_info
-
-    def check_redundant_tree_items(self, checked: list) -> None:
-        """Utility method to check and remove redundant objects from the BECStatusBox.
-
-        Args:
-            checked (list): A list of services that are currently running.
-        """
-        to_be_deleted = [key for key in self.tree_items if key not in checked]
-
-        for key in to_be_deleted:
-            item, _ = self.tree_items.pop(key)
-            self.tree_top_item.removeChild(item)
-
-    def add_tree_item(
-        self, service_name: str, status: BECStatus, info: dict = None, metrics: dict = None
-    ) -> None:
-        """Method to add a new QTreeWidgetItem together with a StatusItem to the tree widget.
-
-        Args:
-            service_name (str): The name of the service.
-            service_status_msg (StatusMessage): The status of the service.
-            metrics (dict): The metrics of the service.
-        """
-        item_widget = self._create_status_widget(
-            service_name=service_name, status=status, info=info, metrics=metrics
-        )
-        item = QTreeWidgetItem()
-        self.service_update.connect(item_widget.update_config)
-        self.tree_top_item.addChild(item)
-        self.setItemWidget(item, 0, item_widget)
-        self.tree_items.update({service_name: (item, item_widget)})
-
-    def init_ui_tree_widget(self) -> None:
-        """Initialise the tree widget for the status box."""
-        self.setHeaderHidden(True)
-        self.setStyleSheet(
-            "QTreeWidget::item:!selected "
-            "{ "
-            "border: 1px solid gainsboro; "
-            "border-left: none; "
-            "border-top: none; "
-            "}"
-            "QTreeWidget::item:selected {}"
-        )
-
-    @Slot(QTreeWidgetItem, int)
-    def on_tree_item_double_clicked(self, item: QTreeWidgetItem, column: int) -> None:
-        """Callback function for double clicks on individual QTreeWidgetItems in the collapsed section.
-
-        Args:
-            item (QTreeWidgetItem): The item that was double clicked.
-            column (int): The column that was double clicked.
-        """
-        for _, (tree_item, status_widget) in self.tree_items.items():
-            if tree_item == item:
-                status_widget.show_popup()
-
-    def closeEvent(self, event):
-        super().cleanup()
-        QTreeWidget().closeEvent(event)
-
-
-def main():
-    """Main method to run the BECStatusBox widget."""
-    # pylint: disable=import-outside-toplevel
-    from qtpy.QtWidgets import QApplication
-
-    app = QApplication(sys.argv)
-    qdarktheme.setup_theme("auto")
-    main_window = BECStatusBox()
-    main_window.show()
-    sys.exit(app.exec())
-
-
-if __name__ == "__main__":
-    main()

bec_widgets/widgets/bec_status_box/status_item.py

@@ -1,171 +0,0 @@
-""" Module for a StatusItem widget to display status and metrics for a BEC service.
-The widget is bound to be used with the BECStatusBox widget."""
-
-import enum
-import sys
-from datetime import datetime
-
-import qdarktheme
-from bec_lib.utils.import_utils import lazy_import_from
-from pydantic import Field
-from qtpy.QtCore import Qt, Slot
-from qtpy.QtWidgets import QDialog, QHBoxLayout, QLabel, QStyle, QVBoxLayout, QWidget
-
-from bec_widgets.utils.bec_connector import ConnectionConfig
-
-# TODO : Put normal imports back when Pydantic gets faster
-BECStatus = lazy_import_from("bec_lib.messages", ("BECStatus",))
-
-
-class IconsEnum(enum.Enum):
-    """Enum class for icons in the status item widget."""
-
-    RUNNING = "SP_DialogApplyButton"
-    BUSY = "SP_BrowserReload"
-    IDLE = "SP_MessageBoxWarning"
-    ERROR = "SP_DialogCancelButton"
-    NOTCONNECTED = "SP_TitleBarContextHelpButton"
-
-
-class StatusWidgetConfig(ConnectionConfig):
-    """Configuration class for the status item widget."""
-
-    service_name: str
-    status: str
-    info: dict
-    metrics: dict | None
-    icon_size: tuple = Field(default=(24, 24), description="The size of the icon in the widget.")
-    font_size: int = Field(16, description="The font size of the text in the widget.")
-
-
-class StatusItem(QWidget):
-    """A widget to display the status of a service.
-
-    Args:
-        parent: The parent widget.
-        config (dict): The configuration for the service.
-    """
-
-    def __init__(self, parent=None, config: dict = None):
-        if config is None:
-            config = StatusWidgetConfig(widget_class=self.__class__.__name__)
-        else:
-            if isinstance(config, dict):
-                config = StatusWidgetConfig(**config)
-            self.config = config
-        QWidget.__init__(self, parent=parent)
-        self.parent = parent
-        self.layout = None
-        self.config = config
-        self._popup_label_ref = {}
-        self._label = None
-        self._icon = None
-        self.init_ui()
-
-    def init_ui(self) -> None:
-        """Init the UI for the status item widget."""
-        self.layout = QHBoxLayout()
-        self.layout.setContentsMargins(5, 5, 5, 5)
-        self.setLayout(self.layout)
-        self._label = QLabel()
-        self._icon = QLabel()
-        self.layout.addWidget(self._label)
-        self.layout.addWidget(self._icon)
-        self.update_ui()
-
-    @Slot(dict)
-    def update_config(self, config: dict) -> None:
-        """Update the configuration of the status item widget.
-        This method is invoked from the parent widget.
-        The UI values are later updated based on the new configuration.
-
-        Args:
-            config (dict): Config updates from parent widget.
-        """
-        if config["service_name"] != self.config.service_name:
-            return
-        self.config.status = config["status"]
-        self.config.info = config["info"]
-        self.config.metrics = config["metrics"]
-        self.update_ui()
-
-    def update_ui(self) -> None:
-        """Update the UI of the labels, and popup dialog."""
-        self.set_text()
-        self.set_status()
-        self._set_popup_text()
-
-    def set_text(self) -> None:
-        """Set the text of the QLabel basae on the config."""
-        service = self.config.service_name
-        status = self.config.status
-        if "BECClient" in service.split("/"):
-            service = service.split("/")[0] + "/..." + service.split("/")[1][-4:]
-        if status == "NOTCONNECTED":
-            status = "NOT CONNECTED"
-        text = f"{service} is {status}"
-        self._label.setText(text)
-
-    def set_status(self) -> None:
-        """Set the status icon for the status item widget."""
-        icon_name = IconsEnum[self.config.status].value
-        icon = self.style().standardIcon(getattr(QStyle.StandardPixmap, icon_name))
-        self._icon.setPixmap(icon.pixmap(*self.config.icon_size))
-        self._icon.setAlignment(Qt.AlignmentFlag.AlignRight)
-
-    def show_popup(self) -> None:
-        """Method that is invoked when the user double clicks on the StatusItem widget."""
-        dialog = QDialog(self)
-        dialog.setWindowTitle(f"{self.config.service_name} Details")
-        layout = QVBoxLayout()
-        popup_label = self._make_popup_label()
-        self._set_popup_text()
-        layout.addWidget(popup_label)
-        dialog.setLayout(layout)
-        dialog.finished.connect(self._cleanup_popup_label)
-        dialog.exec()
-
-    def _make_popup_label(self) -> QLabel:
-        """Create a QLabel for the popup dialog.
-
-        Returns:
-            QLabel: The label for the popup dialog.
-        """
-        label = QLabel()
-        label.setWordWrap(True)
-        self._popup_label_ref.update({"label": label})
-        return label
-
-    def _set_popup_text(self) -> None:
-        """Compile the metrics text for the status item widget."""
-        if self._popup_label_ref.get("label") is None:
-            return
-        metrics_text = (
-            f"<b>SERVICE:</b> {self.config.service_name}<br><b>STATUS:</b> {self.config.status}<br>"
-        )
-        if self.config.metrics:
-            for key, value in self.config.metrics.items():
-                if key == "create_time":
-                    value = datetime.fromtimestamp(value).strftime("%Y-%m-%d %H:%M:%S")
-                metrics_text += f"<b>{key.upper()}:</b> {value}<br>"
-        self._popup_label_ref["label"].setText(metrics_text)
-
-    def _cleanup_popup_label(self) -> None:
-        """Cleanup the popup label."""
-        self._popup_label_ref.clear()
-
-
-def main():
-    """Run the status item widget."""
-    # pylint: disable=import-outside-toplevel
-    from qtpy.QtWidgets import QApplication
-
-    app = QApplication(sys.argv)
-    qdarktheme.setup_theme("auto")
-    main_window = StatusItem()
-    main_window.show()
-    sys.exit(app.exec())
-
-
-if __name__ == "__main__":
-    main()

bec_widgets/widgets/buttons/__init__.py

@@ -1 +0,0 @@
-from .stop_button.stop_button import StopButton

bec_widgets/widgets/buttons/stop_button/stop_button.py

@@ -1,32 +0,0 @@
-from qtpy.QtWidgets import QPushButton
-
-from bec_widgets.utils import BECConnector
-
-
-class StopButton(BECConnector, QPushButton):
-    """A button that stops the current scan."""
-
-    def __init__(self, parent=None, client=None, config=None, gui_id=None):
-        super().__init__(client=client, config=config, gui_id=gui_id)
-        QPushButton.__init__(self, parent=parent)
-
-        self.get_bec_shortcuts()
-        self.setText("Stop")
-        self.setStyleSheet("background-color:  #cc181e; color: white")
-        self.clicked.connect(self.stop_scan)
-
-    def stop_scan(self):
-        """Stop the scan."""
-        self.queue.request_scan_abortion()
-        self.queue.request_queue_reset()
-
-
-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
-    from qtpy.QtWidgets import QApplication
-
-    app = QApplication(sys.argv)
-    widget = StopButton()
-    widget.show()
-    sys.exit(app.exec_())

bec_widgets/widgets/console/console.py

@@ -1,496 +0,0 @@
-"""
-BECConsole is a Qt widget that runs a Bash shell. The widget can be used and
-embedded like any other Qt widget.
-
-BECConsole is powered by Pyte, a Python based terminal emulator
-(https://github.com/selectel/pyte).
-"""
-
-import fcntl
-import html
-import os
-import pty
-import subprocess
-import sys
-import threading
-
-import pyte
-from qtpy import QtCore, QtGui, QtWidgets
-from qtpy.QtCore import QSize, QSocketNotifier, Qt
-from qtpy.QtCore import Signal as pyqtSignal
-from qtpy.QtCore import Slot as pyqtSlot
-from qtpy.QtGui import QClipboard, QTextCursor
-from qtpy.QtWidgets import QApplication, QHBoxLayout, QScrollBar, QSizePolicy
-
-ansi_colors = {
-    "black": "#000000",
-    "red": "#CD0000",
-    "green": "#00CD00",
-    "brown": "#996633",  # Brown, replacing the yellow
-    "blue": "#0000EE",
-    "magenta": "#CD00CD",
-    "cyan": "#00CDCD",
-    "white": "#E5E5E5",
-    "brightblack": "#7F7F7F",
-    "brightred": "#FF0000",
-    "brightgreen": "#00FF00",
-    "brightyellow": "#FFFF00",
-    "brightblue": "#5C5CFF",
-    "brightmagenta": "#FF00FF",
-    "brightcyan": "#00FFFF",
-    "brightwhite": "#FFFFFF",
-}
-
-control_keys_mapping = {
-    QtCore.Qt.Key_A: b"\x01",  # Ctrl-A
-    QtCore.Qt.Key_B: b"\x02",  # Ctrl-B
-    QtCore.Qt.Key_C: b"\x03",  # Ctrl-C
-    QtCore.Qt.Key_D: b"\x04",  # Ctrl-D
-    QtCore.Qt.Key_E: b"\x05",  # Ctrl-E
-    QtCore.Qt.Key_F: b"\x06",  # Ctrl-F
-    QtCore.Qt.Key_G: b"\x07",  # Ctrl-G (Bell)
-    QtCore.Qt.Key_H: b"\x08",  # Ctrl-H (Backspace)
-    QtCore.Qt.Key_I: b"\x09",  # Ctrl-I (Tab)
-    QtCore.Qt.Key_J: b"\x0A",  # Ctrl-J (Line Feed)
-    QtCore.Qt.Key_K: b"\x0B",  # Ctrl-K (Vertical Tab)
-    QtCore.Qt.Key_L: b"\x0C",  # Ctrl-L (Form Feed)
-    QtCore.Qt.Key_M: b"\x0D",  # Ctrl-M (Carriage Return)
-    QtCore.Qt.Key_N: b"\x0E",  # Ctrl-N
-    QtCore.Qt.Key_O: b"\x0F",  # Ctrl-O
-    QtCore.Qt.Key_P: b"\x10",  # Ctrl-P
-    QtCore.Qt.Key_Q: b"\x11",  # Ctrl-Q
-    QtCore.Qt.Key_R: b"\x12",  # Ctrl-R
-    QtCore.Qt.Key_S: b"\x13",  # Ctrl-S
-    QtCore.Qt.Key_T: b"\x14",  # Ctrl-T
-    QtCore.Qt.Key_U: b"\x15",  # Ctrl-U
-    QtCore.Qt.Key_V: b"\x16",  # Ctrl-V
-    QtCore.Qt.Key_W: b"\x17",  # Ctrl-W
-    QtCore.Qt.Key_X: b"\x18",  # Ctrl-X
-    QtCore.Qt.Key_Y: b"\x19",  # Ctrl-Y
-    QtCore.Qt.Key_Z: b"\x1A",  # Ctrl-Z
-    QtCore.Qt.Key_Escape: b"\x1B",  # Ctrl-Escape
-    QtCore.Qt.Key_Backslash: b"\x1C",  # Ctrl-\
-    QtCore.Qt.Key_Underscore: b"\x1F",  # Ctrl-_
-}
-
-normal_keys_mapping = {
-    QtCore.Qt.Key_Return: b"\n",
-    QtCore.Qt.Key_Space: b" ",
-    QtCore.Qt.Key_Enter: b"\n",
-    QtCore.Qt.Key_Tab: b"\t",
-    QtCore.Qt.Key_Backspace: b"\x08",
-    QtCore.Qt.Key_Home: b"\x47",
-    QtCore.Qt.Key_End: b"\x4f",
-    QtCore.Qt.Key_Left: b"\x02",
-    QtCore.Qt.Key_Up: b"\x10",
-    QtCore.Qt.Key_Right: b"\x06",
-    QtCore.Qt.Key_Down: b"\x0E",
-    QtCore.Qt.Key_PageUp: b"\x49",
-    QtCore.Qt.Key_PageDown: b"\x51",
-    QtCore.Qt.Key_F1: b"\x1b\x31",
-    QtCore.Qt.Key_F2: b"\x1b\x32",
-    QtCore.Qt.Key_F3: b"\x1b\x33",
-    QtCore.Qt.Key_F4: b"\x1b\x34",
-    QtCore.Qt.Key_F5: b"\x1b\x35",
-    QtCore.Qt.Key_F6: b"\x1b\x36",
-    QtCore.Qt.Key_F7: b"\x1b\x37",
-    QtCore.Qt.Key_F8: b"\x1b\x38",
-    QtCore.Qt.Key_F9: b"\x1b\x39",
-    QtCore.Qt.Key_F10: b"\x1b\x30",
-    QtCore.Qt.Key_F11: b"\x45",
-    QtCore.Qt.Key_F12: b"\x46",
-}
-
-
-def QtKeyToAscii(event):
-    """
-    Convert the Qt key event to the corresponding ASCII sequence for
-    the terminal. This works fine for standard alphanumerical characters, but
-    most other characters require terminal specific control sequences.
-
-    The conversion below works for TERM="linux" terminals.
-    """
-    if sys.platform == "darwin":
-        # special case for MacOS
-        # /!\ Qt maps ControlModifier to CMD
-        # CMD-C, CMD-V for copy/paste
-        # CTRL-C and other modifiers -> key mapping
-        if event.modifiers() == QtCore.Qt.MetaModifier:
-            if event.key() == Qt.Key_Backspace:
-                return control_keys_mapping.get(Qt.Key_W)
-            return control_keys_mapping.get(event.key())
-        elif event.modifiers() == QtCore.Qt.ControlModifier:
-            if event.key() == Qt.Key_C:
-                # copy
-                return "copy"
-            elif event.key() == Qt.Key_V:
-                # paste
-                return "paste"
-            return None
-        else:
-            return normal_keys_mapping.get(event.key(), event.text().encode("utf8"))
-    if event.modifiers() == QtCore.Qt.ControlModifier:
-        return control_keys_mapping.get(event.key())
-    else:
-        return normal_keys_mapping.get(event.key(), event.text().encode("utf8"))
-
-
-class Screen(pyte.HistoryScreen):
-    def __init__(self, stdin_fd, numColumns, numLines, historyLength):
-        super().__init__(numColumns, numLines, historyLength, ratio=1 / numLines)
-        self._fd = stdin_fd
-
-    def write_process_input(self, data):
-        """Response to CPR request for example"""
-        os.write(self._fd, data.encode("utf-8"))
-
-
-class Backend(QtCore.QObject):
-    """
-    Poll Bash.
-
-    This class will run as a qsocketnotifier (started in ``_TerminalWidget``) and poll the
-    file descriptor of the Bash terminal.
-    """
-
-    # Signals to communicate with ``_TerminalWidget``.
-    startWork = pyqtSignal()
-    dataReady = pyqtSignal(object)
-
-    def __init__(self, fd, numColumns, numLines):
-        super().__init__()
-
-        # File descriptor that connects to Bash process.
-        self.fd = fd
-
-        # Setup Pyte (hard coded display size for now).
-        self.screen = Screen(self.fd, numColumns, numLines, 10000)
-        self.stream = pyte.ByteStream()
-        self.stream.attach(self.screen)
-
-        self.notifier = QSocketNotifier(fd, QSocketNotifier.Read)
-        self.notifier.activated.connect(self._fd_readable)
-
-    def _fd_readable(self):
-        """
-        Poll the Bash output, run it through Pyte, and notify the main applet.
-        """
-        # Read the shell output until the file descriptor is closed.
-        try:
-            out = os.read(self.fd, 2**16)
-        except OSError:
-            return
-
-        # Feed output into Pyte's state machine and send the new screen
-        # output to the GUI
-        self.stream.feed(out)
-        self.dataReady.emit(self.screen)
-
-
-class BECConsole(QtWidgets.QScrollArea):
-    """Container widget for the terminal text area"""
-
-    def __init__(self, parent=None, numLines=50, numColumns=125):
-        super().__init__(parent)
-
-        self.innerWidget = QtWidgets.QWidget(self)
-        QHBoxLayout(self.innerWidget)
-        self.innerWidget.layout().setContentsMargins(0, 0, 0, 0)
-
-        self.term = _TerminalWidget(self.innerWidget, numLines, numColumns)
-        self.term.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
-        self.innerWidget.layout().addWidget(self.term)
-
-        self.scroll_bar = QScrollBar(Qt.Vertical, self.term)
-        self.innerWidget.layout().addWidget(self.scroll_bar)
-
-        self.term.set_scroll(self.scroll_bar)
-
-        self.setWidget(self.innerWidget)
-
-    def start(self, cmd=["bec", "--nogui"], deactivate_ctrl_d=True):
-        self.term._cmd = cmd
-        self.term.start(deactivate_ctrl_d=deactivate_ctrl_d)
-
-    def push(self, text):
-        """Push some text to the terminal"""
-        return self.term.push(text)
-
-
-class _TerminalWidget(QtWidgets.QPlainTextEdit):
-    """
-    Start ``Backend`` process and render Pyte output as text.
-    """
-
-    def __init__(self, parent, numColumns, numLines, **kwargs):
-        super().__init__(parent)
-
-        # file descriptor to communicate with the subprocess
-        self.fd = None
-        self.backend = None
-        self.lock = threading.Lock()
-        # command to execute
-        self._cmd = None
-        # should ctrl-d be deactivated ? (prevent Python exit)
-        self._deactivate_ctrl_d = False
-
-        # Specify the terminal size in terms of lines and columns.
-        self.numLines = numLines
-        self.numColumns = numColumns
-        self.output = [""] * numLines
-
-        # Use Monospace fonts and disable line wrapping.
-        self.setFont(QtGui.QFont("Courier", 9))
-        self.setFont(QtGui.QFont("Monospace"))
-        self.setLineWrapMode(QtWidgets.QPlainTextEdit.NoWrap)
-
-        # Disable vertical scrollbar (we use our own, to be set via .set_scroll())
-        self.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
-
-        fmt = QtGui.QFontMetrics(self.font())
-        self._char_width = fmt.width("w")
-        self._char_height = fmt.height()
-        self.setCursorWidth(self._char_width)
-        # self.setStyleSheet("QPlainTextEdit { color: #ffff00; background-color: #303030; } ");
-
-    def start(self, deactivate_ctrl_d=False):
-        self._deactivate_ctrl_d = deactivate_ctrl_d
-
-        # Start the Bash process
-        self.fd = self.forkShell()
-
-        # Create the ``Backend`` object
-        self.backend = Backend(self.fd, self.numColumns, self.numLines)
-        self.backend.dataReady.connect(self.dataReady)
-
-    def minimumSizeHint(self):
-        width = self._char_width * self.numColumns
-        height = self._char_height * self.numLines
-        return QSize(width, height + 20)
-
-    def set_scroll(self, scroll):
-        self.scroll = scroll
-        self.scroll.setMinimum(0)
-        self.scroll.valueChanged.connect(self.scroll_value_change)
-
-    def scroll_value_change(self, value, old={"value": 0}):
-        if value <= old["value"]:
-            # scroll up
-            # value is number of lines from the start
-            nlines = old["value"] - value
-            # history ratio gives prev_page == 1 line
-            for i in range(nlines):
-                self.backend.screen.prev_page()
-        else:
-            # scroll down
-            nlines = value - old["value"]
-            for i in range(nlines):
-                self.backend.screen.next_page()
-        old["value"] = value
-        self.dataReady(self.backend.screen, reset_scroll=False)
-
-    @pyqtSlot(object)
-    def keyPressEvent(self, event):
-        """
-        Redirect all keystrokes to the terminal process.
-        """
-        # Convert the Qt key to the correct ASCII code.
-        if (
-            self._deactivate_ctrl_d
-            and event.modifiers() == QtCore.Qt.ControlModifier
-            and event.key() == QtCore.Qt.Key_D
-        ):
-            return None
-
-        code = QtKeyToAscii(event)
-        if code == "copy":
-            # MacOS only: CMD-C handling
-            self.copy()
-        elif code == "paste":
-            # MacOS only: CMD-V handling
-            self._push_clipboard()
-        elif code is not None:
-            os.write(self.fd, code)
-
-    def push(self, text):
-        """
-        Write 'text' to terminal
-        """
-        os.write(self.fd, text.encode("utf-8"))
-
-    def contextMenuEvent(self, event):
-        menu = self.createStandardContextMenu()
-        for action in menu.actions():
-            # remove all actions except copy and paste
-            if "opy" in action.text():
-                # redefine text without shortcut
-                # since it probably clashes with control codes (like CTRL-C etc)
-                action.setText("Copy")
-                continue
-            if "aste" in action.text():
-                # redefine text without shortcut
-                action.setText("Paste")
-                # paste -> have to insert with self.push
-                action.triggered.connect(self._push_clipboard)
-                continue
-            menu.removeAction(action)
-        menu.exec_(event.globalPos())
-
-    def _push_clipboard(self):
-        clipboard = QApplication.instance().clipboard()
-        self.push(clipboard.text())
-
-    def mouseReleaseEvent(self, event):
-        if event.button() == Qt.MiddleButton:
-            # push primary selection buffer ("mouse clipboard") to terminal
-            clipboard = QApplication.instance().clipboard()
-            if clipboard.supportsSelection():
-                self.push(clipboard.text(QClipboard.Selection))
-            return None
-        elif event.button() == Qt.LeftButton:
-            # left button click
-            textCursor = self.textCursor()
-            if textCursor.selectedText():
-                # mouse was used to select text -> nothing to do
-                pass
-            else:
-                # a simple 'click', make cursor going to end
-                textCursor.setPosition(0)
-                textCursor.movePosition(
-                    QTextCursor.Down, QTextCursor.MoveAnchor, self.backend.screen.cursor.y
-                )
-                textCursor.movePosition(
-                    QTextCursor.Right, QTextCursor.MoveAnchor, self.backend.screen.cursor.x
-                )
-                self.setTextCursor(textCursor)
-                self.ensureCursorVisible()
-                return None
-        return super().mouseReleaseEvent(event)
-
-    def dataReady(self, screenData, reset_scroll=True):
-        """
-        Render the new screen as text into the widget.
-
-        This method is triggered via a signal from ``Backend``.
-        """
-        with self.lock:
-            # Clear the widget
-            self.clear()
-
-            # Prepare the HTML output
-            for line_no in screenData.dirty:
-                line = text = ""
-                style = old_style = ""
-                for ch in screenData.buffer[line_no].values():
-                    style = f"{'background-color:%s;' % ansi_colors.get(ch.bg, ansi_colors['black']) if ch.bg!='default' else ''}{'color:%s;' % ansi_colors.get(ch.fg, ansi_colors['white']) if ch.fg!='default' else ''}{'font-weight:bold;' if ch.bold else ''}{'font-style:italic;' if ch.italics else ''}"
-                    if style != old_style:
-                        if old_style:
-                            line += f"<span style={repr(old_style)}>{html.escape(text, quote=True)}</span>"
-                        else:
-                            line += html.escape(text, quote=True)
-                        text = ""
-                        old_style = style
-                    text += ch.data
-                if style:
-                    line += f"<span style={repr(style)}>{html.escape(text, quote=True)}</span>"
-                else:
-                    line += html.escape(text, quote=True)
-                self.output[line_no] = line
-            # fill the text area with HTML contents in one go
-            self.appendHtml(f"<pre>{chr(10).join(self.output)}</pre>")
-            # done updates, all clean
-            screenData.dirty.clear()
-
-            # Activate cursor
-            textCursor = self.textCursor()
-            textCursor.setPosition(0)
-            textCursor.movePosition(QTextCursor.Down, QTextCursor.MoveAnchor, screenData.cursor.y)
-            textCursor.movePosition(QTextCursor.Right, QTextCursor.MoveAnchor, screenData.cursor.x)
-            self.setTextCursor(textCursor)
-            self.ensureCursorVisible()
-
-            # manage scroll
-            if reset_scroll:
-                self.scroll.valueChanged.disconnect(self.scroll_value_change)
-                tmp = len(self.backend.screen.history.top) + len(self.backend.screen.history.bottom)
-                self.scroll.setMaximum(tmp if tmp > 0 else 0)
-                self.scroll.setSliderPosition(len(self.backend.screen.history.top))
-                self.scroll.valueChanged.connect(self.scroll_value_change)
-
-    # def resizeEvent(self, event):
-    #    with self.lock:
-    #        self.numColumns = int(self.width() / self._char_width)
-    #        self.numLines = int(self.height() / self._char_height)
-    #        self.output = [""] * self.numLines
-    #        print("RESIZING TO", self.numColumns, "x", self.numLines)
-    #        self.backend.screen.resize(self.numLines, self.numColumns)
-
-    def wheelEvent(self, event):
-        y = event.angleDelta().y()
-        if y > 0:
-            self.backend.screen.prev_page()
-        else:
-            self.backend.screen.next_page()
-        self.dataReady(self.backend.screen, reset_scroll=False)
-
-    def forkShell(self):
-        """
-        Fork the current process and execute bec in shell.
-        """
-        try:
-            pid, fd = pty.fork()
-        except (IOError, OSError):
-            return False
-        if pid == 0:
-            # Safe way to make it work under BSD and Linux
-            try:
-                ls = os.environ["LANG"].split(".")
-            except KeyError:
-                ls = []
-            if len(ls) < 2:
-                ls = ["en_US", "UTF-8"]
-            try:
-                os.putenv("COLUMNS", str(self.numColumns))
-                os.putenv("LINES", str(self.numLines))
-                os.putenv("TERM", "linux")
-                os.putenv("LANG", ls[0] + ".UTF-8")
-                if isinstance(self._cmd, str):
-                    os.execvp(self._cmd, self._cmd)
-                else:
-                    os.execvp(self._cmd[0], self._cmd)
-                # print "child_pid", child_pid, sts
-            except (IOError, OSError):
-                pass
-            # self.proc_finish(sid)
-            os._exit(0)
-        else:
-            # We are in the parent process.
-            # Set file control
-            fcntl.fcntl(fd, fcntl.F_SETFL, os.O_NONBLOCK)
-            print("Spawned Bash shell (PID {})".format(pid))
-            return fd
-
-
-if __name__ == "__main__":
-    import os
-    import sys
-
-    from qtpy import QtGui, QtWidgets
-
-    # Terminal size in characters.
-    numLines = 25
-    numColumns = 100
-
-    # Create the Qt application and QBash instance.
-    app = QtWidgets.QApplication([])
-    mainwin = QtWidgets.QMainWindow()
-    title = "BECConsole ({}x{})".format(numColumns, numLines)
-    mainwin.setWindowTitle(title)
-
-    console = BECConsole(mainwin, numColumns, numLines)
-    mainwin.setCentralWidget(console)
-    console.start()
-
-    # Show widget and launch Qt's event loop.
-    mainwin.show()
-    sys.exit(app.exec_())

bec_widgets/widgets/device_inputs/__init__.py

@@ -1,2 +0,0 @@
-from .device_combobox.device_combobox import DeviceComboBox
-from .device_line_edit.device_line_edit import DeviceLineEdit

bec_widgets/widgets/device_inputs/device_combobox/device_combobox.py

@@ -1,92 +0,0 @@
-from typing import TYPE_CHECKING
-
-from qtpy.QtWidgets import QComboBox
-
-from bec_widgets.widgets.device_inputs.device_input_base import DeviceInputBase, DeviceInputConfig
-
-if TYPE_CHECKING:
-    from bec_widgets.widgets.device_inputs.device_input_base import DeviceInputConfig
-
-
-class DeviceComboBox(DeviceInputBase, QComboBox):
-    """
-    Line edit widget for device input with autocomplete for device names.
-
-    Args:
-        parent: Parent widget.
-        client: BEC client object.
-        config: Device input configuration.
-        gui_id: GUI ID.
-        device_filter: Device filter, name of the device class.
-        default: Default device name.
-        arg_name: Argument name, can be used for the other widgets which has to call some other function in bec using correct argument names.
-    """
-
-    def __init__(
-        self,
-        parent=None,
-        client=None,
-        config: DeviceInputConfig = None,
-        gui_id: str | None = None,
-        device_filter: str | None = None,
-        default: str | None = None,
-        arg_name: str | None = None,
-    ):
-        super().__init__(client=client, config=config, gui_id=gui_id)
-        QComboBox.__init__(self, parent=parent)
-
-        self.populate_combobox()
-
-        if arg_name is not None:
-            self.config.arg_name = arg_name
-        if device_filter is not None:
-            self.set_device_filter(device_filter)
-        if default is not None:
-            self.set_default_device(default)
-
-    def set_device_filter(self, device_filter: str):
-        """
-        Set the device filter.
-
-        Args:
-            device_filter(str): Device filter, name of the device class.
-        """
-        super().set_device_filter(device_filter)
-        self.populate_combobox()
-
-    def set_default_device(self, default_device: str):
-        """
-        Set the default device.
-
-        Args:
-            default_device(str): Default device name.
-        """
-        super().set_default_device(default_device)
-        self.setCurrentText(default_device)
-
-    def populate_combobox(self):
-        """Populate the combobox with the devices."""
-        self.devices = self.get_device_list(self.config.device_filter)
-        self.clear()
-        self.addItems(self.devices)
-
-    def get_device(self) -> object:
-        """
-        Get the selected device object.
-
-        Returns:
-            object: Device object.
-        """
-        device_name = self.currentText()
-        device_obj = getattr(self.dev, device_name.lower(), None)
-        if device_obj is None:
-            raise ValueError(f"Device {device_name} is not found.")
-        return device_obj
-
-    def cleanup(self):
-        """Cleanup the widget."""
-        super().cleanup()
-
-    def closeEvent(self, event):
-        super().cleanup()
-        QComboBox().closeEvent(event)

bec_widgets/widgets/device_inputs/device_combobox/device_combobox.pyproject

@@ -1,4 +0,0 @@
-{
-    "files": ["device_combobox.py", "launch_device_combobox.py",
-    ]
-}

bec_widgets/widgets/device_inputs/device_combobox/device_combobox_plugin.py

@@ -1,54 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-
-from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
-
-from bec_widgets.widgets.device_inputs import DeviceComboBox
-
-DOM_XML = """
-<ui language='c++'>
-    <widget class='DeviceComboBox' name='device_combobox'>
-    </widget>
-</ui>
-"""
-
-
-class DeviceComboBoxPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
-    def __init__(self):
-        super().__init__()
-        self._form_editor = None
-
-    def createWidget(self, parent):
-        t = DeviceComboBox(parent)
-        return t
-
-    def domXml(self):
-        return DOM_XML
-
-    def group(self):
-        return ""
-
-    def icon(self):
-        return QIcon()
-
-    def includeFile(self):
-        return "device_combobox"
-
-    def initialize(self, form_editor):
-        self._form_editor = form_editor
-
-    def isContainer(self):
-        return False
-
-    def isInitialized(self):
-        return self._form_editor is not None
-
-    def name(self):
-        return "DeviceComboBox"
-
-    def toolTip(self):
-        return "Device ComboBox Example for BEC Widgets"
-
-    def whatsThis(self):
-        return self.toolTip()

bec_widgets/widgets/device_inputs/device_combobox/launch_device_combobox.py

@@ -1,11 +0,0 @@
-from bec_widgets.widgets.device_inputs import DeviceComboBox
-
-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
-    from qtpy.QtWidgets import QApplication
-
-    app = QApplication(sys.argv)
-    w = DeviceComboBox()
-    w.show()
-    sys.exit(app.exec_())

bec_widgets/widgets/device_inputs/device_combobox/register_device_combobox.py

@@ -1,17 +0,0 @@
-def main():  # pragma: no cover
-    from qtpy import PYSIDE6
-
-    if not PYSIDE6:
-        print("PYSIDE6 is not available in the environment. Cannot patch designer.")
-        return
-    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
-
-    from bec_widgets.widgets.device_inputs.device_combobox.device_combobox_plugin import (
-        DeviceComboBoxPlugin,
-    )
-
-    QPyDesignerCustomWidgetCollection.addCustomWidget(DeviceComboBoxPlugin())
-
-
-if __name__ == "__main__":  # pragma: no cover
-    main()

bec_widgets/widgets/device_inputs/device_input_base.py

@@ -1,123 +0,0 @@
-from __future__ import annotations
-
-from bec_widgets.utils import BECConnector, ConnectionConfig
-
-
-class DeviceInputConfig(ConnectionConfig):
-    device_filter: str | list[str] | None = None
-    default: str | None = None
-    arg_name: str | None = None
-
-
-class DeviceInputBase(BECConnector):
-    """
-    Mixin class for device input widgets. This class provides methods to get the device list and device object based
-    on the current text of the widget.
-    """
-
-    def __init__(self, client=None, config=None, gui_id=None):
-        if config is None:
-            config = DeviceInputConfig(widget_class=self.__class__.__name__)
-        else:
-            if isinstance(config, dict):
-                config = DeviceInputConfig(**config)
-            self.config = config
-        super().__init__(client=client, config=config, gui_id=gui_id)
-
-        self.get_bec_shortcuts()
-        self._devices = []
-
-    @property
-    def devices(self) -> list[str]:
-        """
-        Get the list of devices.
-
-        Returns:
-            list[str]: List of devices.
-        """
-        return self._devices
-
-    @devices.setter
-    def devices(self, value: list[str]):
-        """
-        Set the list of devices.
-
-        Args:
-            value: List of devices.
-        """
-        self._devices = value
-
-    def set_device_filter(self, device_filter: str | list[str]):
-        """
-        Set the device filter.
-
-        Args:
-            device_filter(str): Device filter, name of the device class.
-        """
-        self.validate_device_filter(device_filter)
-        self.config.device_filter = device_filter
-
-    def set_default_device(self, default_device: str):
-        """
-        Set the default device.
-
-        Args:
-            default_device(str): Default device name.
-        """
-        self.validate_device(default_device)
-        self.config.default = default_device
-
-    def get_device_list(self, filter: str | list[str] | None = None) -> list[str]:
-        """
-        Get the list of device names based on the filter of current BEC client.
-
-        Args:
-            filter(str|None): Class name filter to apply on the device list.
-
-        Returns:
-            devices(list[str]): List of device names.
-        """
-        all_devices = self.dev.enabled_devices
-        if filter is not None:
-            self.validate_device_filter(filter)
-            if isinstance(filter, str):
-                filter = [filter]
-            devices = [device.name for device in all_devices if device.__class__.__name__ in filter]
-        else:
-            devices = [device.name for device in all_devices]
-        return devices
-
-    def get_available_filters(self):
-        """
-        Get the available device classes which can be used as filters.
-        """
-        all_devices = self.dev.enabled_devices
-        filters = {device.__class__.__name__ for device in all_devices}
-        return filters
-
-    def validate_device_filter(self, filter: str | list[str]) -> None:
-        """
-        Validate the device filter if the class name is present in the current BEC instance.
-
-        Args:
-            filter(str|list[str]): Class name to use as a device filter.
-        """
-        if isinstance(filter, str):
-            filter = [filter]
-        available_filters = self.get_available_filters()
-        for f in filter:
-            if f not in available_filters:
-                raise ValueError(f"Device filter {f} is not valid.")
-
-    def validate_device(self, device: str) -> None:
-        """
-        Validate the device if it is present in current BEC instance.
-
-        Args:
-            device(str): Device to validate.
-        """
-        if device not in self.get_device_list(self.config.device_filter):
-            raise ValueError(f"Device {device} is not valid.")
-
-    def cleanup(self):
-        super().cleanup()

bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit.py

@@ -1,104 +0,0 @@
-from typing import TYPE_CHECKING
-
-from qtpy.QtCore import QSize
-from qtpy.QtWidgets import QCompleter, QLineEdit, QSizePolicy
-
-from bec_widgets.widgets.device_inputs.device_input_base import DeviceInputBase, DeviceInputConfig
-
-if TYPE_CHECKING:
-    from bec_widgets.widgets.device_inputs.device_input_base import DeviceInputConfig
-
-
-class DeviceLineEdit(DeviceInputBase, QLineEdit):
-    """
-    Line edit widget for device input with autocomplete for device names.
-
-    Args:
-        parent: Parent widget.
-        client: BEC client object.
-        config: Device input configuration.
-        gui_id: GUI ID.
-        device_filter: Device filter, name of the device class.
-        default: Default device name.
-        arg_name: Argument name, can be used for the other widgets which has to call some other function in bec using correct argument names.
-    """
-
-    def __init__(
-        self,
-        parent=None,
-        client=None,
-        config: DeviceInputConfig = None,
-        gui_id: str | None = None,
-        device_filter: str | list[str] | None = None,
-        default: str | None = None,
-        arg_name: str | None = None,
-    ):
-        QLineEdit.__init__(self, parent=parent)
-        DeviceInputBase.__init__(self, client=client, config=config, gui_id=gui_id)
-
-        self.completer = QCompleter(self)
-        self.setCompleter(self.completer)
-        self.populate_completer()
-
-        if arg_name is not None:
-            self.config.arg_name = arg_name
-            self.arg_name = arg_name
-        if device_filter is not None:
-            self.set_device_filter(device_filter)
-        if default is not None:
-            self.set_default_device(default)
-
-        self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
-        self.setMinimumSize(QSize(100, 0))
-
-    def set_device_filter(self, device_filter: str | list[str]):
-        """
-        Set the device filter.
-
-        Args:
-            device_filter (str | list[str]): Device filter, name of the device class.
-        """
-        super().set_device_filter(device_filter)
-        self.populate_completer()
-
-    def set_default_device(self, default_device: str):
-        """
-        Set the default device.
-
-        Args:
-            default_device (str): Default device name.
-        """
-        super().set_default_device(default_device)
-        self.setText(default_device)
-
-    def populate_completer(self):
-        """Populate the completer with the devices."""
-        self.devices = self.get_device_list(self.config.device_filter)
-        self.completer.setModel(self.create_completer_model(self.devices))
-
-    def create_completer_model(self, devices: list[str]):
-        """Create a model for the completer."""
-        from qtpy.QtCore import QStringListModel
-
-        return QStringListModel(devices, self)
-
-    def get_device(self) -> object:
-        """
-        Get the selected device object.
-
-        Returns:
-            object: Device object.
-        """
-        device_name = self.text()
-        device_obj = getattr(self.dev, device_name.lower(), None)
-        if device_obj is None:
-            raise ValueError(f"Device {device_name} is not found.")
-        return device_obj
-
-    def cleanup(self):
-        """Cleanup the widget."""
-        super().cleanup()
-
-    def closeEvent(self, event):
-        super().cleanup()
-        QLineEdit().closeEvent(event)

bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit.pyproject

@@ -1,4 +0,0 @@
-{
-    "files": ["device_line_edit.py", "launch_device_line_edit.py",
-    ]
-}

bec_widgets/widgets/device_inputs/device_line_edit/device_line_edit_plugin.py

@@ -1,54 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
-
-from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
-
-from bec_widgets.widgets.device_inputs import DeviceLineEdit
-
-DOM_XML = """
-<ui language='c++'>
-    <widget class='DeviceLineEdit' name='device_line_edit'>
-    </widget>
-</ui>
-"""
-
-
-class DeviceLineEditPlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
-    def __init__(self):
-        super().__init__()
-        self._form_editor = None
-
-    def createWidget(self, parent):
-        t = DeviceLineEdit(parent)
-        return t
-
-    def domXml(self):
-        return DOM_XML
-
-    def group(self):
-        return ""
-
-    def icon(self):
-        return QIcon()
-
-    def includeFile(self):
-        return "device_line_edit"
-
-    def initialize(self, form_editor):
-        self._form_editor = form_editor
-
-    def isContainer(self):
-        return False
-
-    def isInitialized(self):
-        return self._form_editor is not None
-
-    def name(self):
-        return "DeviceLineEdit"
-
-    def toolTip(self):
-        return "Device LineEdit Example for BEC Widgets with autocomplete."
-
-    def whatsThis(self):
-        return self.toolTip()

bec_widgets/widgets/device_inputs/device_line_edit/launch_device_line_edit.py

@@ -1,11 +0,0 @@
-from bec_widgets.widgets.device_inputs import DeviceLineEdit
-
-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
-    from qtpy.QtWidgets import QApplication
-
-    app = QApplication(sys.argv)
-    w = DeviceLineEdit()
-    w.show()
-    sys.exit(app.exec_())

bec_widgets/widgets/device_inputs/device_line_edit/register_device_line_edit.py

@@ -1,17 +0,0 @@
-def main():  # pragma: no cover
-    from qtpy import PYSIDE6
-
-    if not PYSIDE6:
-        print("PYSIDE6 is not available in the environment. Cannot patch designer.")
-        return
-    from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
-
-    from bec_widgets.widgets.device_inputs.device_line_edit.device_line_edit_plugin import (
-        DeviceLineEditPlugin,
-    )
-
-    QPyDesignerCustomWidgetCollection.addCustomWidget(DeviceLineEditPlugin())
-
-
-if __name__ == "__main__":  # pragma: no cover
-    main()

bec_widgets/widgets/device_selection/device_combobox.py

@@ -0,0 +1,14 @@
+from qtpy.QtWidgets import QComboBox
+
+from bec_widgets.utils import BECConnector, ConnectionConfig
+
+
+class DeviceCombobox(BECConnector, QComboBox):
+    def __init__(self, parent=None, client=None, config=None, gui_id=None):
+        super().__init__(client=client, config=config, gui_id=gui_id)
+        QComboBox.__init__(self, parent=parent)
+
+        self.get_bec_shortcuts()
+
+        def get_device(self):
+            return getattr(self.dev, self.text().lower())

bec_widgets/widgets/dock/dock.py

@@ -1,21 +1,21 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Literal, Optional
+from typing import TYPE_CHECKING, Literal, Optional
 
 from pydantic import Field
 from pyqtgraph.dockarea import Dock
 
-from bec_widgets.cli.rpc_wigdet_handler import widget_handler
+from bec_widgets.cli.rpc_wigdet_handler import RPCWidgetHandler
 from bec_widgets.utils import BECConnector, ConnectionConfig, GridLayoutManager
 
 if TYPE_CHECKING:
     from qtpy.QtWidgets import QWidget
 
-    from bec_widgets.widgets.dock import BECDockArea
+    from bec_widgets.widgets import BECDockArea
 
 
 class DockConfig(ConnectionConfig):
-    widgets: dict[str, Any] = Field({}, description="The widgets in the dock.")
+    widgets: dict[str, ConnectionConfig] = Field({}, description="The widgets in the dock.")
     position: Literal["bottom", "top", "left", "right", "above", "below"] = Field(
         "bottom", description="The position of the dock."
     )
@@ -26,14 +26,13 @@ class DockConfig(ConnectionConfig):
 
 class BECDock(BECConnector, Dock):
     USER_ACCESS = [
-        "_config_dict",
-        "_rpc_id",
+        "rpc_id",
         "widget_list",
         "show_title_bar",
         "hide_title_bar",
         "get_widgets_positions",
         "set_title",
-        "add_widget",
+        "add_widget_bec",
         "list_eligible_widgets",
         "move_widget",
         "remove_widget",
@@ -63,6 +62,8 @@ class BECDock(BECConnector, Dock):
         super().__init__(client=client, config=config, gui_id=gui_id)
         Dock.__init__(self, name=name, **kwargs)
 
+        self.parent_dock_area = parent_dock_area
+
         # Layout Manager
         self.layout_manager = GridLayoutManager(self.layout)
 
@@ -71,8 +72,8 @@ class BECDock(BECConnector, Dock):
         old_area = source.area
         self.setOrientation("horizontal", force=True)
         super().dropEvent(event)
-        if old_area in self.orig_area.tempAreas and old_area != self.orig_area:
-            self.orig_area.removeTempArea(old_area)
+        if old_area in self.parent_dock_area.tempAreas and old_area != self.parent_dock_area:
+            self.parent_dock_area.removeTempArea(old_area)
 
     def float(self):
         """
@@ -91,7 +92,7 @@ class BECDock(BECConnector, Dock):
             super().float()
 
     @property
-    def widget_list(self) -> list[BECConnector]:
+    def widget_list(self) -> list:
         """
         Get the widgets in the dock.
 
@@ -101,7 +102,7 @@ class BECDock(BECConnector, Dock):
         return self.widgets
 
     @widget_list.setter
-    def widget_list(self, value: list[BECConnector]):
+    def widget_list(self, value: list):
         self.widgets = value
 
     def hide_title_bar(self):
@@ -127,9 +128,8 @@ class BECDock(BECConnector, Dock):
         Args:
             title(str): The title of the dock.
         """
-        self.orig_area.docks[title] = self.orig_area.docks.pop(self.name())
+        self.parent_dock_area.docks[title] = self.parent_dock_area.docks.pop(self.name())
         self.setTitle(title)
-        self._name = title
 
     def get_widgets_positions(self) -> dict:
         """
@@ -149,17 +149,48 @@ class BECDock(BECConnector, Dock):
         Returns:
             list: The list of eligible widgets.
         """
-        return list(widget_handler.widget_classes.keys())
+        return list(RPCWidgetHandler.widget_classes.keys())
 
-    def add_widget(
+    def add_widget_bec(
         self,
-        widget: BECConnector | str,
+        widget_type: 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.
+            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(
+        self,
+        widget: QWidget,
+        row=None,
+        col=0,
+        rowspan=1,
+        colspan=1,
+        shift: Literal["down", "up", "left", "right"] = "down",
+    ):
         """
         Add a widget to the dock.
 
@@ -177,18 +208,8 @@ 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 = widget_handler.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.
@@ -204,7 +225,7 @@ class BECDock(BECConnector, Dock):
         """
         Attach the dock to the parent dock area.
         """
-        self.orig_area.removeTempArea(self.area)
+        self.parent_dock_area.removeTempArea(self.area)
 
     def detach(self):
         """
@@ -221,7 +242,6 @@ 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):
@@ -229,7 +249,7 @@ class BECDock(BECConnector, Dock):
         Remove the dock from the parent dock area.
         """
         # self.cleanup()
-        self.orig_area.remove_dock(self.name())
+        self.parent_dock_area.remove_dock(self.name())
 
     def cleanup(self):
         """

bec_widgets/widgets/dock/dock_area.py

@@ -16,14 +16,10 @@ 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",
@@ -32,8 +28,7 @@ class BECDockArea(BECConnector, DockArea):
         "clear_all",
         "detach_dock",
         "attach_all",
-        "_get_all_rpc",
-        "temp_areas",
+        "get_all_rpc",
     ]
 
     def __init__(
@@ -61,7 +56,7 @@ class BECDockArea(BECConnector, DockArea):
             painter.drawText(self.rect(), Qt.AlignCenter, "Add docks using 'add_dock' method")
 
     @property
-    def panels(self) -> dict[str, BECDock]:
+    def panels(self) -> dict:
         """
         Get the docks in the dock area.
         Returns:
@@ -70,23 +65,10 @@ class BECDockArea(BECConnector, DockArea):
         return dict(self.docks)
 
     @panels.setter
-    def panels(self, value: dict[str, BECDock]):
+    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"
     ):
@@ -99,7 +81,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.config.docks_state
+            state = self._last_state
         self.restoreState(state, missing=missing, extra=extra)
 
     def save_state(self) -> dict:
@@ -109,9 +91,8 @@ class BECDockArea(BECConnector, DockArea):
         Returns:
             dict: The state of the dock area.
         """
-        last_state = self.saveState()
-        self.config.docks_state = last_state
-        return last_state
+        self._last_state = self.saveState()
+        return self._last_state
 
     def remove_dock(self, name: str):
         """
@@ -121,7 +102,6 @@ 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:
@@ -137,7 +117,6 @@ class BECDockArea(BECConnector, DockArea):
         position: Literal["bottom", "top", "left", "right", "above", "below"] = None,
         relative_to: BECDock | None = None,
         closable: bool = False,
-        floating: bool = False,
         prefix: str = "dock",
         widget: str | QWidget | None = None,
         row: int = None,
@@ -153,7 +132,6 @@ class BECDockArea(BECConnector, DockArea):
             position(Literal["bottom", "top", "left", "right", "above", "below"]): The position of the dock.
             relative_to(BECDock): The dock to which the new dock should be added relative to.
             closable(bool): Whether the dock is closable.
-            floating(bool): Whether the dock is detached after creating.
             prefix(str): The prefix for the dock name if no name is provided.
             widget(str|QWidget|None): The widget to be added to the dock. While using RPC, only BEC RPC widgets from RPCWidgetHandler are allowed.
             row(int): The row of the added widget.
@@ -188,14 +166,14 @@ class BECDockArea(BECConnector, DockArea):
                 dock.show_title_bar()
 
         if widget is not None and isinstance(widget, str):
-            dock.add_widget(widget=widget, row=row, col=col, rowspan=rowspan, colspan=colspan)
+            dock.add_widget_bec(
+                widget_type=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:
             self._instructions_visible = False
             self.update()
-        if floating:
-            dock.detach()
         return dock
 
     def detach_dock(self, dock_name: str) -> BECDock:
@@ -209,7 +187,7 @@ class BECDockArea(BECConnector, DockArea):
             BECDock: The undocked dock.
         """
         dock = self.docks[dock_name]
-        dock.detach()
+        self.floatDock(dock)
         return dock
 
     def attach_all(self):

bec_widgets/widgets/figure/figure.py

@@ -8,7 +8,7 @@ from typing import Literal, Optional
 import numpy as np
 import pyqtgraph as pg
 import qdarktheme
-from pydantic import Field, ValidationError, field_validator
+from pydantic import Field
 from qtpy.QtCore import Signal as pyqtSignal
 from qtpy.QtWidgets import QWidget
 from typeguard import typechecked
@@ -26,40 +26,20 @@ 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, Waveform1DConfig | ImageConfig | MotorMapConfig | SubplotConfig] = Field(
+    widgets: dict[str, SubplotConfig] = Field(
         {}, description="The list of widgets to be added to the figure widget."
     )
 
-    @field_validator("widgets", mode="before")
-    @classmethod
-    def validate_widgets(cls, v):
-        """Validate the widgets configuration."""
-        widget_class_map = {
-            "BECWaveform": Waveform1DConfig,
-            "BECImageShow": ImageConfig,
-            "BECMotorMap": MotorMapConfig,
-        }
-        validated_widgets = {}
-        for key, widget_config in v.items():
-            if "widget_class" not in widget_config:
-                raise ValueError(f"Widget config for {key} does not contain 'widget_class'.")
-            widget_class = widget_config["widget_class"]
-            if widget_class not in widget_class_map:
-                raise ValueError(f"Unknown widget_class '{widget_class}' for widget '{key}'.")
-            config_class = widget_class_map[widget_class]
-            validated_widgets[key] = config_class(**widget_config)
-        return validated_widgets
-
 
 class WidgetHandler:
     """Factory for creating and configuring BEC widgets for BECFigure."""
 
     def __init__(self):
         self.widget_factory = {
-            "BECPlotBase": (BECPlotBase, SubplotConfig),
-            "BECWaveform": (BECWaveform, Waveform1DConfig),
-            "BECImageShow": (BECImageShow, ImageConfig),
-            "BECMotorMap": (BECMotorMap, MotorMapConfig),
+            "PlotBase": (BECPlotBase, SubplotConfig),
+            "Waveform1D": (BECWaveform, Waveform1DConfig),
+            "ImShow": (BECImageShow, ImageConfig),
+            "MotorMap": (BECMotorMap, MotorMapConfig),
         }
 
     def create_widget(
@@ -110,11 +90,13 @@ class WidgetHandler:
 
 class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
     USER_ACCESS = [
-        "_rpc_id",
-        "_config_dict",
-        "_get_all_rpc",
+        "rpc_id",
+        "config_dict",
         "axes",
         "widgets",
+        "add_plot",
+        "add_image",
+        "add_motor_map",
         "plot",
         "image",
         "motor_map",
@@ -122,15 +104,9 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
         "change_layout",
         "change_theme",
         "clear_all",
+        "get_all_rpc",
         "widget_list",
     ]
-    subplot_map = {
-        "PlotBase": BECPlotBase,
-        "BECWaveform": BECWaveform,
-        "BECImageShow": BECImageShow,
-        "BECMotorMap": BECMotorMap,
-    }
-    widget_method_map = {"BECWaveform": "plot", "BECImageShow": "image", "BECMotorMap": "motor_map"}
 
     clean_signal = pyqtSignal()
 
@@ -146,7 +122,8 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
         else:
             if isinstance(config, dict):
                 config = FigureConfig(**config)
-        super().__init__(client=client, gui_id=gui_id)
+            self.config = config
+        super().__init__(client=client, config=config, gui_id=gui_id)
         pg.GraphicsLayoutWidget.__init__(self, parent)
 
         self.widget_handler = WidgetHandler()
@@ -156,8 +133,6 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
 
         # Container to keep track of the grid
         self.grid = []
-        # Create config and apply it
-        self.apply_config(config)
 
     def __getitem__(self, key: tuple | str):
         if isinstance(key, tuple) and len(key) == 2:
@@ -172,24 +147,6 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
                 "Key must be a string (widget id) or a tuple of two integers (grid coordinates)"
             )
 
-    def apply_config(self, config: dict | FigureConfig):  # ,generate_new_id: bool = False):
-        if isinstance(config, dict):
-            try:
-                config = FigureConfig(**config)
-            except ValidationError as e:
-                print(f"Error in applying config: {e}")
-                return
-        self.config = config
-        self.change_theme(self.config.theme)
-
-        # widget_config has to be reset for not have each widget config twice when added to the figure
-        widget_configs = [config for config in self.config.widgets.values()]
-        self.config.widgets = {}
-        for widget_config in widget_configs:
-            getattr(self, self.widget_method_map[widget_config.widget_class])(
-                config=widget_config.model_dump(), row=widget_config.row, col=widget_config.col
-            )
-
     @property
     def widget_list(self) -> list[BECPlotBase]:
         """
@@ -227,9 +184,8 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
         """
         self._widgets = value
 
-    def _init_waveform(
+    def add_plot(
         self,
-        waveform,
         x_name: str = None,
         y_name: str = None,
         z_name: str = None,
@@ -238,54 +194,40 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
         z_entry: str = None,
         x: list | np.ndarray = None,
         y: list | np.ndarray = None,
-        color: str | None = None,
-        color_map_z: str | None = "plasma",
-        label: str | None = None,
+        color: Optional[str] = None,
+        color_map_z: Optional[str] = "plasma",
+        label: Optional[str] = None,
         validate: bool = True,
-        dap: str | None = None,
+        row: int = None,
+        col: int = None,
+        config=None,
+        **axis_kwargs,
     ) -> BECWaveform:
         """
-        Configure the waveform based on the provided parameters.
+        Add a Waveform1D plot to the figure at the specified position.
 
         Args:
-            waveform (BECWaveform): The waveform to configure.
-            x (list | np.ndarray): Custom x data to plot.
-            y (list | np.ndarray): Custom y data to plot.
-            x_name (str): The name of the device for the x-axis.
-            y_name (str): The name of the device for the y-axis.
-            z_name (str): The name of the device for the z-axis.
-            x_entry (str): The name of the entry for the x-axis.
-            y_entry (str): The name of the entry for the y-axis.
-            z_entry (str): The name of the entry for the z-axis.
-            color (str): The color of the curve.
-            color_map_z (str): The color map to use for the z-axis.
-            label (str): The label of the curve.
-            validate (bool): If True, validate the device names and entries.
-            dap (str): The DAP model to use for the curve.
+            widget_id(str): The unique identifier of the widget. If not provided, a unique ID will be generated.
+            row(int): The row coordinate of the widget in the figure. If not provided, the next empty row will be used.
+            col(int): The column coordinate of the widget in the figure. If not provided, the next empty column will be used.
+            config(dict): Additional configuration for the widget.
+            **axis_kwargs(dict): Additional axis properties to set on the widget after creation.
         """
-        if x is not None and y is None:
-            if isinstance(x, np.ndarray):
-                if x.ndim == 1:
-                    y = np.arange(x.size)
-                    waveform.add_curve_custom(x=np.arange(x.size), y=x, color=color, label=label)
-                    return waveform
-                if x.ndim == 2:
-                    waveform.add_curve_custom(x=x[:, 0], y=x[:, 1], color=color, label=label)
-                    return waveform
-            elif isinstance(x, list):
-                y = np.arange(len(x))
-                waveform.add_curve_custom(x=np.arange(len(x)), y=x, color=color, label=label)
-                return waveform
-            else:
-                raise ValueError(
-                    "Invalid input. Provide either device names (x_name, y_name) or custom data."
-                )
-        if x is not None and y is not None:
-            waveform.add_curve_custom(x=x, y=y, color=color, label=label)
-            return waveform
+        widget_id = str(uuid.uuid4())
+        waveform = self.add_widget(
+            widget_type="Waveform1D",
+            widget_id=widget_id,
+            row=row,
+            col=col,
+            config=config,
+            **axis_kwargs,
+        )
+
+        # TODO remove repetition from .plot method
+
         # User wants to add scan curve -> 1D Waveform
         if x_name is not None and y_name is not None and z_name is None and x is None and y is None:
-            waveform.plot(
+            waveform.add_curve_scan(
                 x_name=x_name,
                 y_name=y_name,
                 x_entry=x_entry,
@@ -293,7 +235,6 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
                 validate=validate,
                 color=color,
                 label=label,
-                dap=dap,
             )
         # User wants to add scan curve -> 2D Waveform Scatter
         if (
@@ -303,7 +244,7 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
             and x is None
             and y is None
         ):
-            waveform.plot(
+            waveform.add_curve_scan(
                 x_name=x_name,
                 y_name=y_name,
                 z_name=z_name,
@@ -314,7 +255,6 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
                 color_map_z=color_map_z,
                 label=label,
                 validate=validate,
-                dap=dap,
             )
         # User wants to add custom curve
         elif x is not None and y is not None and x_name is None and y_name is None:
@@ -337,11 +277,6 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
         color_map_z: str | None = "plasma",
         label: str | None = None,
         validate: bool = True,
-        new: bool = False,
-        row: int | None = None,
-        col: int | None = None,
-        dap: str | None = None,
-        config: dict | None = None,  # TODO make logic more transparent
         **axis_kwargs,
     ) -> BECWaveform:
         """
@@ -360,60 +295,117 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
             color_map_z(str): The color map to use for the z-axis.
             label(str): The label of the curve.
             validate(bool): If True, validate the device names and entries.
-            new(bool): If True, create a new plot instead of using the first plot.
-            row(int): The row coordinate of the widget in the figure. If not provided, the next empty row will be used.
-            col(int): The column coordinate of the widget in the figure. If not provided, the next empty column will be used.
-            dap(str): The DAP model to use for the curve.
-            config(dict): Recreates the whole BECWaveform widget from provided configuration.
             **axis_kwargs: Additional axis properties to set on the widget after creation.
 
         Returns:
             BECWaveform: The waveform plot widget.
         """
-        waveform = self.subplot_factory(
-            widget_type="BECWaveform", config=config, row=row, col=col, new=new, **axis_kwargs
+        waveform = WidgetContainerUtils.find_first_widget_by_class(
+            self._widgets, BECWaveform, can_fail=True
         )
-        if config is not None:
+        if waveform is not None:
+            if axis_kwargs:
+                waveform.set(**axis_kwargs)
+        else:
+            waveform = self.add_plot(**axis_kwargs)
+
+        if x is not None and y is None:
+            if isinstance(x, np.ndarray):
+                if x.ndim == 1:
+                    y = np.arange(x.size)
+                    waveform.add_curve_custom(x=np.arange(x.size), y=x, color=color, label=label)
+                    return waveform
+                if x.ndim == 2:
+                    waveform.add_curve_custom(x=x[:, 0], y=x[:, 1], color=color, label=label)
+                    return waveform
+            elif isinstance(x, list):
+                y = np.arange(len(x))
+                waveform.add_curve_custom(x=np.arange(len(x)), y=x, color=color, label=label)
+                return waveform
+            else:
+                raise ValueError(
+                    "Invalid input. Provide either device names (x_name, y_name) or custom data."
+                )
+        if x is not None and y is not None:
+            waveform.add_curve_custom(x=x, y=y, color=color, label=label)
             return waveform
 
-        # Passing args to init_waveform
-        waveform = self._init_waveform(
-            waveform=waveform,
-            x=x,
-            y=y,
-            x_name=x_name,
-            y_name=y_name,
-            z_name=z_name,
-            x_entry=x_entry,
-            y_entry=y_entry,
-            z_entry=z_entry,
-            color=color,
-            color_map_z=color_map_z,
-            label=label,
-            validate=validate,
-            dap=dap,
-        )
+        # User wants to add scan curve -> 1D Waveform
+        if x_name is not None and y_name is not None and z_name is None and x is None and y is None:
+            waveform.add_curve_scan(
+                x_name=x_name,
+                y_name=y_name,
+                x_entry=x_entry,
+                y_entry=y_entry,
+                color=color,
+                color_map_z="plasma",
+                label=label,
+                validate=validate,
+            )
+        # User wants to add scan curve -> 2D Waveform Scatter
+        elif (
+            x_name is not None
+            and y_name is not None
+            and z_name is not None
+            and x is None
+            and y is None
+        ):
+            waveform.add_curve_scan(
+                x_name=x_name,
+                y_name=y_name,
+                z_name=z_name,
+                x_entry=x_entry,
+                y_entry=y_entry,
+                z_entry=z_entry,
+                color=color,
+                color_map_z=color_map_z,
+                label=label,
+                validate=validate,
+            )
+        # User wants to add custom curve
+        elif (
+            x is not None and y is not None and x_name is None and y_name is None and z_name is None
+        ):
+            waveform.add_curve_custom(x=x, y=y, color=color, label=label)
+        else:
+            raise ValueError(
+                "Invalid input. Provide either device names (x_name, y_name) or custom data."
+            )
         return waveform
 
-    def _init_image(
+    def image(
         self,
-        image,
         monitor: str = None,
         color_bar: Literal["simple", "full"] = "full",
         color_map: str = "magma",
         data: np.ndarray = None,
         vrange: tuple[float, float] = None,
+        **axis_kwargs,
     ) -> BECImageShow:
         """
-        Configure the image based on the provided parameters.
+        Add an image to the figure. Always access the first image widget in the figure.
 
         Args:
-            image (BECImageShow): The image to configure.
-            monitor (str): The name of the monitor to display.
-            color_bar (Literal["simple","full"]): The type of color bar to display.
-            color_map (str): The color map to use for the image.
-            data (np.ndarray): Custom data to display.
+            monitor(str): The name of the monitor to display.
+            color_bar(Literal["simple","full"]): The type of color bar to display.
+            color_map(str): The color map to use for the image.
+            data(np.ndarray): Custom data to display.
+            vrange(tuple[float, float]): The range of values to display.
+            **axis_kwargs: Additional axis properties to set on the widget after creation.
+
+        Returns:
+            BECImageShow: The image widget.
         """
+        image = WidgetContainerUtils.find_first_widget_by_class(
+            self._widgets, BECImageShow, can_fail=True
+        )
+        if image is not None:
+            if axis_kwargs:
+                image.set(**axis_kwargs)
+        else:
+            image = self.add_image(color_bar=color_bar, **axis_kwargs)
+
+        # Setting data #TODO check logic if monitor or data are already created
         if monitor is not None and data is None:
             image.add_monitor_image(
                 monitor=monitor, color_map=color_map, vrange=vrange, color_bar=color_bar
@@ -432,21 +424,20 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
             raise ValueError("Invalid input. Provide either monitor name or custom data.")
         return image
 
-    def image(
+    def add_image(
         self,
         monitor: str = None,
         color_bar: Literal["simple", "full"] = "full",
         color_map: str = "magma",
         data: np.ndarray = None,
         vrange: tuple[float, float] = None,
-        new: bool = False,
-        row: int | None = None,
-        col: int | None = None,
-        config: dict | None = None,
+        row: int = None,
+        col: int = None,
+        config=None,
         **axis_kwargs,
     ) -> BECImageShow:
         """
-        Add an image to the figure. Always access the first image widget in the figure.
+        Add an image to the figure at the specified position.
 
         Args:
             monitor(str): The name of the monitor to display.
@@ -454,125 +445,121 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
             color_map(str): The color map to use for the image.
             data(np.ndarray): Custom data to display.
             vrange(tuple[float, float]): The range of values to display.
-            new(bool): If True, create a new plot instead of using the first plot.
             row(int): The row coordinate of the widget in the figure. If not provided, the next empty row will be used.
             col(int): The column coordinate of the widget in the figure. If not provided, the next empty column will be used.
-            config(dict): Recreates the whole BECImageShow widget from provided configuration.
+            config(dict): Additional configuration for the widget.
             **axis_kwargs: Additional axis properties to set on the widget after creation.
 
         Returns:
             BECImageShow: The image widget.
         """
 
-        image = self.subplot_factory(
-            widget_type="BECImageShow", config=config, row=row, col=col, new=new, **axis_kwargs
+        widget_id = str(uuid.uuid4())
+        if config is None:
+            config = ImageConfig(
+                widget_class="BECImageShow",
+                gui_id=widget_id,
+                parent_id=self.gui_id,
+                color_map=color_map,
+                color_bar=color_bar,
+                vrange=vrange,
+            )
+        image = self.add_widget(
+            widget_type="ImShow",
+            widget_id=widget_id,
+            row=row,
+            col=col,
+            config=config,
+            **axis_kwargs,
         )
-        if config is not None:
-            return image
+        # TODO remove repetition from .image method
+        if monitor is not None and data is None:
+            image.add_monitor_image(
+                monitor=monitor, color_map=color_map, vrange=vrange, color_bar=color_bar
+            )
+        elif data is not None and monitor is None:
+            image.add_custom_image(
+                name="custom", data=data, color_map=color_map, vrange=vrange, color_bar=color_bar
+            )
+        elif data is None and monitor is None:
+            # Setting appearance
+            if vrange is not None:
+                image.set_vrange(vmin=vrange[0], vmax=vrange[1])
+            if color_map is not None:
+                image.set_color_map(color_map)
 
-        image = self._init_image(
-            image=image,
-            monitor=monitor,
-            color_bar=color_bar,
-            color_map=color_map,
-            data=data,
-            vrange=vrange,
-        )
         return image
 
-    def motor_map(
-        self,
-        motor_x: str = None,
-        motor_y: str = None,
-        new: bool = False,
-        row: int | None = None,
-        col: int | None = None,
-        config: dict | None = None,
-        **axis_kwargs,
-    ) -> BECMotorMap:
+    def motor_map(self, motor_x: str = None, motor_y: str = None, **axis_kwargs) -> BECMotorMap:
         """
         Add a motor map to the figure. Always access the first motor map widget in the figure.
 
         Args:
             motor_x(str): The name of the motor for the X axis.
             motor_y(str): The name of the motor for the Y axis.
-            new(bool): If True, create a new plot instead of using the first plot.
-            row(int): The row coordinate of the widget in the figure. If not provided, the next empty row will be used.
-            col(int): The column coordinate of the widget in the figure. If not provided, the next empty column will be used.
-            config(dict): Recreates the whole BECImageShow widget from provided configuration.
             **axis_kwargs: Additional axis properties to set on the widget after creation.
 
         Returns:
             BECMotorMap: The motor map widget.
         """
-        motor_map = self.subplot_factory(
-            widget_type="BECMotorMap", config=config, row=row, col=col, new=new, **axis_kwargs
+        motor_map = WidgetContainerUtils.find_first_widget_by_class(
+            self._widgets, BECMotorMap, can_fail=True
         )
-        if config is not None:
-            return motor_map
+        if motor_map is not None:
+            if axis_kwargs:
+                motor_map.set(**axis_kwargs)
+        else:
+            motor_map = self.add_motor_map(**axis_kwargs)
 
         if motor_x is not None and motor_y is not None:
             motor_map.change_motors(motor_x, motor_y)
 
         return motor_map
 
-    def subplot_factory(
+    def add_motor_map(
         self,
-        widget_type: Literal[
-            "BECPlotBase", "BECWaveform", "BECImageShow", "BECMotorMap"
-        ] = "BECPlotBase",
+        motor_x: str = None,
+        motor_y: str = None,
         row: int = None,
         col: int = None,
         config=None,
-        new: bool = False,
         **axis_kwargs,
-    ) -> BECPlotBase:
-        # Case 1 - config provided, new plot, possible to define coordinates
-        if config is not None:
-            widget_cls = config["widget_class"]
-            if widget_cls != widget_type:
-                raise ValueError(
-                    f"Widget type '{widget_type}' does not match the provided configuration ({widget_cls})."
-                )
-            widget = self.add_widget(
-                widget_type=widget_type, config=config, row=row, col=col, **axis_kwargs
+    ) -> BECMotorMap:
+        """
+
+        Args:
+            motor_x(str): The name of the motor for the X axis.
+            motor_y(str): The name of the motor for the Y axis.
+            row(int): The row coordinate of the widget in the figure. If not provided, the next empty row will be used.
+            col(int): The column coordinate of the widget in the figure. If not provided, the next empty column will be used.
+            config(dict): Additional configuration for the widget.
+            **axis_kwargs:
+
+        Returns:
+            BECMotorMap: The motor map widget.
+        """
+        widget_id = str(uuid.uuid4())
+        if config is None:
+            config = MotorMapConfig(
+                widget_class="BECMotorMap", gui_id=widget_id, parent_id=self.gui_id
             )
-            return widget
+        motor_map = self.add_widget(
+            widget_type="MotorMap",
+            widget_id=widget_id,
+            row=row,
+            col=col,
+            config=config,
+            **axis_kwargs,
+        )
 
-        # Case 2 - find first plot or create first plot if no plot available, no config provided, no coordinates
-        if new is False and (row is None or col is None):
-            widget = WidgetContainerUtils.find_first_widget_by_class(
-                self._widgets, self.subplot_map[widget_type], can_fail=True
-            )
-            if widget is not None:
-                if axis_kwargs:
-                    widget.set(**axis_kwargs)
-            else:
-                widget = self.add_widget(widget_type=widget_type, **axis_kwargs)
-            return widget
+        if motor_x is not None and motor_y is not None:
+            motor_map.change_motors(motor_x, motor_y)
 
-        # Case 3 - modifying existing plot wit coordinates provided
-        if new is False and (row is not None and col is not None):
-            try:
-                widget = self.axes(row, col)
-            except ValueError:
-                widget = None
-            if widget is not None:
-                if axis_kwargs:
-                    widget.set(**axis_kwargs)
-            else:
-                widget = self.add_widget(widget_type=widget_type, row=row, col=col, **axis_kwargs)
-            return widget
-
-        # Case 4 - no previous plot or new plot, no config provided, possible to define coordinates
-        widget = self.add_widget(widget_type=widget_type, row=row, col=col, **axis_kwargs)
-        return widget
+        return motor_map
 
     def add_widget(
         self,
-        widget_type: Literal[
-            "BECPlotBase", "BECWaveform", "BECImageShow", "BECMotorMap"
-        ] = "BECPlotBase",
+        widget_type: Literal["PlotBase", "Waveform1D", "ImShow"] = "PlotBase",
         widget_id: str = None,
         row: int = None,
         col: int = None,
@@ -603,9 +590,6 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
             config=config,
             **axis_kwargs,
         )
-        # has to be changed manually to ensure unique id, if config is copied from existing widget, the id could be
-        # used otherwise multiple times
-        widget.set_gui_id(widget_id)
 
         # Check if position is occupied
         if row is not None and col is not None:
@@ -673,12 +657,6 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
         qdarktheme.setup_theme(theme)
         self.setBackground("k" if theme == "dark" else "w")
         self.config.theme = theme
-        for plot in self.widget_list:
-            plot.set_x_label(plot.plot_item.getAxis("bottom").label.toPlainText())
-            plot.set_y_label(plot.plot_item.getAxis("left").label.toPlainText())
-            if plot.plot_item.titleLabel.text:
-                plot.set_title(plot.plot_item.titleLabel.text)
-            plot.set_legend_label_size()
 
     def _remove_by_coordinates(self, row: int, col: int) -> None:
         """
@@ -709,7 +687,6 @@ class BECFigure(BECConnector, pg.GraphicsLayoutWidget):
             self._reindex_grid()
             if widget_id in self.config.widgets:
                 self.config.widgets.pop(widget_id)
-            widget.deleteLater()
         else:
             raise ValueError(f"Widget with ID '{widget_id}' does not exist.")
 

bec_widgets/widgets/figure/plots/image/image.py

@@ -5,18 +5,14 @@ from typing import Any, Literal, Optional
 
 import numpy as np
 from bec_lib.endpoints import MessageEndpoints
-from pydantic import BaseModel, Field, ValidationError
+from pydantic import Field, ValidationError
 from qtpy.QtCore import QThread
 from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils import EntryValidator
 from bec_widgets.widgets.figure.plots.image.image_item import BECImageItem, ImageItemConfig
-from bec_widgets.widgets.figure.plots.image.image_processor import (
-    ImageProcessor,
-    ImageStats,
-    ProcessorWorker,
-)
+from bec_widgets.widgets.figure.plots.image.image_processor import ImageProcessor, ProcessorWorker
 from bec_widgets.widgets.figure.plots.plot_base import BECPlotBase, SubplotConfig
 
 
@@ -29,15 +25,16 @@ class ImageConfig(SubplotConfig):
 
 class BECImageShow(BECPlotBase):
     USER_ACCESS = [
-        "_rpc_id",
-        "_config_dict",
+        "rpc_id",
+        "config_dict",
         "add_image_by_config",
+        "get_image_config",
+        "get_image_dict",
         "add_monitor_image",
         "add_custom_image",
         "set_vrange",
         "set_color_map",
         "set_autorange",
-        "set_autorange_mode",
         "set_monitor",
         "set_processing",
         "set_image_properties",
@@ -45,6 +42,7 @@ class BECImageShow(BECPlotBase):
         "set_log",
         "set_rotation",
         "set_transpose",
+        "toggle_threading",
         "set",
         "set_title",
         "set_x_label",
@@ -55,6 +53,7 @@ class BECImageShow(BECPlotBase):
         "set_y_lim",
         "set_grid",
         "lock_aspect_ratio",
+        "plot",
         "remove",
         "images",
     ]
@@ -88,7 +87,6 @@ class BECImageShow(BECPlotBase):
         # Connect signals and slots
         thread.started.connect(lambda: worker.process_image(device, image))
         worker.processed.connect(self.update_image)
-        worker.stats.connect(self.update_vrange)
         worker.finished.connect(thread.quit)
         worker.finished.connect(thread.wait)
         worker.finished.connect(worker.deleteLater)
@@ -135,8 +133,7 @@ class BECImageShow(BECPlotBase):
         self.apply_axis_config()
         self._images = defaultdict(dict)
 
-        for image_id, image_config in config.images.items():
-            self.add_image_by_config(image_config)
+        # TODO extend by adding image by config
 
     def change_gui_id(self, new_gui_id: str):
         """
@@ -224,7 +221,7 @@ class BECImageShow(BECPlotBase):
         self,
         monitor: str,
         color_map: Optional[str] = "magma",
-        color_bar: Optional[Literal["simple", "full"]] = "full",
+        color_bar: Optional[Literal["simple", "full"]] = "simple",
         downsample: Optional[bool] = True,
         opacity: Optional[float] = 1.0,
         vrange: Optional[tuple[int, int]] = None,
@@ -239,7 +236,7 @@ class BECImageShow(BECPlotBase):
                 f"Monitor with ID '{monitor}' already exists in widget '{self.gui_id}'."
             )
 
-        # monitor = self.entry_validator.validate_monitor(monitor)
+        monitor = self.entry_validator.validate_monitor(monitor)
 
         image_config = ImageItemConfig(
             widget_class="BECImageItem",
@@ -249,13 +246,12 @@ class BECImageShow(BECPlotBase):
             downsample=downsample,
             opacity=opacity,
             vrange=vrange,
-            source=image_source,
-            monitor=monitor,
             # post_processing=post_processing,
             **kwargs,
         )
 
         image = self._add_image_object(source=image_source, name=monitor, config=image_config)
+        self._connect_device_monitor(monitor)
         return image
 
     def add_custom_image(
@@ -263,17 +259,16 @@ class BECImageShow(BECPlotBase):
         name: str,
         data: Optional[np.ndarray] = None,
         color_map: Optional[str] = "magma",
-        color_bar: Optional[Literal["simple", "full"]] = "full",
+        color_bar: Optional[Literal["simple", "full"]] = "simple",
         downsample: Optional[bool] = True,
         opacity: Optional[float] = 1.0,
         vrange: Optional[tuple[int, int]] = None,
         # post_processing: Optional[PostProcessingConfig] = None,
         **kwargs,
     ):
-        image_source = "custom"
-        # image_source = "device_monitor"
+        image_source = "device_monitor"
 
-        image_exits = self._check_image_id(name, self._images)
+        image_exits = self._check_curve_id(name, self._images)
         if image_exits:
             raise ValueError(f"Monitor with ID '{name}' already exists in widget '{self.gui_id}'.")
 
@@ -290,9 +285,7 @@ class BECImageShow(BECPlotBase):
             **kwargs,
         )
 
-        image = self._add_image_object(
-            source=image_source, name=name, config=image_config, data=data
-        )
+        image = self._add_image_object(source=image_source, config=image_config, data=data)
         return image
 
     def apply_setting_to_images(
@@ -315,7 +308,6 @@ class BECImageShow(BECPlotBase):
             for source, images in self._images.items():
                 for _, image in images.items():
                     getattr(image, setting_method_name)(*args, **kwargs)
-        self.refresh_image()
 
     def set_vrange(self, vmin: float, vmax: float, name: str = None):
         """
@@ -350,17 +342,6 @@ class BECImageShow(BECPlotBase):
         """
         self.apply_setting_to_images("set_autorange", args=[enable], kwargs={}, image_id=name)
 
-    def set_autorange_mode(self, mode: Literal["max", "mean"], name: str = None):
-        """
-        Set the autoscale mode of the image, that decides how the vrange of the color bar is scaled.
-        Choose betwen 'max' -> min/max of the data, 'mean' -> mean +/- fudge_factor*std of the data (fudge_factor~2).
-
-        Args:
-            mode(str): The autoscale mode of the image.
-            name(str): The name of the image. If None, apply to all images.
-        """
-        self.apply_setting_to_images("set_autorange_mode", args=[mode], kwargs={}, image_id=name)
-
     def set_monitor(self, monitor: str, name: str = None):
         """
         Set the monitor of the image.
@@ -463,27 +444,6 @@ class BECImageShow(BECPlotBase):
         if self.use_threading is False and self.thread.isRunning():
             self.cleanup()
 
-    def process_image(self, device: str, image: BECImageItem, data: np.ndarray):
-        """
-        Process the image data.
-
-        Args:
-            device(str): The name of the device - image_id of image.
-            image(np.ndarray): The image data to be processed.
-            data(np.ndarray): The image data to be processed.
-
-        Returns:
-            np.ndarray: The processed image data.
-        """
-        processing_config = image.config.processing
-        self.processor.set_config(processing_config)
-        if self.use_threading:
-            self._create_thread_worker(device, data)
-        else:
-            data = self.processor.process_image(data)
-            self.update_image(device, data)
-            self.update_vrange(device, self.processor.config.stats)
-
     @pyqtSlot(dict)
     def on_image_update(self, msg: dict):
         """
@@ -494,8 +454,14 @@ class BECImageShow(BECPlotBase):
         """
         data = msg["data"]
         device = msg["device"]
-        image = self._images["device_monitor"][device]
-        self.process_image(device, image, data)
+        image_to_update = self._images["device_monitor"][device]
+        processing_config = image_to_update.config.processing
+        self.processor.set_config(processing_config)
+        if self.use_threading:
+            self._create_thread_worker(device, data)
+        else:
+            data = self.processor.process_image(data)
+            self.update_image(device, data)
 
     @pyqtSlot(str, np.ndarray)
     def update_image(self, device: str, data: np.ndarray):
@@ -509,27 +475,6 @@ class BECImageShow(BECPlotBase):
         image_to_update = self._images["device_monitor"][device]
         image_to_update.updateImage(data, autoLevels=image_to_update.config.autorange)
 
-    @pyqtSlot(str, ImageStats)
-    def update_vrange(self, device: str, stats: ImageStats):
-        """
-        Update the scaling of the image.
-
-        Args:
-            stats(ImageStats): The statistics of the image.
-        """
-        image_to_update = self._images["device_monitor"][device]
-        if image_to_update.config.autorange:
-            image_to_update.auto_update_vrange(stats)
-
-    def refresh_image(self):
-        """
-        Refresh the image.
-        """
-        for source, images in self._images.items():
-            for image_id, image in images.items():
-                data = image.get_data()
-                self.process_image(image_id, image, data)
-
     def _connect_device_monitor(self, monitor: str):
         """
         Connect to the device monitor.
@@ -542,18 +487,16 @@ class BECImageShow(BECPlotBase):
             previous_monitor = image_item.config.monitor
         except AttributeError:
             previous_monitor = None
-        if previous_monitor and image_item.connected is True:
-            self.bec_dispatcher.disconnect_slot(
-                self.on_image_update, MessageEndpoints.device_monitor(previous_monitor)
-            )
-            image_item.connected = False
-        if monitor and image_item.connected is False:
-            self.entry_validator.validate_monitor(monitor)
-            self.bec_dispatcher.connect_slot(
-                self.on_image_update, MessageEndpoints.device_monitor(monitor)
-            )
-            image_item.set_monitor(monitor)
-            image_item.connected = True
+        if previous_monitor != monitor:
+            if previous_monitor:
+                self.bec_dispatcher.disconnect_slot(
+                    self.on_image_update, MessageEndpoints.device_monitor(previous_monitor)
+                )
+            if monitor:
+                self.bec_dispatcher.connect_slot(
+                    self.on_image_update, MessageEndpoints.device_monitor(monitor)
+                )
+                image_item.set_monitor(monitor)
 
     def _add_image_object(
         self, source: str, name: str, config: ImageItemConfig, data=None
@@ -562,8 +505,6 @@ class BECImageShow(BECPlotBase):
         image = BECImageItem(config=config, parent_image=self)
         self.plot_item.addItem(image)
         self._images[source][name] = image
-        if source == "device_monitor":
-            self._connect_device_monitor(config.monitor)
         self.config.images[name] = config
         if data is not None:
             image.setImage(data)
@@ -588,6 +529,23 @@ class BECImageShow(BECPlotBase):
                     return True
         return False
 
+    def _validate_monitor(self, monitor: str, validate_bec: bool = True):
+        """
+        Validate the monitor name.
+
+        Args:
+            monitor(str): The name of the monitor.
+            validate_bec(bool): Whether to validate the monitor name with BEC.
+
+        Returns:
+            bool: True if the monitor name is valid, False otherwise.
+        """
+        if not monitor or monitor == "":
+            return False
+        if validate_bec:
+            return monitor in self.dev
+        return True
+
     def cleanup(self):
         """
         Clean up the widget.

bec_widgets/widgets/figure/plots/image/image_item.py

@@ -7,7 +7,7 @@ import pyqtgraph as pg
 from pydantic import Field
 
 from bec_widgets.utils import BECConnector, ConnectionConfig
-from bec_widgets.widgets.figure.plots.image.image_processor import ImageStats, ProcessingConfig
+from bec_widgets.widgets.figure.plots.image.image_processor import ProcessingConfig
 
 if TYPE_CHECKING:
     from bec_widgets.widgets.figure.plots.image.image import BECImageShow
@@ -20,16 +20,13 @@ class ImageItemConfig(ConnectionConfig):
     color_map: Optional[str] = Field("magma", description="The color map of the image.")
     downsample: Optional[bool] = Field(True, description="Whether to downsample the image.")
     opacity: Optional[float] = Field(1.0, description="The opacity of the image.")
-    vrange: Optional[tuple[float | int, float | int]] = Field(
+    vrange: Optional[tuple[int, int]] = Field(
         None, description="The range of the color bar. If None, the range is automatically set."
     )
     color_bar: Optional[Literal["simple", "full"]] = Field(
         "simple", description="The type of the color bar."
     )
     autorange: Optional[bool] = Field(True, description="Whether to autorange the color bar.")
-    autorange_mode: Optional[Literal["max", "mean"]] = Field(
-        "mean", description="Whether to use the mean of the image for autoscaling."
-    )
     processing: ProcessingConfig = Field(
         default_factory=ProcessingConfig, description="The post processing of the image."
     )
@@ -37,8 +34,8 @@ class ImageItemConfig(ConnectionConfig):
 
 class BECImageItem(BECConnector, pg.ImageItem):
     USER_ACCESS = [
-        "_rpc_id",
-        "_config_dict",
+        "rpc_id",
+        "config_dict",
         "set",
         "set_fft",
         "set_log",
@@ -46,7 +43,6 @@ class BECImageItem(BECConnector, pg.ImageItem):
         "set_transpose",
         "set_opacity",
         "set_autorange",
-        "set_autorange_mode",
         "set_color_map",
         "set_auto_downsample",
         "set_monitor",
@@ -78,7 +74,6 @@ class BECImageItem(BECConnector, pg.ImageItem):
         self.apply_config()
         if kwargs:
             self.set(**kwargs)
-        self.connected = False
 
     def apply_config(self):
         """
@@ -106,7 +101,6 @@ class BECImageItem(BECConnector, pg.ImageItem):
             - log
             - rot
             - transpose
-            - autorange_mode
         """
         method_map = {
             "downsample": self.set_auto_downsample,
@@ -118,7 +112,6 @@ class BECImageItem(BECConnector, pg.ImageItem):
             "log": self.set_log,
             "rot": self.set_rotation,
             "transpose": self.set_transpose,
-            "autorange_mode": self.set_autorange_mode,
         }
         for key, value in kwargs.items():
             if key in method_map:
@@ -182,18 +175,9 @@ class BECImageItem(BECConnector, pg.ImageItem):
             autorange(bool): Whether to autorange the color bar.
         """
         self.config.autorange = autorange
-        if self.color_bar and autorange:
+        if self.color_bar is not None:
             self.color_bar.autoHistogramRange()
 
-    def set_autorange_mode(self, mode: Literal["max", "mean"] = "mean"):
-        """
-        Set the autorange mode to scale the vrange of the color bar. Choose between min/max or mean +/- std.
-
-        Args:
-            mode(Literal["max","mean"]): Max for min/max or mean for mean +/- std.
-        """
-        self.config.autorange_mode = mode
-
     def set_color_map(self, cmap: str = "magma"):
         """
         Set the color map of the image.
@@ -228,29 +212,7 @@ class BECImageItem(BECConnector, pg.ImageItem):
         """
         self.config.monitor = monitor
 
-    def auto_update_vrange(self, stats: ImageStats) -> None:
-        """Auto update of the vrange base on the stats of the image.
-
-        Args:
-            stats(ImageStats): The stats of the image.
-        """
-        fumble_factor = 2
-        if self.config.autorange_mode == "mean":
-            vmin = max(stats.mean - fumble_factor * stats.std, 0)
-            vmax = stats.mean + fumble_factor * stats.std
-            self.set_vrange(vmin, vmax, change_autorange=False)
-            return
-        if self.config.autorange_mode == "max":
-            self.set_vrange(max(stats.minimum, 0), stats.maximum, change_autorange=False)
-            return
-
-    def set_vrange(
-        self,
-        vmin: float = None,
-        vmax: float = None,
-        vrange: tuple[float, float] = None,
-        change_autorange: bool = True,
-    ):
+    def set_vrange(self, vmin: float = None, vmax: float = None, vrange: tuple[int, int] = None):
         """
         Set the range of the color bar.
 
@@ -262,13 +224,11 @@ class BECImageItem(BECConnector, pg.ImageItem):
             vmin, vmax = vrange
         self.setLevels([vmin, vmax])
         self.config.vrange = (vmin, vmax)
-        if change_autorange:
-            self.config.autorange = False
+        self.config.autorange = False
         if self.color_bar is not None:
             if self.config.color_bar == "simple":
                 self.color_bar.setLevels(low=vmin, high=vmax)
             elif self.config.color_bar == "full":
-                # pylint: disable=unexpected-keyword-arg
                 self.color_bar.setLevels(min=vmin, max=vmax)
                 self.color_bar.setHistogramRange(vmin - 0.1 * vmin, vmax + 0.1 * vmax)
 

bec_widgets/widgets/figure/plots/image/image_processor.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
 from typing import Optional
 
 import numpy as np
@@ -8,16 +7,6 @@ from pydantic import BaseModel, Field
 from qtpy.QtCore import QObject, Signal, Slot
 
 
-@dataclass
-class ImageStats:
-    """Container to store stats of an image."""
-
-    maximum: float
-    minimum: float
-    mean: float
-    std: float
-
-
 class ProcessingConfig(BaseModel):
     fft: Optional[bool] = Field(False, description="Whether to perform FFT on the monitor data.")
     log: Optional[bool] = Field(False, description="Whether to perform log on the monitor data.")
@@ -30,11 +19,6 @@ class ProcessingConfig(BaseModel):
     rotation: Optional[int] = Field(
         None, description="The rotation angle of the monitor data before displaying."
     )
-    model_config: dict = {"validate_assignment": True}
-    stats: ImageStats = Field(
-        ImageStats(maximum=0, minimum=0, mean=0, std=0),
-        description="The statistics of the image data.",
-    )
 
 
 class ImageProcessor:
@@ -112,18 +96,6 @@ class ImageProcessor:
     # def center_of_mass(self, data: np.ndarray) -> tuple:  # TODO check functionality
     #     return np.unravel_index(np.argmax(data), data.shape)
 
-    def update_image_stats(self, data: np.ndarray) -> None:
-        """Get the statistics of the image data.
-
-        Args:
-            data(np.ndarray): The image data.
-
-        """
-        self.config.stats.maximum = np.max(data)
-        self.config.stats.minimum = np.min(data)
-        self.config.stats.mean = np.mean(data)
-        self.config.stats.std = np.std(data)
-
     def process_image(self, data: np.ndarray) -> np.ndarray:
         """
         Process the data according to the configuration.
@@ -142,7 +114,6 @@ class ImageProcessor:
             data = self.transpose(data)
         if self.config.log:
             data = self.log(data)
-        self.update_image_stats(data)
         return data
 
 
@@ -152,7 +123,6 @@ class ProcessorWorker(QObject):
     """
 
     processed = Signal(str, np.ndarray)
-    stats = Signal(str, ImageStats)
     stopRequested = Signal()
     finished = Signal()
 
@@ -176,7 +146,6 @@ class ProcessorWorker(QObject):
         self._isRunning = False
         if not self._isRunning:
             self.processed.emit(device, processed_image)
-            self.stats.emit(self.processor.config.stats)
             self.finished.emit()
 
     def stop(self):

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

@@ -6,23 +6,22 @@ from typing import Optional, Union
 import numpy as np
 import pyqtgraph as pg
 from bec_lib.endpoints import MessageEndpoints
-from pydantic import Field, ValidationError, field_validator
-from pydantic_core import PydanticCustomError
+from pydantic import Field
 from qtpy import QtCore, QtGui
 from qtpy.QtCore import Signal as pyqtSignal
 from qtpy.QtCore import Slot as pyqtSlot
 from qtpy.QtWidgets import QWidget
 
-from bec_widgets.utils import Colors, EntryValidator
+from bec_widgets.utils import EntryValidator
 from bec_widgets.widgets.figure.plots.plot_base import BECPlotBase, SubplotConfig
 from bec_widgets.widgets.figure.plots.waveform.waveform import Signal, SignalData
 
 
 class MotorMapConfig(SubplotConfig):
     signals: Optional[Signal] = Field(None, description="Signals of the motor map")
-    color: Optional[str | tuple] = Field(
-        (255, 255, 255, 255), description="The color of the last point of current position."
-    )
+    color_map: Optional[str] = Field(
+        "Greys", description="Color scheme of the motor position gradient."
+    )  # TODO decide if useful for anything, or just keep GREYS always
     scatter_size: Optional[int] = Field(5, description="Size of the scatter points.")
     max_points: Optional[int] = Field(1000, description="Maximum number of points to display.")
     num_dim_points: Optional[int] = Field(
@@ -31,26 +30,13 @@ class MotorMapConfig(SubplotConfig):
     )
     precision: Optional[int] = Field(2, description="Decimal precision of the motor position.")
     background_value: Optional[int] = Field(
-        25, description="Background value of the motor map. Has to be between 0 and 255."
-    )
-
-    model_config: dict = {"validate_assignment": True}
-
-    _validate_color = field_validator("color")(Colors.validate_color)
-
-    @field_validator("background_value")
-    def validate_background_value(cls, value):
-        if not 0 <= value <= 255:
-            raise PydanticCustomError(
-                "wrong_value", f"'{value}' hs to be between 0 and 255.", {"wrong_value": value}
-            )
-        return value
+        25, description="Background value of the motor map."
+    )  # TODO can be percentage from 255 calculated
 
 
 class BECMotorMap(BECPlotBase):
     USER_ACCESS = [
-        "_rpc_id",
-        "_config_dict",
+        "config_dict",
         "change_motors",
         "set_max_points",
         "set_precision",
@@ -58,7 +44,6 @@ class BECMotorMap(BECPlotBase):
         "set_background_value",
         "set_scatter_size",
         "get_data",
-        "remove",
     ]
 
     # QT Signals
@@ -82,43 +67,29 @@ class BECMotorMap(BECPlotBase):
         self.get_bec_shortcuts()
         self.entry_validator = EntryValidator(self.dev)
 
-        # connect update signal to update plot
-        self.proxy_update_plot = pg.SignalProxy(
-            self.update_signal, rateLimit=25, slot=self._update_plot
-        )
-        self.apply_config(self.config)
-
-    def apply_config(self, config: dict | MotorMapConfig):
-        """
-        Apply the config to the motor map.
-
-        Args:
-            config(dict|MotorMapConfig): Config to be applied.
-        """
-        if isinstance(config, dict):
-            try:
-                config = MotorMapConfig(**config)
-            except ValidationError as e:
-                print(f"Error in applying config: {e}")
-                return
-
-        self.config = config
-        self.plot_item.clear()
-
         self.motor_x = None
         self.motor_y = None
         self.database_buffer = {"x": [], "y": []}
         self.plot_components = defaultdict(dict)  # container for plot components
 
-        self.apply_axis_config()
+        # connect update signal to update plot
+        self.proxy_update_plot = pg.SignalProxy(
+            self.update_signal, rateLimit=25, slot=self._update_plot
+        )
 
-        if self.config.signals is not None:
-            self.change_motors(
-                motor_x=self.config.signals.x.name,
-                motor_y=self.config.signals.y.name,
-                motor_x_entry=self.config.signals.x.entry,
-                motor_y_entry=self.config.signals.y.entry,
-            )
+    # TODO decide if needed to implement, maybe there will be no children widgets for motormap for now...
+    # def find_widget_by_id(self, item_id: str) -> BECCurve:
+    #     """
+    #     Find the curve by its ID.
+    #     Args:
+    #         item_id(str): ID of the curve.
+    #
+    #     Returns:
+    #         BECCurve: The curve object.
+    #     """
+    #     for curve in self.plot_item.curves:
+    #         if curve.gui_id == item_id:
+    #             return curve
 
     @pyqtSlot(str, str, str, str, bool)
     def change_motors(
@@ -156,8 +127,6 @@ class BECMotorMap(BECPlotBase):
         # reconnect the signals
         self._connect_motor_to_slots()
 
-        self.database_buffer = {"x": [], "y": []}
-
         # Redraw the motor map
         self._make_motor_map()
 
@@ -170,19 +139,7 @@ class BECMotorMap(BECPlotBase):
         data = {"x": self.database_buffer["x"], "y": self.database_buffer["y"]}
         return data
 
-    def set_color(self, color: [str | tuple]):
-        """
-        Set color of the motor trace.
-
-        Args:
-            color(str|tuple): Color of the motor trace. Can be HEX(str) or RGBA(tuple).
-        """
-        if isinstance(color, str):
-            color = Colors.validate_color(color)
-            color = Colors.hex_to_rgba(color, 255)
-        self.config.color = color
-        self.update_signal.emit()
-
+    # TODO setup all visual properties
     def set_max_points(self, max_points: int) -> None:
         """
         Set the maximum number of points to display.
@@ -191,7 +148,6 @@ class BECMotorMap(BECPlotBase):
             max_points(int): Maximum number of points to display.
         """
         self.config.max_points = max_points
-        self.update_signal.emit()
 
     def set_precision(self, precision: int) -> None:
         """
@@ -201,7 +157,6 @@ class BECMotorMap(BECPlotBase):
             precision(int): Decimal precision of the motor position.
         """
         self.config.precision = precision
-        self.update_signal.emit()
 
     def set_num_dim_points(self, num_dim_points: int) -> None:
         """
@@ -211,7 +166,6 @@ class BECMotorMap(BECPlotBase):
             num_dim_points(int): Number of dim points.
         """
         self.config.num_dim_points = num_dim_points
-        self.update_signal.emit()
 
     def set_background_value(self, background_value: int) -> None:
         """
@@ -221,7 +175,6 @@ class BECMotorMap(BECPlotBase):
             background_value(int): Background value of the motor map.
         """
         self.config.background_value = background_value
-        self._swap_limit_map()
 
     def set_scatter_size(self, scatter_size: int) -> None:
         """
@@ -231,7 +184,6 @@ class BECMotorMap(BECPlotBase):
             scatter_size(int): Size of the scatter points.
         """
         self.config.scatter_size = scatter_size
-        self.update_signal.emit()
 
     def _disconnect_current_motors(self):
         """Disconnect the current motors from the slots."""
@@ -256,15 +208,6 @@ class BECMotorMap(BECPlotBase):
 
         self.bec_dispatcher.connect_slot(self.on_device_readback, endpoints)
 
-    def _swap_limit_map(self):
-        """Swap the limit map."""
-        self.plot_item.removeItem(self.plot_components["limit_map"])
-        self.plot_components["limit_map"] = self._make_limit_map(
-            self.config.signals.x.limits, self.config.signals.y.limits
-        )
-        self.plot_components["limit_map"].setZValue(-1)
-        self.plot_item.addItem(self.plot_components["limit_map"])
-
     def _make_motor_map(self):
         """
         Create the motor map plot.
@@ -304,8 +247,6 @@ class BECMotorMap(BECPlotBase):
         # Set default labels for the plot
         self.set(x_label=f"Motor X ({self.motor_x})", y_label=f"Motor Y ({self.motor_y})")
 
-        self.update_signal.emit()
-
     def _add_coordinantes_crosshair(self, x: float, y: float) -> None:
         """
         Add crosshair to the plot to highlight the current position.
@@ -376,7 +317,7 @@ class BECMotorMap(BECPlotBase):
         Returns:
             float: Motor initial position.
         """
-        init_position = round(float(self.dev[name].read()[entry]["value"]), precision)
+        init_position = round(self.dev[name].read()[entry]["value"], precision)
         return init_position
 
     def _validate_signal_entries(
@@ -430,31 +371,19 @@ class BECMotorMap(BECPlotBase):
 
     def _update_plot(self):
         """Update the motor map plot."""
-        # If the number of points exceeds max_points, delete the oldest points
-        if len(self.database_buffer["x"]) > self.config.max_points:
-            self.database_buffer["x"] = self.database_buffer["x"][-self.config.max_points :]
-            self.database_buffer["y"] = self.database_buffer["y"][-self.config.max_points :]
-
         x = self.database_buffer["x"]
         y = self.database_buffer["y"]
 
         # Setup gradient brush for history
         brushes = [pg.mkBrush(50, 50, 50, 255)] * len(x)
 
-        # RGB color
-        r, g, b, a = self.config.color
-
         # Calculate the decrement step based on self.num_dim_points
         num_dim_points = self.config.num_dim_points
         decrement_step = (255 - 50) / num_dim_points
-
         for i in range(1, min(num_dim_points + 1, len(x) + 1)):
             brightness = max(60, 255 - decrement_step * (i - 1))
-            dim_r = int(r * (brightness / 255))
-            dim_g = int(g * (brightness / 255))
-            dim_b = int(b * (brightness / 255))
-            brushes[-i] = pg.mkBrush(dim_r, dim_g, dim_b, a)
-        brushes[-1] = pg.mkBrush(r, g, b, a)  # Newest point is always full brightness
+            brushes[-i] = pg.mkBrush(brightness, brightness, brightness, 255)
+        brushes[-1] = pg.mkBrush(255, 255, 255, 255)  # Newest point is always full brightness
         scatter_size = self.config.scatter_size
 
         # Update the scatter plot
@@ -474,7 +403,7 @@ class BECMotorMap(BECPlotBase):
         # Update plot title
         precision = self.config.precision
         self.set_title(
-            f"Motor position: ({round(float(current_x),precision)}, {round(float(current_y),precision)})"
+            f"Motor position: ({round(current_x,precision)}, {round(current_y,precision)})"
         )
 
     @pyqtSlot(dict)

bec_widgets/widgets/figure/plots/plot_base.py

@@ -5,8 +5,6 @@ from typing import Literal, Optional
 import numpy as np
 import pyqtgraph as pg
 from pydantic import BaseModel, Field
-from qtpy import QT_VERSION
-from qtpy.QtGui import QFont, QFontDatabase, QFontInfo
 from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils import BECConnector, ConnectionConfig
@@ -14,21 +12,14 @@ from bec_widgets.utils import BECConnector, ConnectionConfig
 
 class AxisConfig(BaseModel):
     title: Optional[str] = Field(None, description="The title of the axes.")
-    title_size: Optional[int] = Field(None, description="The font size of the title.")
     x_label: Optional[str] = Field(None, description="The label for the x-axis.")
-    x_label_size: Optional[int] = Field(None, description="The font size of the x-axis label.")
     y_label: Optional[str] = Field(None, description="The label for the y-axis.")
-    y_label_size: Optional[int] = Field(None, description="The font size of the y-axis label.")
-    legend_label_size: Optional[int] = Field(
-        None, description="The font size of the legend labels."
-    )
     x_scale: Literal["linear", "log"] = Field("linear", description="The scale of the x-axis.")
     y_scale: Literal["linear", "log"] = Field("linear", description="The scale of the y-axis.")
     x_lim: Optional[tuple] = Field(None, description="The limits of the x-axis.")
     y_lim: Optional[tuple] = Field(None, description="The limits of the y-axis.")
     x_grid: bool = Field(False, description="Show grid on the x-axis.")
     y_grid: bool = Field(False, description="Show grid on the y-axis.")
-    model_config: dict = {"validate_assignment": True}
 
 
 class SubplotConfig(ConnectionConfig):
@@ -46,7 +37,7 @@ class SubplotConfig(ConnectionConfig):
 
 class BECPlotBase(BECConnector, pg.GraphicsLayout):
     USER_ACCESS = [
-        "_config_dict",
+        "config_dict",
         "set",
         "set_title",
         "set_x_label",
@@ -57,8 +48,8 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
         "set_y_lim",
         "set_grid",
         "lock_aspect_ratio",
+        "plot",
         "remove",
-        "set_legend_label_size",
     ]
 
     def __init__(
@@ -94,7 +85,6 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
             - y_scale: Literal["linear", "log"]
             - x_lim: tuple
             - y_lim: tuple
-            - legend_label_size: int
         """
         # Mapping of keywords to setter methods
         method_map = {
@@ -105,7 +95,6 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
             "y_scale": self.set_y_scale,
             "x_lim": self.set_x_lim,
             "y_lim": self.set_y_lim,
-            "legend_label_size": self.set_legend_label_size,
         }
         for key, value in kwargs.items():
             if key in method_map:
@@ -127,79 +116,34 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
 
         self.set(**{k: v for k, v in config_mappings.items() if v is not None})
 
-    def set_legend_label_size(self, size: int = None):
-        """
-        Set the font size of the legend.
-
-        Args:
-            size(int): Font size of the legend.
-        """
-        if not self.plot_item.legend:
-            return
-        if self.config.axis.legend_label_size or size:
-            if size:
-                self.config.axis.legend_label_size = size
-                scale = (
-                    size / 9
-                )  # 9 is the default font size of the legend, so we always scale it against 9
-                self.plot_item.legend.setScale(scale)
-
-    def get_text_color(self):
-        return "#FFF" if self.figure.config.theme == "dark" else "#000"
-
-    def set_title(self, title: str, size: int = None):
+    def set_title(self, title: str):
         """
         Set the title of the plot widget.
 
         Args:
             title(str): Title of the plot widget.
-            size(int): Font size of the title.
         """
-        if self.config.axis.title_size or size:
-            if size:
-                self.config.axis.title_size = size
-            style = {"color": self.get_text_color(), "size": f"{self.config.axis.title_size}pt"}
-        else:
-            style = {}
-        self.plot_item.setTitle(title, **style)
+        self.plot_item.setTitle(title)
         self.config.axis.title = title
 
-    def set_x_label(self, label: str, size: int = None):
+    def set_x_label(self, label: str):
         """
         Set the label of the x-axis.
 
         Args:
             label(str): Label of the x-axis.
-            size(int): Font size of the label.
         """
-        if self.config.axis.x_label_size or size:
-            if size:
-                self.config.axis.x_label_size = size
-            style = {
-                "color": self.get_text_color(),
-                "font-size": f"{self.config.axis.x_label_size}pt",
-            }
-        else:
-            style = {}
-        self.plot_item.setLabel("bottom", label, **style)
+        self.plot_item.setLabel("bottom", label)
         self.config.axis.x_label = label
 
-    def set_y_label(self, label: str, size: int = None):
+    def set_y_label(self, label: str):
         """
         Set the label of the y-axis.
 
         Args:
             label(str): Label of the y-axis.
-            size(int): Font size of the label.
         """
-        if self.config.axis.y_label_size or size:
-            if size:
-                self.config.axis.y_label_size = size
-            color = self.get_text_color()
-            style = {"color": color, "font-size": f"{self.config.axis.y_label_size}pt"}
-        else:
-            style = {}
-        self.plot_item.setLabel("left", label, **style)
+        self.plot_item.setLabel("left", label)
         self.config.axis.y_label = label
 
     def set_x_scale(self, scale: Literal["linear", "log"] = "linear"):
@@ -293,6 +237,19 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
         """
         self.plot_item.setAspectLocked(lock)
 
+    def plot(self, data_x: list | np.ndarray, data_y: list | np.ndarray, **kwargs):
+        """
+        Plot custom data on the plot widget. These data are not saved in config.
+
+        Args:
+            data_x(list|np.ndarray): x-axis data
+            data_y(list|np.ndarray): y-axis data
+            **kwargs: Keyword arguments for the plot.
+        """
+        # TODO very basic so far, add more options
+        # TODO decide name of the method
+        self.plot_item.plot(data_x, data_y, **kwargs)
+
     def remove(self):
         """Remove the plot widget from the figure."""
         if self.figure is not None:

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

@@ -1,12 +1,10 @@
 from __future__ import annotations
 
-import time
 from collections import defaultdict
 from typing import Any, Literal, Optional
 
 import numpy as np
 import pyqtgraph as pg
-from bec_lib import messages
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.scan_data import ScanData
 from pydantic import Field, ValidationError
@@ -35,15 +33,16 @@ class Waveform1DConfig(SubplotConfig):
 
 class BECWaveform(BECPlotBase):
     USER_ACCESS = [
-        "_rpc_id",
-        "_config_dict",
-        "plot",
-        "add_dap",
-        "get_dap_params",
+        "rpc_id",
+        "config_dict",
+        "add_curve_scan",
+        "add_curve_custom",
         "remove_curve",
         "scan_history",
         "curves",
         "get_curve",
+        "get_curve_config",
+        "apply_config",
         "get_all_data",
         "set",
         "set_title",
@@ -55,11 +54,10 @@ class BECWaveform(BECPlotBase):
         "set_y_lim",
         "set_grid",
         "lock_aspect_ratio",
+        "plot",
         "remove",
-        "set_legend_label_size",
     ]
     scan_signal_update = pyqtSignal()
-    dap_params_update = pyqtSignal(dict)
 
     def __init__(
         self,
@@ -76,7 +74,6 @@ class BECWaveform(BECPlotBase):
         )
 
         self._curves_data = defaultdict(dict)
-        self.old_scan_id = None
         self.scan_id = None
 
         # Scan segment update proxy
@@ -84,9 +81,6 @@ class BECWaveform(BECPlotBase):
             self.scan_signal_update, rateLimit=25, slot=self._update_scan_segment_plot
         )
 
-        self.proxy_update_dap = pg.SignalProxy(
-            self.scan_signal_update, rateLimit=25, slot=self.refresh_dap
-        )
         # Get bec shortcuts dev, scans, queue, scan_storage, dap
         self.get_bec_shortcuts()
 
@@ -206,68 +200,12 @@ class BECWaveform(BECPlotBase):
         else:
             raise ValueError("Identifier must be either an integer (index) or a string (curve_id).")
 
-    def plot(
-        self,
-        x: list | np.ndarray | None = None,
-        y: list | np.ndarray | None = None,
-        x_name: str | None = None,
-        y_name: str | None = None,
-        z_name: str | None = None,
-        x_entry: str | None = None,
-        y_entry: str | None = None,
-        z_entry: str | None = None,
-        color: str | None = None,
-        color_map_z: str | None = "plasma",
-        label: str | None = None,
-        validate: bool = True,
-        dap: str | None = None,  # TODO add dap custom curve wrapper
-    ) -> BECCurve:
-        """
-        Plot a curve to the plot widget.
-        Args:
-            x(list | np.ndarray): Custom x data to plot.
-            y(list | np.ndarray): Custom y data to plot.
-            x_name(str): The name of the device for the x-axis.
-            y_name(str): The name of the device for the y-axis.
-            z_name(str): The name of the device for the z-axis.
-            x_entry(str): The name of the entry for the x-axis.
-            y_entry(str): The name of the entry for the y-axis.
-            z_entry(str): The name of the entry for the z-axis.
-            color(str): The color of the curve.
-            color_map_z(str): The color map to use for the z-axis.
-            label(str): The label of the curve.
-            validate(bool): If True, validate the device names and entries.
-            dap(str): The dap model to use for the curve. If not specified, none will be added.
-
-        Returns:
-            BECCurve: The curve object.
-        """
-
-        if x is not None and y is not None:
-            return self.add_curve_custom(x=x, y=y, label=label, color=color)
-        else:
-            if dap:
-                self.add_dap(x_name=x_name, y_name=y_name, dap=dap)
-            return self.add_curve_scan(
-                x_name=x_name,
-                y_name=y_name,
-                z_name=z_name,
-                x_entry=x_entry,
-                y_entry=y_entry,
-                z_entry=z_entry,
-                color=color,
-                color_map_z=color_map_z,
-                label=label,
-                validate_bec=validate,
-            )
-
     def add_curve_custom(
         self,
         x: list | np.ndarray,
         y: list | np.ndarray,
         label: str = None,
         color: str = None,
-        curve_source: str = "custom",
         **kwargs,
     ) -> BECCurve:
         """
@@ -278,13 +216,12 @@ class BECWaveform(BECPlotBase):
             y(list|np.ndarray): Y data of the curve.
             label(str, optional): Label of the curve. Defaults to None.
             color(str, optional): Color of the curve. Defaults to None.
-            curve_source(str, optional): Tag for source of the curve. Defaults to "custom".
             **kwargs: Additional keyword arguments for the curve configuration.
 
         Returns:
             BECCurve: The curve object.
         """
-        curve_source = curve_source
+        curve_source = "custom"
         curve_id = label or f"Curve {len(self.plot_item.curves) + 1}"
 
         curve_exits = self._check_curve_id(curve_id, self._curves_data)
@@ -315,6 +252,33 @@ class BECWaveform(BECPlotBase):
         )
         return curve
 
+    def _add_curve_object(
+        self,
+        name: str,
+        source: str,
+        config: CurveConfig,
+        data: tuple[list | np.ndarray, list | np.ndarray] = None,
+    ) -> BECCurve:
+        """
+        Add a curve object to the plot widget.
+
+        Args:
+            name(str): ID of the curve.
+            source(str): Source of the curve.
+            config(CurveConfig): Configuration of the curve.
+            data(tuple[list|np.ndarray,list|np.ndarray], optional): Data (x,y) to be plotted. Defaults to None.
+
+        Returns:
+            BECCurve: The curve object.
+        """
+        curve = BECCurve(config=config, name=name, parent_item=self.plot_item)
+        self._curves_data[source][name] = curve
+        self.plot_item.addItem(curve)
+        self.config.curves[name] = curve.config
+        if data is not None:
+            curve.setData(data[0], data[1])
+        return curve
+
     def add_curve_scan(
         self,
         x_name: str,
@@ -327,12 +291,10 @@ class BECWaveform(BECPlotBase):
         color_map_z: Optional[str] = "plasma",
         label: Optional[str] = None,
         validate_bec: bool = True,
-        source: str = "scan_segment",
-        dap: Optional[str] = None,
         **kwargs,
     ) -> BECCurve:
         """
-        Add a curve to the plot widget from the scan segment. #TODO adapt docs to DAP
+        Add a curve to the plot widget from the scan segment.
 
         Args:
             x_name(str): Name of the x signal.
@@ -350,7 +312,7 @@ class BECWaveform(BECPlotBase):
             BECCurve: The curve object.
         """
         # Check if curve already exists
-        curve_source = source
+        curve_source = "scan_segment"
 
         # Get entry if not provided and validate
         x_entry, y_entry, z_entry = self._validate_signal_entries(
@@ -379,109 +341,19 @@ class BECWaveform(BECPlotBase):
             parent_id=self.gui_id,
             label=label,
             color=color,
-            color_map_z=color_map_z,
+            color_map=color_map_z,
             source=curve_source,
             signals=Signal(
                 source=curve_source,
                 x=SignalData(name=x_name, entry=x_entry),
                 y=SignalData(name=y_name, entry=y_entry),
                 z=SignalData(name=z_name, entry=z_entry) if z_name else None,
-                dap=dap,
             ),
             **kwargs,
         )
         curve = self._add_curve_object(name=label, source=curve_source, config=curve_config)
         return curve
 
-    def add_dap(
-        self,
-        x_name: str,
-        y_name: str,
-        x_entry: Optional[str] = None,
-        y_entry: Optional[str] = None,
-        color: Optional[str] = None,
-        dap: str = "GaussianModel",
-        **kwargs,
-    ) -> BECCurve:
-        """
-        Add LMFIT dap model curve to the plot widget.
-
-        Args:
-            x_name(str): Name of the x signal.
-            x_entry(str): Entry of the x signal.
-            y_name(str): Name of the y signal.
-            y_entry(str): Entry of the y signal.
-            color(str, optional): Color of the curve. Defaults to None.
-            color_map_z(str): The color map to use for the z-axis.
-            label(str, optional): Label of the curve. Defaults to None.
-            dap(str): The dap model to use for the curve.
-            **kwargs: Additional keyword arguments for the curve configuration.
-
-        Returns:
-            BECCurve: The curve object.
-        """
-        x_entry, y_entry, _ = self._validate_signal_entries(
-            x_name, y_name, None, x_entry, y_entry, None
-        )
-        label = f"{y_name}-{y_entry}-{dap}"
-        curve = self.add_curve_scan(
-            x_name=x_name,
-            y_name=y_name,
-            x_entry=x_entry,
-            y_entry=y_entry,
-            color=color,
-            label=label,
-            source="DAP",
-            dap=dap,
-            pen_style="dash",
-            symbol="star",
-            **kwargs,
-        )
-
-        self.setup_dap(self.old_scan_id, self.scan_id)
-        self.refresh_dap()
-        return curve
-
-    def get_dap_params(self) -> dict:
-        """
-        Get the DAP parameters of all DAP curves.
-
-        Returns:
-            dict: DAP parameters of all DAP curves.
-        """
-        params = {}
-        for curve_id, curve in self._curves_data["DAP"].items():
-            params[curve_id] = curve.dap_params
-        return params
-
-    def _add_curve_object(
-        self,
-        name: str,
-        source: str,
-        config: CurveConfig,
-        data: tuple[list | np.ndarray, list | np.ndarray] = None,
-    ) -> BECCurve:
-        """
-        Add a curve object to the plot widget.
-
-        Args:
-            name(str): ID of the curve.
-            source(str): Source of the curve.
-            config(CurveConfig): Configuration of the curve.
-            data(tuple[list|np.ndarray,list|np.ndarray], optional): Data (x,y) to be plotted. Defaults to None.
-
-        Returns:
-            BECCurve: The curve object.
-        """
-        curve = BECCurve(config=config, name=name, parent_item=self)
-        self._curves_data[source][name] = curve
-        self.plot_item.addItem(curve)
-        self.config.curves[name] = curve.config
-        if data is not None:
-            curve.setData(data[0], data[1])
-        self.set_legend_label_size()
-        return curve
-
     def _validate_signal_entries(
         self,
         x_name: str,
@@ -605,75 +477,13 @@ class BECWaveform(BECPlotBase):
             return
 
         if current_scan_id != self.scan_id:
-            self.old_scan_id = self.scan_id
             self.scan_id = current_scan_id
             self.scan_segment_data = self.queue.scan_storage.find_scan_by_ID(
                 self.scan_id
             )  # TODO do scan access through BECFigure
-            self.setup_dap(self.old_scan_id, self.scan_id)
 
         self.scan_signal_update.emit()
 
-    def setup_dap(self, old_scan_id, new_scan_id):
-        """
-        Setup DAP for the new scan.
-
-        Args:
-            old_scan_id(str): old_scan_id, used to disconnect the previous dispatcher connection.
-            new_scan_id(str): new_scan_id, used to connect the new dispatcher connection.
-
-        """
-        self.bec_dispatcher.disconnect_slot(
-            self.update_dap, MessageEndpoints.dap_response(old_scan_id)
-        )
-        if len(self._curves_data["DAP"]) > 0:
-            self.bec_dispatcher.connect_slot(
-                self.update_dap, MessageEndpoints.dap_response(new_scan_id)
-            )
-
-    def refresh_dap(self):
-        """
-        Refresh the DAP curves with the latest data from the DAP model MessageEndpoints.dap_response().
-        """
-        for curve_id, curve in self._curves_data["DAP"].items():
-            x_name = curve.config.signals.x.name
-            y_name = curve.config.signals.y.name
-            x_entry = curve.config.signals.x.entry
-            y_entry = curve.config.signals.y.entry
-            model_name = curve.config.signals.dap
-            model = getattr(self.dap, model_name)
-
-            msg = messages.DAPRequestMessage(
-                dap_cls="LmfitService1D",
-                dap_type="on_demand",
-                config={
-                    "args": [self.scan_id, x_name, x_entry, y_name, y_entry],
-                    "kwargs": {},
-                    "class_args": model._plugin_info["class_args"],
-                    "class_kwargs": model._plugin_info["class_kwargs"],
-                },
-                metadata={"RID": self.scan_id},
-            )
-            self.client.connector.set_and_publish(MessageEndpoints.dap_request(), msg)
-
-    @pyqtSlot(dict, dict)
-    def update_dap(self, msg, metadata):
-        self.msg = msg
-        scan_id, x_name, x_entry, y_name, y_entry = msg["dap_request"].content["config"]["args"]
-        model = msg["dap_request"].content["config"]["class_kwargs"]["model"]
-
-        curve_id_request = f"{y_name}-{y_entry}-{model}"
-
-        for curve_id, curve in self._curves_data["DAP"].items():
-            if curve_id == curve_id_request:
-                if msg["data"] is not None:
-                    x = msg["data"][0]["x"]
-                    y = msg["data"][0]["y"]
-                    curve.setData(x, y)
-                    curve.dap_params = msg["data"][1]["fit_parameters"]
-                    self.dap_params_update.emit(curve.dap_params)
-                break
-
     def _update_scan_segment_plot(self):
         """Update the plot with the data from the scan segment."""
         data = self.scan_segment_data.data
@@ -703,15 +513,14 @@ class BECWaveform(BECPlotBase):
                 data_y = data[y_name][y_entry].val
                 if curve.config.signals.z:
                     data_z = data[z_name][z_entry].val
-                    color_z = self._make_z_gradient(data_z, curve.config.color_map_z)
+                    color_z = self._make_z_gradient(
+                        data_z, curve.config.colormap
+                    )  # TODO decide how to implement custom gradient
             except TypeError:
                 continue
 
             if data_z is not None and color_z is not None:
-                try:
-                    curve.setData(x=data_x, y=data_y, symbolBrush=color_z)
-                except:
-                    return
+                curve.setData(x=data_x, y=data_y, symbolBrush=color_z)
             else:
                 curve.setData(data_x, data_y)
 
@@ -749,17 +558,13 @@ class BECWaveform(BECPlotBase):
         if scan_index is not None and scan_id is not None:
             raise ValueError("Only one of scan_id or scan_index can be provided.")
 
-        # Reset DAP connector
-        self.bec_dispatcher.disconnect_slot(
-            self.update_dap, MessageEndpoints.dap_response(self.scan_id)
-        )
         if scan_index is not None:
             self.scan_id = self.queue.scan_storage.storage[scan_index].scan_id
+            data = self.queue.scan_storage.find_scan_by_ID(self.scan_id).data
         elif scan_id is not None:
             self.scan_id = scan_id
+            data = self.queue.scan_storage.find_scan_by_ID(self.scan_id).data
 
-        self.setup_dap(self.old_scan_id, self.scan_id)
-        data = self.queue.scan_storage.find_scan_by_ID(self.scan_id).data
         self._update_scan_curves(data)
 
     def get_all_data(self, output: Literal["dict", "pandas"] = "dict") -> dict | pd.DataFrame:
@@ -772,6 +577,7 @@ class BECWaveform(BECPlotBase):
         Returns:
             dict | pd.DataFrame: Data of all curves in the specified format.
         """
+
         data = {}
         try:
             import pandas as pd
@@ -805,9 +611,6 @@ class BECWaveform(BECPlotBase):
     def cleanup(self):
         """Cleanup the widget connection from BECDispatcher."""
         self.bec_dispatcher.disconnect_slot(self.on_scan_segment, MessageEndpoints.scan_segment())
-        self.bec_dispatcher.disconnect_slot(
-            self.update_dap, MessageEndpoints.dap_response(self.scan_id)
-        )
         for curve in self.curves:
             curve.cleanup()
         super().cleanup()

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

@@ -1,16 +1,12 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Literal, Optional
+from typing import Any, Literal, Optional
 
 import pyqtgraph as pg
-from pydantic import BaseModel, Field, field_validator
-from pydantic_core import PydanticCustomError
+from pydantic import BaseModel, Field
 from qtpy import QtCore
 
-from bec_widgets.utils import BECConnector, Colors, ConnectionConfig
-
-if TYPE_CHECKING:
-    from bec_widgets.widgets.figure.plots.waveform import BECWaveform1D
+from bec_widgets.utils import BECConnector, ConnectionConfig
 
 
 class SignalData(BaseModel):
@@ -21,7 +17,6 @@ class SignalData(BaseModel):
     unit: Optional[str] = None  # todo implement later
     modifier: Optional[str] = None  # todo implement later
     limits: Optional[list[float]] = None  # todo implement later
-    model_config: dict = {"validate_assignment": True}
 
 
 class Signal(BaseModel):
@@ -31,18 +26,14 @@ class Signal(BaseModel):
     x: SignalData  # TODO maybe add metadata for config gui later
     y: SignalData
     z: Optional[SignalData] = None
-    dap: Optional[str] = None
-    model_config: dict = {"validate_assignment": True}
 
 
 class CurveConfig(ConnectionConfig):
     parent_id: Optional[str] = Field(None, description="The parent plot of the curve.")
     label: Optional[str] = Field(None, description="The label of the curve.")
-    color: Optional[str | tuple] = Field(None, description="The color of the curve.")
+    color: Optional[Any] = Field(None, description="The color of the curve.")
     symbol: Optional[str] = Field("o", description="The symbol of the curve.")
-    symbol_color: Optional[str | tuple] = Field(
-        None, description="The color of the symbol of the curve."
-    )
+    symbol_color: Optional[str] = Field(None, description="The color of the symbol of the curve.")
     symbol_size: Optional[int] = Field(5, description="The size of the symbol of the curve.")
     pen_width: Optional[int] = Field(2, description="The width of the pen of the curve.")
     pen_style: Optional[Literal["solid", "dash", "dot", "dashdot"]] = Field(
@@ -50,34 +41,24 @@ class CurveConfig(ConnectionConfig):
     )
     source: Optional[str] = Field(None, description="The source of the curve.")
     signals: Optional[Signal] = Field(None, description="The signal of the curve.")
-    color_map_z: Optional[str] = Field(
-        "plasma", description="The colormap of the curves z gradient.", validate_default=True
-    )
-
-    model_config: dict = {"validate_assignment": True}
-
-    _validate_color_map_z = field_validator("color_map_z")(Colors.validate_color_map)
-    _validate_color = field_validator("color")(Colors.validate_color)
-    _validate_symbol_color = field_validator("symbol_color")(Colors.validate_color)
+    colormap: Optional[str] = Field("plasma", description="The colormap of the curves z gradient.")
 
 
 class BECCurve(BECConnector, pg.PlotDataItem):
     USER_ACCESS = [
         "remove",
-        "dap_params",
-        "_rpc_id",
-        "_config_dict",
+        "rpc_id",
+        "config_dict",
         "set",
         "set_data",
         "set_color",
-        "set_color_map_z",
+        "set_colormap",
         "set_symbol",
         "set_symbol_color",
         "set_symbol_size",
         "set_pen_width",
         "set_pen_style",
         "get_data",
-        "dap_params",
     ]
 
     def __init__(
@@ -85,7 +66,7 @@ class BECCurve(BECConnector, pg.PlotDataItem):
         name: Optional[str] = None,
         config: Optional[CurveConfig] = None,
         gui_id: Optional[str] = None,
-        parent_item: Optional[BECWaveform1D] = None,
+        parent_item: Optional[pg.PlotItem] = None,
         **kwargs,
     ):
         if config is None:
@@ -99,7 +80,6 @@ class BECCurve(BECConnector, pg.PlotDataItem):
 
         self.parent_item = parent_item
         self.apply_config()
-        self.dap_params = None
         if kwargs:
             self.set(**kwargs)
 
@@ -123,14 +103,6 @@ class BECCurve(BECConnector, pg.PlotDataItem):
             self.setSymbolSize(self.config.symbol_size)
             self.setSymbol(self.config.symbol)
 
-    @property
-    def dap_params(self):
-        return self._dap_params
-
-    @dap_params.setter
-    def dap_params(self, value):
-        self._dap_params = value
-
     def set_data(self, x, y):
         if self.config.source == "custom":
             self.setData(x, y)
@@ -156,7 +128,7 @@ class BECCurve(BECConnector, pg.PlotDataItem):
         # Mapping of keywords to setter methods
         method_map = {
             "color": self.set_color,
-            "color_map_z": self.set_color_map_z,
+            "colormap": self.set_colormap,
             "symbol": self.set_symbol,
             "symbol_color": self.set_symbol_color,
             "symbol_size": self.set_symbol_size,
@@ -231,16 +203,14 @@ class BECCurve(BECConnector, pg.PlotDataItem):
         self.config.pen_style = pen_style
         self.apply_config()
 
-    def set_color_map_z(self, colormap: str):
+    def set_colormap(self, colormap: str):
         """
         Set the colormap for the scatter plot z gradient.
 
         Args:
             colormap(str): Colormap for the scatter plot.
         """
-        self.config.color_map_z = colormap
-        self.apply_config()
-        self.parent_item.scan_history(-1)
+        self.config.colormap = colormap
 
     def get_data(self) -> tuple[np.ndarray, np.ndarray]:
         """
@@ -253,6 +223,5 @@ class BECCurve(BECConnector, pg.PlotDataItem):
 
     def remove(self):
         """Remove the curve from the plot."""
-        # self.parent_item.removeItem(self)
-        self.parent_item.remove_curve(self.name())
+        self.parent_item.removeItem(self)
         self.cleanup()

bec_widgets/widgets/jupyter_console/jupyter_console.py

@@ -1,72 +0,0 @@
-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/movement_absolute/movement_absolute.py

@@ -1,12 +1,12 @@
 import os
 
+from qtpy.QtWidgets import QWidget
 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.utils import UILoader
-from bec_widgets.widgets.motor_control.motor_control import MotorControlErrors, MotorControlWidget
+from bec_widgets.widgets.motor_control.motor_control import MotorControlWidget, MotorControlErrors
 
 
 class MotorControlAbsolute(MotorControlWidget):

bec_widgets/widgets/motor_control/movement_relative/movement_relative.py

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

bec_widgets/widgets/motor_control/selection/motor_selection_launch.py

@@ -0,0 +1,30 @@
+import qdarktheme
+from qtpy.QtWidgets import QApplication
+
+from bec_widgets.utils.bec_dispatcher import BECDispatcher
+from bec_widgets.widgets.motor_control.selection.selection import MotorControlSelection
+
+CONFIG_DEFAULT = {
+    "motor_control": {
+        "motor_x": "samx",
+        "motor_y": "samy",
+        "step_size_x": 3,
+        "step_size_y": 5,
+        "precision": 4,
+        "step_x_y_same": False,
+        "move_with_arrows": False,
+    }
+}
+if __name__ == "__main__":
+    bec_dispatcher = BECDispatcher()
+    # BECclient global variables
+    client = bec_dispatcher.client
+    client.start()
+
+    app = QApplication([])
+    qdarktheme.setup_theme("auto")
+    motor_control = MotorControlSelection(client=client, config=CONFIG_DEFAULT)
+
+    window = motor_control
+    window.show()
+    app.exec()

bec_widgets/widgets/motor_control/selection/registerselection.py

@@ -0,0 +1,13 @@
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
+
+from selection import MotorControlSelection
+from selectionplugin import MotorControlSelectionPlugin
+
+from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
+
+# Set PYSIDE_DESIGNER_PLUGINS to point to this directory and load the plugin
+
+
+if __name__ == "__main__":
+    QPyDesignerCustomWidgetCollection.addCustomWidget(MotorControlSelectionPlugin())

bec_widgets/widgets/motor_control/selection/selection.pyproject

@@ -0,0 +1,4 @@
+{
+    "files": ["selection.py", "motor_selection_launch.py", "registertictactoe.py", "tictactoeplugin.py",
+    "tictactoetaskmenu.py"]
+}

bec_widgets/widgets/motor_control/selection/selectionplugin.py

@@ -1,26 +1,27 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-from qtpy.QtDesigner import QDesignerCustomWidgetInterface
-from qtpy.QtGui import QIcon
+from selection import MotorControlSelection
+
+from PySide6.QtGui import QIcon
+from PySide6.QtDesigner import QDesignerCustomWidgetInterface
 
-from bec_widgets.widgets.bec_queue.bec_queue import BECQueue
 
 DOM_XML = """
 <ui language='c++'>
-    <widget class='BECQueue' name='bec_queue'>
+    <widget class='MotorControlSelection' name='selection'>
     </widget>
 </ui>
 """
 
 
-class BECQueuePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+class MotorControlSelectionPlugin(QDesignerCustomWidgetInterface):
     def __init__(self):
         super().__init__()
         self._form_editor = None
 
     def createWidget(self, parent):
-        t = BECQueue(parent)
+        t = MotorControlSelection(parent)
         return t
 
     def domXml(self):
@@ -33,10 +34,13 @@ class BECQueuePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return QIcon()
 
     def includeFile(self):
-        return "bec_queue"
+        return "selection"
 
     def initialize(self, form_editor):
         self._form_editor = form_editor
+        # manager = form_editor.extensionManager()
+        # iid = TicTacToeTaskMenuFactory.task_menu_iid()
+        # manager.registerExtensions(TicTacToeTaskMenuFactory(manager), iid)
 
     def isContainer(self):
         return False
@@ -45,10 +49,10 @@ class BECQueuePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return self._form_editor is not None
 
     def name(self):
-        return "BECQueue"
+        return "MotorControlSelection"
 
     def toolTip(self):
-        return "Widget to display the BEC queue."
+        return "MotorControl Selection Example for BEC Widgets"
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/ring_progress_bar/__init__.py

@@ -1 +0,0 @@
-from .ring_progress_bar import RingProgressBar

bec_widgets/widgets/scan_control/scan_control.py

@@ -1,37 +1,53 @@
-import qdarktheme
 from bec_lib.endpoints import MessageEndpoints
 from qtpy.QtWidgets import (
     QApplication,
+    QCheckBox,
     QComboBox,
+    QDoubleSpinBox,
+    QFrame,
     QGridLayout,
     QGroupBox,
+    QHBoxLayout,
+    QHeaderView,
+    QLabel,
+    QLayout,
+    QLineEdit,
     QPushButton,
-    QSizePolicy,
+    QSpinBox,
+    QTableWidget,
+    QTableWidgetItem,
     QVBoxLayout,
     QWidget,
 )
 
-from bec_widgets.utils import BECConnector
-from bec_widgets.widgets.buttons.stop_button.stop_button import StopButton
-from bec_widgets.widgets.scan_control.scan_group_box import ScanGroupBox
+from bec_widgets.utils.bec_dispatcher import BECDispatcher
+from bec_widgets.utils.widget_io import WidgetIO
 
 
-class ScanControl(BECConnector, QWidget):
+class ScanArgType:
+    DEVICE = "device"
+    FLOAT = "float"
+    INT = "int"
+    BOOL = "bool"
+    STR = "str"
 
-    def __init__(
-        self, parent=None, client=None, gui_id: str | None = None, allowed_scans: list | None = None
-    ):
-        super().__init__(client=client, gui_id=gui_id)
-        QWidget.__init__(self, parent=parent)
+
+class ScanControl(QWidget):
+    WIDGET_HANDLER = {
+        ScanArgType.DEVICE: QLineEdit,
+        ScanArgType.FLOAT: QDoubleSpinBox,
+        ScanArgType.INT: QSpinBox,
+        ScanArgType.BOOL: QCheckBox,
+        ScanArgType.STR: QLineEdit,
+    }
+
+    def __init__(self, parent=None, client=None, allowed_scans=None):
+        super().__init__(parent)
 
         # Client from BEC + shortcuts to device manager and scans
-        self.get_bec_shortcuts()
-
-        # Main layout
-        self.layout = QVBoxLayout(self)
-        self.arg_box = None
-        self.kwarg_boxes = []
-        self.expert_mode = False  # TODO implement in the future versions
+        self.client = BECDispatcher().client if client is None else client
+        self.dev = self.client.device_manager.devices
+        self.scans = self.client.scans
 
         # Scan list - allowed scans for the GUI
         self.allowed_scans = allowed_scans
@@ -40,173 +56,389 @@ class ScanControl(BECConnector, QWidget):
         self._init_UI()
 
     def _init_UI(self):
-        """
-        Initializes the UI of the scan control widget. Create the top box for scan selection and populate scans to main combobox.
-        """
+        self.verticalLayout = QVBoxLayout(self)
 
         # Scan selection group box
-        self.scan_selection_group = self.create_scan_selection_group()
-        self.scan_selection_group.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
-        self.layout.addWidget(self.scan_selection_group)
+        self.scan_selection_group = QGroupBox("Scan Selection", self)
+        self.scan_selection_layout = QVBoxLayout(self.scan_selection_group)
+        self.comboBox_scan_selection = QComboBox(self.scan_selection_group)
+        self.button_run_scan = QPushButton("Run Scan", self.scan_selection_group)
+        self.scan_selection_layout.addWidget(self.comboBox_scan_selection)
+        self.scan_selection_layout.addWidget(self.button_run_scan)
+        self.verticalLayout.addWidget(self.scan_selection_group)
+
+        # Scan control group box
+        self.scan_control_group = QGroupBox("Scan Control", self)
+        self.scan_control_layout = QVBoxLayout(self.scan_control_group)
+        self.verticalLayout.addWidget(self.scan_control_group)
+
+        # Kwargs layout - just placeholder
+        self.kwargs_layout = QGridLayout()
+        self.scan_control_layout.addLayout(self.kwargs_layout)
+
+        # 1st Separator
+        self.add_horizontal_separator(self.scan_control_layout)
+
+        # Buttons
+        self.button_layout = QHBoxLayout()
+        self.pushButton_add_bundle = QPushButton("Add Bundle", self.scan_control_group)
+        self.pushButton_add_bundle.clicked.connect(self.add_bundle)
+        self.pushButton_remove_bundle = QPushButton("Remove Bundle", self.scan_control_group)
+        self.pushButton_remove_bundle.clicked.connect(self.remove_bundle)
+        self.button_layout.addWidget(self.pushButton_add_bundle)
+        self.button_layout.addWidget(self.pushButton_remove_bundle)
+        self.scan_control_layout.addLayout(self.button_layout)
+
+        # 2nd Separator
+        self.add_horizontal_separator(self.scan_control_layout)
+
+        # Initialize the QTableWidget for args
+        self.args_table = QTableWidget()
+        self.args_table.verticalHeader().setSectionResizeMode(QHeaderView.Fixed)
+
+        self.scan_control_layout.addWidget(self.args_table)
 
         # Connect signals
         self.comboBox_scan_selection.currentIndexChanged.connect(self.on_scan_selected)
         self.button_run_scan.clicked.connect(self.run_scan)
-        self.button_add_bundle.clicked.connect(self.add_arg_bundle)
-        self.button_remove_bundle.clicked.connect(self.remove_arg_bundle)
 
         # Initialize scan selection
         self.populate_scans()
 
-    def create_scan_selection_group(self) -> QGroupBox:
+    def add_horizontal_separator(self, layout) -> None:
         """
-        Creates the scan selection group box with combobox to select the scan and start/stop button.
+        Adds a horizontal separator to the given layout
 
-        Returns:
-            QGroupBox: Group box containing the scan selection widgets.
+        Args:
+            layout: Layout to add the separator to
         """
-
-        scan_selection_group = QGroupBox("Scan Selection", self)
-        self.scan_selection_layout = QGridLayout(scan_selection_group)
-        self.comboBox_scan_selection = QComboBox(scan_selection_group)
-        # Run button
-        self.button_run_scan = QPushButton("Start", scan_selection_group)
-        self.button_run_scan.setStyleSheet("background-color:  #559900; color: white")
-        # Stop button
-        self.button_stop_scan = StopButton(parent=scan_selection_group)
-        # Add bundle button
-        self.button_add_bundle = QPushButton("Add Bundle", scan_selection_group)
-        # Remove bundle button
-        self.button_remove_bundle = QPushButton("Remove Bundle", scan_selection_group)
-
-        self.scan_selection_layout.addWidget(self.comboBox_scan_selection, 0, 0, 1, 2)
-        self.scan_selection_layout.addWidget(self.button_run_scan, 1, 0)
-        self.scan_selection_layout.addWidget(self.button_stop_scan, 1, 1)
-        self.scan_selection_layout.addWidget(self.button_add_bundle, 2, 0)
-        self.scan_selection_layout.addWidget(self.button_remove_bundle, 2, 1)
-
-        return scan_selection_group
+        separator = QFrame(self.scan_control_group)
+        separator.setFrameShape(QFrame.HLine)
+        separator.setFrameShadow(QFrame.Sunken)
+        layout.addWidget(separator)
 
     def populate_scans(self):
-        """Populates the scan selection combo box with available scans from BEC session."""
-        self.available_scans = self.client.connector.get(
-            MessageEndpoints.available_scans()
-        ).resource
+        """Populates the scan selection combo box with available scans"""
+        self.available_scans = self.client.producer.get(MessageEndpoints.available_scans()).resource
         if self.allowed_scans is None:
-            supported_scans = ["ScanBase", "SyncFlyScanBase", "AsyncFlyScanBase"]
-            allowed_scans = [
-                scan_name
-                for scan_name, scan_info in self.available_scans.items()
-                if scan_info["base_class"] in supported_scans and len(scan_info["gui_config"]) > 0
-            ]
-
+            allowed_scans = self.available_scans.keys()
         else:
             allowed_scans = self.allowed_scans
+        # TODO check parent class is ScanBase -> filter out the scans not relevant for GUI
         self.comboBox_scan_selection.addItems(allowed_scans)
 
     def on_scan_selected(self):
         """Callback for scan selection combo box"""
-        self.reset_layout()
         selected_scan_name = self.comboBox_scan_selection.currentText()
         selected_scan_info = self.available_scans.get(selected_scan_name, {})
 
-        gui_config = selected_scan_info.get("gui_config", {})
-        self.arg_group = gui_config.get("arg_group", None)
-        self.kwarg_groups = gui_config.get("kwarg_groups", None)
+        print(selected_scan_info)  # TODO remove when widget will be more mature
+        # Generate kwargs input
+        self.generate_kwargs_input_fields(selected_scan_info)
 
-        if self.arg_box is None:
-            self.button_add_bundle.setEnabled(False)
-            self.button_remove_bundle.setEnabled(False)
+        # Args section
+        self.generate_args_input_fields(selected_scan_info)
 
-        if len(self.arg_group["arg_inputs"]) > 0:
-            self.button_add_bundle.setEnabled(True)
-            self.button_remove_bundle.setEnabled(True)
-            self.add_arg_group(self.arg_group)
-        if len(self.kwarg_groups) > 0:
-            self.add_kwargs_boxes(self.kwarg_groups)
-
-        self.update()
-        self.adjustSize()
-
-    def add_kwargs_boxes(self, groups: list):
+    def add_labels_to_layout(self, labels: list, grid_layout: QGridLayout) -> None:
         """
-        Adds the given gui_groups to the scan control layout.
+        Adds labels to the given grid layout as a separate row.
 
         Args:
-            groups(list): List of dictionaries containing the gui_group information.
+            labels (list): List of label names to add.
+            grid_layout (QGridLayout): The grid layout to which labels will be added.
         """
-        for group in groups:
-            box = ScanGroupBox(box_type="kwargs", config=group)
-            box.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
-            self.layout.addWidget(box)
-            self.kwarg_boxes.append(box)
+        row_index = grid_layout.rowCount()  # Get the next available row
+        for column_index, label_name in enumerate(labels):
+            label = QLabel(label_name.capitalize(), self.scan_control_group)
+            # Add the label to the grid layout at the calculated row and current column
+            grid_layout.addWidget(label, row_index, column_index)
 
-    def add_arg_group(self, group: dict):
+    def add_labels_to_table(
+        self, labels: list, table: QTableWidget
+    ) -> None:  # TODO could be moved to BECTable
         """
-        Adds the given gui_groups to the scan control layout.
+        Adds labels to the given table widget as a header row.
 
         Args:
+            labels(list): List of label names to add.
+            table(QTableWidget): The table widget to which labels will be added.
         """
-        self.arg_box = ScanGroupBox(box_type="args", config=group)
-        self.arg_box.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
-        self.layout.addWidget(self.arg_box)
+        table.setColumnCount(len(labels))
+        table.setHorizontalHeaderLabels(labels)
 
-    def add_arg_bundle(self):
-        self.arg_box.add_widget_bundle()
+    def generate_args_input_fields(self, scan_info: dict) -> None:
+        """
+        Generates input fields for args.
 
-    def remove_arg_bundle(self):
-        self.arg_box.remove_widget_bundle()
+        Args:
+            scan_info(dict): Scan signature dictionary from BEC.
+        """
 
-    def reset_layout(self):
-        """Clears the scan control layout from GuiGroups and ArgGroups boxes."""
-        if self.arg_box is not None:
-            self.layout.removeWidget(self.arg_box)
-            self.arg_box.deleteLater()
-            self.arg_box = None
-        if self.kwarg_boxes != []:
-            self.remove_kwarg_boxes()
+        # Setup args table limits
+        self.set_args_table_limits(self.args_table, scan_info)
 
-    def remove_kwarg_boxes(self):
-        for box in self.kwarg_boxes:
-            self.layout.removeWidget(box)
-            box.deleteLater()
-        self.kwarg_boxes = []
+        # Get arg_input from selected scan
+        self.arg_input = scan_info.get("arg_input", {})
+
+        # Generate labels for table
+        self.add_labels_to_table(list(self.arg_input.keys()), self.args_table)
+
+        # add minimum number of args rows
+        if self.arg_size_min is not None:
+            for i in range(self.arg_size_min):
+                self.add_bundle()
+
+    def generate_kwargs_input_fields(self, scan_info: dict) -> None:
+        """
+        Generates input fields for kwargs
+
+        Args:
+            scan_info(dict): Scan signature dictionary from BEC.
+        """
+        # Create a new kwarg layout to replace the old one - this is necessary because otherwise row count is not reseted
+        self.clear_and_delete_layout(self.kwargs_layout)
+        self.kwargs_layout = self.create_new_grid_layout()  # Create new grid layout
+        self.scan_control_layout.insertLayout(0, self.kwargs_layout)
+
+        # Get signature
+        signature = scan_info.get("signature", [])
+
+        # Extract kwargs from the converted signature
+        kwargs = [param["name"] for param in signature if param["kind"] == "KEYWORD_ONLY"]
+
+        # Add labels
+        self.add_labels_to_layout(kwargs, self.kwargs_layout)
+
+        # Add widgets
+        widgets = self.generate_widgets_from_signature(kwargs, signature)
+
+        self.add_widgets_row_to_layout(self.kwargs_layout, widgets)
+
+    def generate_widgets_from_signature(self, items: list, signature: dict = None) -> list:
+        """
+        Generates widgets from the given list of items.
+
+        Args:
+            items(list): List of items to create widgets for.
+            signature(dict, optional): Scan signature dictionary from BEC.
+
+        Returns:
+            list: List of widgets created from the given items.
+        """
+        widgets = []  # Initialize an empty list to hold the widgets
+
+        for item in items:
+            if signature:
+                # If a signature is provided, extract type and name from it
+                kwarg_info = next((info for info in signature if info["name"] == item), None)
+                if kwarg_info:
+                    item_type = kwarg_info.get("annotation", "_empty")
+                    item_name = item
+            else:
+                # If no signature is provided, assume the item is a tuple of (name, type)
+                item_name, item_type = item
+
+            widget_class = self.WIDGET_HANDLER.get(item_type, None)
+            if widget_class is None:
+                print(f"Unsupported annotation '{item_type}' for parameter '{item_name}'")
+                continue
+
+            # Instantiate the widget and set some properties if necessary
+            widget = widget_class()
+
+            # set high default range for spin boxes #TODO can be linked to motor/device limits from BEC
+            if isinstance(widget, (QSpinBox, QDoubleSpinBox)):
+                widget.setRange(-9999, 9999)
+                widget.setValue(0)
+            # Add the widget to the list
+            widgets.append(widget)
+
+        return widgets
+
+    def set_args_table_limits(self, table: QTableWidget, scan_info: dict) -> None:
+        # Get bundle info
+        arg_bundle_size = scan_info.get("arg_bundle_size", {})
+        self.arg_size_min = arg_bundle_size.get("min", 1)
+        self.arg_size_max = arg_bundle_size.get("max", None)
+
+        # Clear the previous input fields
+        table.setRowCount(0)  # Wipe table
+
+    def add_widgets_row_to_layout(
+        self, grid_layout: QGridLayout, widgets: list, row_index: int = None
+    ) -> None:
+        """
+        Adds a row of widgets to the given grid layout.
+
+        Args:
+            grid_layout (QGridLayout): The grid layout to which widgets will be added.
+            items (list): List of parameter names to create widgets for.
+            row_index (int): The row index where the widgets should be added.
+        """
+        # If row_index is not specified, add to the next available row
+        if row_index is None:
+            row_index = grid_layout.rowCount()
+
+        for column_index, widget in enumerate(widgets):
+            # Add the widget to the grid layout at the specified row and column
+            grid_layout.addWidget(widget, row_index, column_index)
+
+    def add_widgets_row_to_table(
+        self, table_widget: QTableWidget, widgets: list, row_index: int = None
+    ) -> None:
+        """
+        Adds a row of widgets to the given QTableWidget.
+
+        Args:
+            table_widget (QTableWidget): The table widget to which widgets will be added.
+            widgets (list): List of widgets to add to the table.
+            row_index (int): The row index where the widgets should be added. If None, add to the end.
+        """
+        # If row_index is not specified, add to the end of the table
+        if row_index is None or row_index > table_widget.rowCount():
+            row_index = table_widget.rowCount()
+            if self.arg_size_max is not None:  # ensure the max args size is not exceeded
+                if row_index >= self.arg_size_max:
+                    return
+            table_widget.insertRow(row_index)
+
+        for column_index, widget in enumerate(widgets):
+            # If the widget is a subclass of QWidget, use setCellWidget
+            if issubclass(type(widget), QWidget):
+                table_widget.setCellWidget(row_index, column_index, widget)
+            else:
+                # Otherwise, assume it's a string or some other value that should be displayed as text
+                item = QTableWidgetItem(str(widget))
+                table_widget.setItem(row_index, column_index, item)
+
+        # Optionally, adjust the row height based on the content #TODO decide if needed
+        table_widget.setRowHeight(
+            row_index,
+            max(widget.sizeHint().height() for widget in widgets if isinstance(widget, QWidget)),
+        )
+
+    def remove_last_row_from_table(self, table_widget: QTableWidget) -> None:
+        """
+        Removes the last row from the given QTableWidget until only one row is left.
+
+        Args:
+            table_widget (QTableWidget): The table widget from which the last row will be removed.
+        """
+        row_count = table_widget.rowCount()
+        if (
+            row_count > self.arg_size_min
+        ):  # Check to ensure there is a minimum number of rows remaining
+            table_widget.removeRow(row_count - 1)
+
+    def create_new_grid_layout(self):
+        new_layout = QGridLayout()
+        # TODO maybe setup other layouts properties here?
+        return new_layout
+
+    def clear_and_delete_layout(self, layout: QLayout):
+        """
+        Clears and deletes the given layout and all its child widgets.
+
+        Args:
+            layout(QLayout): Layout to clear and delete
+        """
+        if layout is not None:
+            while layout.count():
+                item = layout.takeAt(0)
+                widget = item.widget()
+                if widget:
+                    widget.deleteLater()
+                else:
+                    sub_layout = item.layout()
+                    if sub_layout:
+                        self.clear_and_delete_layout(sub_layout)
+            layout.deleteLater()
+
+    def add_bundle(self) -> None:
+        """Adds a new bundle to the scan control layout"""
+        # Get widgets used for particular scan and save them to be able to use for adding bundles
+        args_widgets = self.generate_widgets_from_signature(
+            self.arg_input.items()
+        )  # TODO decide if make sense to put widget list into method parameters
+
+        # Add first widgets row to the table
+        self.add_widgets_row_to_table(self.args_table, args_widgets)
+
+    def remove_bundle(self) -> None:
+        """Removes the last bundle from the scan control layout"""
+        self.remove_last_row_from_table(self.args_table)
+
+    def extract_kwargs_from_grid_row(self, grid_layout: QGridLayout, row: int) -> dict:
+        kwargs = {}
+        for column in range(grid_layout.columnCount()):
+            label_item = grid_layout.itemAtPosition(row, column)
+            if label_item is not None:
+                label_widget = label_item.widget()
+                if isinstance(label_widget, QLabel):
+                    key = label_widget.text()
+
+                    # The corresponding value widget is in the next row
+                    value_item = grid_layout.itemAtPosition(row + 1, column)
+                    if value_item is not None:
+                        value_widget = value_item.widget()
+                        # Use WidgetIO.get_value to extract the value
+                        value = WidgetIO.get_value(value_widget)
+                        kwargs[key] = value
+        return kwargs
+
+    def extract_args_from_table(self, table: QTableWidget) -> list:
+        """
+        Extracts the arguments from the given table widget.
+
+        Args:
+            table(QTableWidget): Table widget from which to extract the arguments
+        """
+        args = []
+        for row in range(table.rowCount()):
+            row_args = []
+            for column in range(table.columnCount()):
+                widget = table.cellWidget(row, column)
+                if widget:
+                    if isinstance(widget, QLineEdit):  # special case for QLineEdit for Devices
+                        value = widget.text().lower()
+                        if value in self.dev:
+                            value = getattr(self.dev, value)
+                        else:
+                            raise ValueError(f"The device '{value}' is not recognized.")
+                    else:
+                        value = WidgetIO.get_value(widget)
+                    row_args.append(value)
+            args.extend(row_args)
+        return args
 
     def run_scan(self):
-        args = []
-        kwargs = {}
-        if self.arg_box is not None:
-            args = self.arg_box.get_parameters()
-        for box in self.kwarg_boxes:
-            box_kwargs = box.get_parameters()
-            kwargs.update(box_kwargs)
+        # Extract kwargs for the scan
+        kwargs = {
+            k.lower(): v
+            for k, v in self.extract_kwargs_from_grid_row(self.kwargs_layout, 1).items()
+        }
+
+        # Extract args from the table
+        args = self.extract_args_from_table(self.args_table)
+
+        # Convert args to lowercase if they are strings
+        args = [arg.lower() if isinstance(arg, str) else arg for arg in args]
+
+        # Execute the scan
         scan_function = getattr(self.scans, self.comboBox_scan_selection.currentText())
         if callable(scan_function):
             scan_function(*args, **kwargs)
 
-    def cleanup(self):
-        self.button_stop_scan.cleanup()
-        if self.arg_box:
-            for widget in self.arg_box.widgets:
-                if hasattr(widget, "cleanup"):
-                    widget.cleanup()
-        for kwarg_box in self.kwarg_boxes:
-            for widget in kwarg_box.widgets:
-                if hasattr(widget, "cleanup"):
-                    widget.cleanup()
-        super().cleanup()
-
-    def closeEvent(self, event):
-        self.cleanup()
-        QWidget().closeEvent(event)
-
 
 # Application example
 if __name__ == "__main__":  # pragma: no cover
-    app = QApplication([])
-    scan_control = ScanControl()
+    # BECclient global variables
+    client = BECDispatcher().client
+    client.start()
+
+    app = QApplication([])
+    scan_control = ScanControl(client=client)  # allowed_scans=["line_scan", "grid_scan"])
 
-    qdarktheme.setup_theme("auto")
     window = scan_control
     window.show()
     app.exec()

bec_widgets/widgets/scan_control/scan_group_box.py

@@ -1,223 +0,0 @@
-from typing import Literal
-
-from qtpy.QtWidgets import (
-    QCheckBox,
-    QComboBox,
-    QDoubleSpinBox,
-    QGridLayout,
-    QGroupBox,
-    QLabel,
-    QLineEdit,
-    QSpinBox,
-)
-
-from bec_widgets.utils.widget_io import WidgetIO
-from bec_widgets.widgets.device_inputs import DeviceLineEdit
-
-
-class ScanArgType:
-    DEVICE = "device"
-    FLOAT = "float"
-    INT = "int"
-    BOOL = "bool"
-    STR = "str"
-    DEVICEBASE = "DeviceBase"
-    LITERALS = "dict"
-
-
-class ScanSpinBox(QSpinBox):
-    def __init__(
-        self, parent=None, arg_name: str = None, default: int | None = None, *args, **kwargs
-    ):
-        super().__init__(parent=parent, *args, **kwargs)
-        self.arg_name = arg_name
-        self.setRange(-9999, 9999)
-        if default is not None:
-            self.setValue(default)
-
-
-class ScanDoubleSpinBox(QDoubleSpinBox):
-    def __init__(
-        self, parent=None, arg_name: str = None, default: float | None = None, *args, **kwargs
-    ):
-        super().__init__(parent=parent, *args, **kwargs)
-        self.arg_name = arg_name
-        self.setRange(-9999, 9999)
-        if default is not None:
-            self.setValue(default)
-
-
-class ScanLineEdit(QLineEdit):
-    def __init__(
-        self, parent=None, arg_name: str = None, default: str | None = None, *args, **kwargs
-    ):
-        super().__init__(parent=parent, *args, **kwargs)
-        self.arg_name = arg_name
-        if default is not None:
-            self.setText(default)
-
-
-class ScanCheckBox(QCheckBox):
-    def __init__(
-        self, parent=None, arg_name: str = None, default: bool | None = None, *args, **kwargs
-    ):
-        super().__init__(parent=parent, *args, **kwargs)
-        self.arg_name = arg_name
-        if default is not None:
-            self.setChecked(default)
-
-
-class ScanGroupBox(QGroupBox):
-    WIDGET_HANDLER = {
-        ScanArgType.DEVICE: DeviceLineEdit,
-        ScanArgType.DEVICEBASE: DeviceLineEdit,
-        ScanArgType.FLOAT: ScanDoubleSpinBox,
-        ScanArgType.INT: ScanSpinBox,
-        ScanArgType.BOOL: ScanCheckBox,
-        ScanArgType.STR: ScanLineEdit,
-        ScanArgType.LITERALS: QComboBox,  # TODO figure out combobox logic
-    }
-
-    def __init__(
-        self,
-        parent=None,
-        box_type=Literal["args", "kwargs"],
-        config: dict | None = None,
-        *args,
-        **kwargs,
-    ):
-        super().__init__(parent=parent, *args, **kwargs)
-        self.config = config
-        self.box_type = box_type
-
-        self.layout = QGridLayout(self)
-        self.labels = []
-        self.widgets = []
-
-        self.init_box(self.config)
-
-    def init_box(self, config: dict):
-        box_name = config.get("name", "ScanGroupBox")
-        self.inputs = config.get("inputs", {})
-        self.setTitle(box_name)
-
-        # Labels
-        self.add_input_labels(self.inputs, 0)
-
-        # Widgets
-        if self.box_type == "args":
-            min_bundle = self.config.get("min", 1)
-            for i in range(1, min_bundle + 1):
-                self.add_input_widgets(self.inputs, i)
-        else:
-            self.add_input_widgets(self.inputs, 1)
-
-    def add_input_labels(self, group_inputs: dict, row: int) -> None:
-        """
-        Adds the given arg_group from arg_bundle to the scan control layout. The input labels are always added to the first row.
-
-        Args:
-            group(dict): Dictionary containing the arg_group information.
-        """
-        for column_index, item in enumerate(group_inputs):
-            arg_name = item.get("name", None)
-            display_name = item.get("display_name", arg_name)
-            label = QLabel(text=display_name)
-            self.layout.addWidget(label, row, column_index)
-            self.labels.append(label)
-
-    def add_input_widgets(self, group_inputs: dict, row) -> None:
-        """
-        Adds the given arg_group from arg_bundle to the scan control layout.
-
-        Args:
-            group_inputs(dict): Dictionary containing the arg_group information.
-            row(int): The row to add the widgets to.
-        """
-        for column_index, item in enumerate(group_inputs):
-            arg_name = item.get("name", None)
-            default = item.get("default", None)
-            widget = self.WIDGET_HANDLER.get(item["type"], None)
-            if widget is None:
-                print(f"Unsupported annotation '{item['type']}' for parameter '{item['name']}'")
-                continue
-            if default == "_empty":
-                default = None
-            widget_to_add = widget(arg_name=arg_name, default=default)
-            tooltip = item.get("tooltip", None)
-            if tooltip is not None:
-                widget_to_add.setToolTip(item["tooltip"])
-            self.layout.addWidget(widget_to_add, row, column_index)
-            self.widgets.append(widget_to_add)
-
-    def add_widget_bundle(self):
-        """
-        Adds a new row of widgets to the scan control layout. Only usable for arg_groups.
-        """
-        if self.box_type != "args":
-            return
-        arg_max = self.config.get("max", None)
-        row = self.layout.rowCount()
-        if arg_max is not None and row >= arg_max:
-            return
-
-        self.add_input_widgets(self.inputs, row)
-
-    def remove_widget_bundle(self):
-        """
-        Removes the last row of widgets from the scan control layout. Only usable for arg_groups.
-        """
-        if self.box_type != "args":
-            return
-        arg_min = self.config.get("min", None)
-        row = self.count_arg_rows()
-        if arg_min is not None and row <= arg_min:
-            return
-
-        for widget in self.widgets[-len(self.inputs) :]:
-            widget.deleteLater()
-        self.widgets = self.widgets[: -len(self.inputs)]
-
-    def get_parameters(self):
-        """
-        Returns the parameters from the widgets in the scan control layout formated to run scan from BEC.
-        """
-        if self.box_type == "args":
-            return self._get_arg_parameterts()
-        elif self.box_type == "kwargs":
-            return self._get_kwarg_parameters()
-
-    def _get_arg_parameterts(self):
-        args = []
-        for i in range(1, self.layout.rowCount()):
-            for j in range(self.layout.columnCount()):
-                widget = self.layout.itemAtPosition(i, j).widget()
-                if isinstance(widget, DeviceLineEdit):
-                    value = widget.get_device()
-                else:
-                    value = WidgetIO.get_value(widget)
-                args.append(value)
-        return args
-
-    def _get_kwarg_parameters(self):
-        kwargs = {}
-        for i in range(self.layout.columnCount()):
-            widget = self.layout.itemAtPosition(1, i).widget()
-            if isinstance(widget, DeviceLineEdit):
-                value = widget.get_device()
-            else:
-                value = WidgetIO.get_value(widget)
-            kwargs[widget.arg_name] = value
-        return kwargs
-
-    def count_arg_rows(self):
-        widget_rows = 0
-        for row in range(self.layout.rowCount()):
-            for col in range(self.layout.columnCount()):
-                item = self.layout.itemAtPosition(row, col)
-                if item is not None:
-                    widget = item.widget()
-                    if widget is not None:
-                        if isinstance(widget, DeviceLineEdit):
-                            widget_rows += 1
-        return widget_rows

bec_widgets/widgets/spiral_progress_bar/__init__.py

@@ -0,0 +1 @@
+from .spiral_progress_bar import SpiralProgressBar

bec_widgets/widgets/spiral_progress_bar/ring.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import Literal, Optional
 
-from bec_lib.endpoints import EndpointInfo, MessageEndpoints
+from bec_lib.endpoints import EndpointInfo
 from pydantic import BaseModel, Field, field_validator
 from pydantic_core import PydanticCustomError
 from qtpy import QtGui
@@ -10,25 +10,23 @@ from qtpy import QtGui
 from bec_widgets.utils import BECConnector, ConnectionConfig
 
 
-class ProgressbarConnections(BaseModel):
+class RingConnections(BaseModel):
     slot: Literal["on_scan_progress", "on_device_readback"] = None
     endpoint: EndpointInfo | str = None
-    model_config: dict = {"validate_assignment": True}
 
     @field_validator("endpoint")
-    @classmethod
     def validate_endpoint(cls, v, values):
         slot = values.data["slot"]
-        v = v.endpoint if isinstance(v, EndpointInfo) else v
+        endpoint = v.endpoint if isinstance(v, EndpointInfo) else v
         if slot == "on_scan_progress":
-            if v != MessageEndpoints.scan_progress().endpoint:
+            if endpoint != "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 v.startswith(MessageEndpoints.device_readback("").endpoint):
+            if not endpoint.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}'.",
@@ -37,8 +35,7 @@ class ProgressbarConnections(BaseModel):
         return v
 
 
-class ProgressbarConfig(ConnectionConfig):
-    value: int | float | None = Field(0, description="Value for the progress bars.")
+class RingConfig(ConnectionConfig):
     direction: int | None = Field(
         -1, description="Direction of the progress bars. -1 for clockwise, 1 for counter-clockwise."
     )
@@ -51,44 +48,35 @@ class ProgressbarConfig(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(10, description="Line widths for the progress bars.")
+    line_width: int | None = Field(5, 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 | 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.")
+    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.")
     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."
     )
-    connections: ProgressbarConnections | None = Field(
-        default_factory=ProgressbarConnections, description="Connections for the progress bars."
-    )
-
-
-class RingConfig(ProgressbarConfig):
-    index: int | None = Field(0, description="Index of the progress bar. 0 is outer ring.")
-    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.",
+    connections: RingConnections | None = Field(
+        default_factory=RingConnections, description="Connections for the progress bars."
     )
 
 
 class Ring(BECConnector):
     USER_ACCESS = [
-        "_get_all_rpc",
-        "_rpc_id",
-        "_config_dict",
+        "get_all_rpc",
+        "rpc_id",
+        "config_dict",
         "set_value",
         "set_color",
         "set_background",
         "set_line_width",
         "set_min_max_values",
         "set_start_angle",
-        "set_update",
+        "set_connections",
         "reset_connection",
     ]
 
@@ -114,6 +102,7 @@ class Ring(BECConnector):
         self.background_color = None
         self.start_position = None
         self.config = config
+        self.value = 0
         self.RID = None
         self._init_config_params()
 
@@ -125,81 +114,31 @@ class Ring(BECConnector):
             self.set_connections(self.config.connections.slot, self.config.connections.endpoint)
 
     def set_value(self, value: int | float):
-        """
-        Set the value for the ring widget
-
-        Args:
-            value(int | float): Value for the ring widget
-        """
-        self.config.value = round(
-            float(max(self.config.min_value, min(self.config.max_value, value))),
-            self.config.precision,
+        self.value = round(
+            max(self.config.min_value, min(self.config.max_value, value)), self.config.precision
         )
-        self.parent_progress_widget.update()
 
     def set_color(self, color: str | tuple):
-        """
-        Set the color for the ring widget
-
-        Args:
-            color(str | tuple): Color for the ring widget. Can be HEX code or tuple (R, G, B, A).
-        """
         self.config.color = color
         self.color = self.convert_color(color)
-        self.parent_progress_widget.update()
 
     def set_background(self, color: str | tuple):
-        """
-        Set the background color for the ring widget
-
-        Args:
-            color(str | tuple): Background color for the ring widget. Can be HEX code or tuple (R, G, B, A).
-        """
         self.config.background_color = color
         self.color = self.convert_color(color)
-        self.parent_progress_widget.update()
 
     def set_line_width(self, width: int):
-        """
-        Set the line width for the ring widget
-
-        Args:
-            width(int): Line width for the ring widget
-        """
         self.config.line_width = width
-        self.parent_progress_widget.update()
 
-    def set_min_max_values(self, min_value: int | float, max_value: int | float):
-        """
-        Set the min and max values for the ring widget.
-
-        Args:
-            min_value(int | float): Minimum value for the ring widget
-            max_value(int | float): Maximum value for the ring widget
-        """
+    def set_min_max_values(self, min_value: int, max_value: int):
         self.config.min_value = min_value
         self.config.max_value = max_value
-        self.parent_progress_widget.update()
 
     def set_start_angle(self, start_angle: int):
-        """
-        Set the start angle for the ring widget
-
-        Args:
-            start_angle(int): Start angle for the ring widget in degrees
-        """
         self.config.start_position = start_angle
         self.start_position = start_angle * 16
-        self.parent_progress_widget.update()
 
     @staticmethod
     def convert_color(color):
-        """
-        Convert the color to QColor
-
-        Args:
-            color(str | tuple): Color for the ring widget. Can be HEX code or tuple (R, G, B, A).
-        """
         converted_color = None
         if isinstance(color, str):
             converted_color = QtGui.QColor(color)
@@ -207,65 +146,23 @@ 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.
-        Modes:
-        - "manual": Manual update mode, the value is set by the user.
-        - "scan": Update mode for the scan progress. The value is updated by the current scan progress.
-        - "device": Update mode for the device readback. The value is updated by the device readback. Take into account that user has to set the device name and limits.
-
-        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):
-        """
-        Set the connections for the ring widget
-
-        Args:
-            slot(str): Slot for the ring widget update. Can be "on_scan_progress" or "on_device_readback".
-            endpoint(str | EndpointInfo): Endpoint for the ring widget update. Endpoint has to match the slot type.
-        """
         if self.config.connections.endpoint == endpoint and self.config.connections.slot == slot:
             return
         else:
             self.bec_dispatcher.disconnect_slot(
                 self.config.connections.slot, self.config.connections.endpoint
             )
-            self.config.connections = ProgressbarConnections(slot=slot, endpoint=endpoint)
+            self.config.connections = RingConnections(slot=slot, endpoint=endpoint)
             self.bec_dispatcher.connect_slot(getattr(self, slot), endpoint)
 
     def reset_connection(self):
-        """
-        Reset the connections for the ring widget. Disconnect the current slot and endpoint.
-        """
         self.bec_dispatcher.disconnect_slot(
             self.config.connections.slot, self.config.connections.endpoint
         )
-        self.config.connections = ProgressbarConnections()
+        self.config.connections = RingConnections()
 
     def on_scan_progress(self, msg, meta):
-        """
-        Update the ring widget with the scan progress.
-
-        Args:
-            msg(dict): Message with the scan progress
-            meta(dict): Metadata for the message
-        """
         current_RID = meta.get("RID", None)
         if current_RID != self.RID:
             self.set_min_max_values(0, msg.get("max_value", 100))
@@ -273,13 +170,6 @@ class Ring(BECConnector):
         self.parent_progress_widget.update()
 
     def on_device_readback(self, msg, meta):
-        """
-        Update the ring widget with the device readback.
-
-        Args:
-            msg(dict): Message with the device readback
-            meta(dict): Metadata for the message
-        """
         if isinstance(self.config.connections.endpoint, EndpointInfo):
             endpoint = self.config.connections.endpoint.endpoint
         else:

bec_widgets/widgets/spiral_progress_bar/spiral_progress_bar.py

@@ -11,13 +11,11 @@ from qtpy.QtCore import QSize, Slot
 from qtpy.QtWidgets import QSizePolicy, QWidget
 
 from bec_widgets.utils import BECConnector, Colors, ConnectionConfig, EntryValidator
-from bec_widgets.widgets.ring_progress_bar.ring import Ring, RingConfig
+from bec_widgets.widgets.spiral_progress_bar.ring import Ring, RingConfig
 
 
-class RingProgressBarConfig(ConnectionConfig):
-    color_map: Optional[str] = Field(
-        "magma", description="Color scheme for the progress bars.", validate_default=True
-    )
+class SpiralProgressBarConfig(ConnectionConfig):
+    color_map: str | None = Field("magma", description="Color scheme for the progress bars.")
     min_number_of_bars: int | None = Field(
         1, description="Minimum number of progress bars to display."
     )
@@ -25,14 +23,13 @@ class RingProgressBarConfig(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(20, description="Gap between progress bars.")
+    gap: int | None = Field(10, description="Gap between progress bars.")
     auto_updates: bool | None = Field(
         True, description="Enable or disable updates based on scan queue status."
     )
     rings: list[RingConfig] | None = Field([], description="List of ring configurations.")
 
     @field_validator("num_bars")
-    @classmethod
     def validate_num_bars(cls, v, values):
         min_number_of_bars = values.data.get("min_number_of_bars", None)
         max_number_of_bars = values.data.get("max_number_of_bars", None)
@@ -44,7 +41,6 @@ class RingProgressBarConfig(ConnectionConfig):
             return v
 
     @field_validator("rings")
-    @classmethod
     def validate_rings(cls, v, values):
         if v is not None and v is not []:
             num_bars = values.data.get("num_bars", None)
@@ -63,14 +59,23 @@ class RingProgressBarConfig(ConnectionConfig):
                 )
         return v
 
-    _validate_colormap = field_validator("color_map")(Colors.validate_color_map)
+    @field_validator("color_map")
+    def validate_color_map(cls, v, values):
+        if v is not None and v != "":
+            if v not in pg.colormap.listMaps():
+                raise PydanticCustomError(
+                    "unsupported colormap",
+                    f"Colormap '{v}' not found in the current installation of pyqtgraph",
+                    {"wrong_value": v},
+                )
+        return v
 
 
-class RingProgressBar(BECConnector, QWidget):
+class SpiralProgressBar(BECConnector, QWidget):
     USER_ACCESS = [
-        "_get_all_rpc",
-        "_rpc_id",
-        "_config_dict",
+        "get_all_rpc",
+        "rpc_id",
+        "config_dict",
         "rings",
         "update_config",
         "add_ring",
@@ -91,29 +96,30 @@ class RingProgressBar(BECConnector, QWidget):
     def __init__(
         self,
         parent=None,
-        config: RingProgressBarConfig | dict | None = None,
+        config: SpiralProgressBarConfig | dict | None = None,
         client=None,
         gui_id: str | None = None,
         num_bars: int | None = None,
     ):
         if config is None:
-            config = RingProgressBarConfig(widget_class=self.__class__.__name__)
+            config = SpiralProgressBarConfig(widget_class=self.__class__.__name__)
             self.config = config
         else:
             if isinstance(config, dict):
-                config = RingProgressBarConfig(**config, widget_class=self.__class__.__name__)
+                config = SpiralProgressBarConfig(**config, widget_class=self.__class__.__name__)
             self.config = config
         super().__init__(client=client, config=config, gui_id=gui_id)
-        QWidget.__init__(self, parent=parent)
+        QWidget.__init__(self, parent=None)
 
         self.get_bec_shortcuts()
         self.entry_validator = EntryValidator(self.dev)
 
         self.RID = None
+        self.values = None
 
         # For updating bar behaviour
         self._auto_updates = True
-        self._rings = None
+        self._rings = []
 
         if num_bars is not None:
             self.config.num_bars = max(
@@ -131,7 +137,7 @@ class RingProgressBar(BECConnector, QWidget):
     def rings(self, value):
         self._rings = value
 
-    def update_config(self, config: RingProgressBarConfig | dict):
+    def update_config(self, config: SpiralProgressBarConfig | dict):
         """
         Update the configuration of the widget.
 
@@ -139,7 +145,7 @@ class RingProgressBar(BECConnector, QWidget):
             config(SpiralProgressBarConfig|dict): Configuration to update.
         """
         if isinstance(config, dict):
-            config = RingProgressBarConfig(**config, widget_class=self.__class__.__name__)
+            config = SpiralProgressBarConfig(**config, widget_class=self.__class__.__name__)
         self.config = config
         self.clear_all()
 
@@ -181,22 +187,13 @@ class RingProgressBar(BECConnector, QWidget):
             Ring: Ring object.
         """
         if self.config.num_bars < self.config.max_number_of_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)
+            ring = Ring(parent_progress_widget=self, **kwargs)
+            ring.config.index = self.config.num_bars
             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
 
@@ -215,7 +212,6 @@ class RingProgressBar(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):
@@ -274,30 +270,9 @@ class RingProgressBar(BECConnector, QWidget):
         num_bars = max(
             self.config.min_number_of_bars, min(num_bars, self.config.max_number_of_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()
+        if num_bars != self.config.num_bars:
+            self.config.num_bars = num_bars
+            self.initialize_bars()
 
     def set_value(self, values: int | list, ring_index: int = None):
         """
@@ -363,6 +338,7 @@ class RingProgressBar(BECConnector, QWidget):
             colors = self._adjust_list_to_bars(colors)
             for ring, color in zip(self._rings, colors):
                 ring.set_color(color)
+            self.config.color_map = None
         self.update()
 
     def set_line_widths(self, widths: int | list[int], bar_index: int = None):
@@ -458,13 +434,6 @@ class RingProgressBar(BECConnector, QWidget):
 
     @Slot(dict, dict)
     def on_scan_queue_status(self, msg, meta):
-        """
-        Slot to handle scan queue status messages. Decides what update to perform based on the scan queue status.
-
-        Args:
-            msg(dict): Message from the BEC.
-            meta(dict): Metadata from the BEC.
-        """
         primary_queue = msg.get("queue").get("primary")
         info = primary_queue.get("info", None)
 
@@ -475,6 +444,8 @@ class RingProgressBar(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")
@@ -491,12 +462,6 @@ class RingProgressBar(BECConnector, QWidget):
                     #     print("hook device_progress")
 
     def _hook_scan_progress(self, ring_index: int = None):
-        """
-        Hook the scan progress to the progress bars.
-
-        Args:
-            ring_index(int): Index of the progress bar to hook the scan progress to.
-        """
         if ring_index is not None:
             ring = self._find_ring_by_index(ring_index)
         else:
@@ -508,15 +473,6 @@ class RingProgressBar(BECConnector, QWidget):
             ring.set_connections("on_scan_progress", MessageEndpoints.scan_progress())
 
     def _hook_readback(self, bar_index: int, device: str, min: float | int, max: float | int):
-        """
-        Hook the readback values to the progress bars.
-
-        Args:
-            bar_index(int): Index of the progress bar to hook the readback values to.
-            device(str): Device to readback values from.
-            min(float|int): Minimum value for the progress bar.
-            max(float|int): Maximum value for the progress bar.
-        """
         ring = self._find_ring_by_index(bar_index)
         ring.set_min_max_values(min, max)
         endpoint = MessageEndpoints.device_readback(device)
@@ -588,7 +544,7 @@ class RingProgressBar(BECConnector, QWidget):
             pen = QtGui.QPen(ring.color, ring.config.line_width, QtCore.Qt.SolidLine)
             pen.setCapStyle(QtCore.Qt.RoundCap)
             painter.setPen(pen)
-            proportion = (ring.config.value - ring.config.min_value) / (
+            proportion = (ring.value - ring.config.min_value) / (
                 (ring.config.max_value - ring.config.min_value) + 1e-3
             )
             angle = int(proportion * 360 * 16 * ring.config.direction)

bec_widgets/widgets/text_box/text_box.py

@@ -1,127 +0,0 @@
-import re
-
-from pydantic import Field, field_validator
-from qtpy.QtWidgets import QTextEdit
-
-from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig
-from bec_widgets.utils.colors import Colors
-
-
-class TextBoxConfig(ConnectionConfig):
-
-    theme: str = Field("dark", description="The theme of the figure widget.")
-    font_color: str = Field("#FFF", description="The font color of the text")
-    background_color: str = Field("#000", description="The background color of the widget.")
-    font_size: int = Field(16, description="The font size of the text in the widget.")
-    text: str = Field("", description="The text to display in the widget.")
-
-    @classmethod
-    @field_validator("theme")
-    def validate_theme(cls, v):
-        """Validate the theme of the figure widget."""
-        if v not in ["dark", "light"]:
-            raise ValueError("Theme must be either 'dark' or 'light'")
-        return v
-
-    _validate_font_color = field_validator("font_color")(Colors.validate_color)
-    _validate_background_color = field_validator("background_color")(Colors.validate_color)
-
-
-class TextBox(BECConnector, QTextEdit):
-
-    USER_ACCESS = ["set_color", "set_text", "set_font_size"]
-
-    def __init__(self, parent=None, text: str = "", client=None, config=None, gui_id=None):
-        if config is None:
-            config = TextBoxConfig(widget_class=self.__class__.__name__)
-        else:
-            if isinstance(config, dict):
-                config = TextBoxConfig(**config)
-            self.config = config
-        super().__init__(client=client, config=config, gui_id=gui_id)
-        QTextEdit.__init__(self, parent=parent)
-
-        self.config = config
-        self.setReadOnly(True)
-        self.setGeometry(self.rect())
-        self.set_color(self.config.background_color, self.config.font_color)
-        if not text:
-            text = "<h1>Welcome to the BEC Widget TextBox</h1><p>A widget that allows user to display text in plain and HTML format.</p><p>This is an example of displaying HTML text.</p>"
-        self.set_text(text)
-
-    def change_theme(self) -> None:
-        """
-        Change the theme of the figure widget.
-        """
-        if self.config.theme == "dark":
-            theme = "light"
-            font_color = "#000"
-            background_color = "#FFF"
-        else:
-            theme = "dark"
-            font_color = "#FFF"
-            background_color = "#000"
-        self.config.theme = theme
-        self.set_color(background_color, font_color)
-
-    def set_color(self, background_color: str, font_color: str) -> None:
-        """Set the background color of the widget.
-
-        Args:
-            background_color (str): The color to set the background in HEX.
-            font_color (str): The color to set the font in HEX.
-
-        """
-        self.config.background_color = background_color
-        self.config.font_color = font_color
-        self._update_stylesheet()
-
-    def set_font_size(self, size: int) -> None:
-        """Set the font size of the text in the widget.
-
-        Args:
-            size (int): The font size to set.
-        """
-        self.config.font_size = size
-        self._update_stylesheet()
-
-    def _update_stylesheet(self):
-        """Update the stylesheet of the widget."""
-        self.setStyleSheet(
-            f"background-color: {self.config.background_color}; color: {self.config.font_color}; font-size: {self.config.font_size}px"
-        )
-
-    def set_text(self, text: str) -> None:
-        """Set the text of the widget.
-
-        Args:
-            text (str): The text to set.
-        """
-        if self.is_html(text):
-            self.setHtml(text)
-        else:
-            self.setPlainText(text)
-        self.config.text = text
-
-    def is_html(self, text: str) -> bool:
-        """Check if the text contains HTML tags.
-
-        Args:
-            text (str): The text to check.
-
-        Returns:
-            bool: True if the text contains HTML tags, False otherwise.
-        """
-        return bool(re.search(r"<[a-zA-Z/][^>]*>", text))
-
-
-if __name__ == "__main__":
-    import sys
-
-    from qtpy.QtWidgets import QApplication
-
-    app = QApplication(sys.argv)
-
-    widget = TextBox()
-    widget.show()
-    sys.exit(app.exec())

bec_widgets/widgets/vscode/vscode.py

@@ -1,93 +0,0 @@
-import os
-import select
-import shlex
-import signal
-import subprocess
-import sys
-
-from bec_widgets.widgets.website.website import WebsiteWidget
-
-
-class VSCodeEditor(WebsiteWidget):
-    """
-    A widget to display the VSCode editor.
-    """
-
-    token = "bec"
-    host = "127.0.0.1"
-    port = 7000
-
-    USER_ACCESS = []
-
-    def __init__(self, parent=None, config=None, client=None, gui_id=None):
-
-        self.process = None
-        self._url = f"http://{self.host}:{self.port}?tkn={self.token}"
-        super().__init__(parent=parent, config=config, client=client, gui_id=gui_id)
-        self.start_server()
-
-    def start_server(self):
-        """
-        Start the server.
-
-        This method starts the server for the VSCode editor in a subprocess.
-        """
-
-        cmd = shlex.split(
-            f"code serve-web --port {self.port} --connection-token={self.token} --accept-server-license-terms"
-        )
-        self.process = subprocess.Popen(
-            cmd, text=True, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, preexec_fn=os.setsid
-        )
-
-        os.set_blocking(self.process.stdout.fileno(), False)
-        while self.process.poll() is None:
-            readylist, _, _ = select.select([self.process.stdout], [], [], 1)
-            if self.process.stdout in readylist:
-                output = self.process.stdout.read(1024)
-                if output and f"available at {self._url}" in output:
-                    break
-        self.set_url(self._url)
-
-    def closeEvent(self, event):
-        """
-        Hook for the close event to terminate the server.
-        """
-        self.cleanup_vscode()
-        super().closeEvent(event)
-
-    def cleanup_vscode(self):
-        """
-        Cleanup the VSCode editor.
-        """
-        if not self.process or self.process.poll() is not None:
-            return
-        os.killpg(os.getpgid(self.process.pid), signal.SIGTERM)
-        self.process.wait()
-
-    def cleanup(self):
-        """
-        Cleanup the widget. This method is called from the dock area when the widget is removed.
-        """
-        self.cleanup_vscode()
-        return super().cleanup()
-
-    def close(self):
-        """
-        Close the widget.
-        """
-        self.cleanup_vscode()
-        return super().close()
-
-
-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
-    from qtpy.QtWidgets import QApplication
-
-    app = QApplication(sys.argv)
-    widget = VSCodeEditor()
-    widget.show()
-    app.exec_()
-    widget.bec_dispatcher.disconnect_all()
-    widget.client.shutdown()

bec_widgets/widgets/website/website.py

@@ -1,74 +0,0 @@
-from qtpy.QtCore import QUrl, qInstallMessageHandler
-from qtpy.QtWebEngineWidgets import QWebEngineView
-from qtpy.QtWidgets import QApplication
-
-from bec_widgets.utils import BECConnector
-
-
-def suppress_qt_messages(type_, context, msg):
-    if context.category in ["js", "default"]:
-        return
-    print(msg)
-
-
-qInstallMessageHandler(suppress_qt_messages)
-
-
-class WebsiteWidget(BECConnector, QWebEngineView):
-    """
-    A simple widget to display a website
-    """
-
-    USER_ACCESS = ["set_url", "get_url", "reload", "back", "forward"]
-
-    def __init__(self, parent=None, url: str = None, config=None, client=None, gui_id=None):
-        super().__init__(client=client, config=config, gui_id=gui_id)
-        QWebEngineView.__init__(self, parent=parent)
-        self.set_url(url)
-
-    def set_url(self, url: str) -> None:
-        """
-        Set the url of the website widget
-
-        Args:
-            url (str): The url to set
-        """
-        if not url:
-            return
-        self.setUrl(QUrl(url))
-
-    def get_url(self) -> str:
-        """
-        Get the current url of the website widget
-
-        Returns:
-            str: The current url
-        """
-        return self.url().toString()
-
-    def reload(self):
-        """
-        Reload the website
-        """
-        QWebEngineView.reload(self)
-
-    def back(self):
-        """
-        Go back in the history
-        """
-        QWebEngineView.back(self)
-
-    def forward(self):
-        """
-        Go forward in the history
-        """
-        QWebEngineView.forward(self)
-
-
-if __name__ == "__main__":
-    import sys
-
-    app = QApplication(sys.argv)
-    mainWin = WebsiteWidget("https://scilog.psi.ch")
-    mainWin.show()
-    sys.exit(app.exec())

docs/assets/apps_48dp.svg

@@ -1 +0,0 @@
-<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

@@ -1 +0,0 @@
-<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>