fix: prel. support for config_plotter with widgets instead of items

.gitlab-ci.yml

@@ -6,14 +6,10 @@ image: $CI_DOCKER_REGISTRY/python:3.9
 variables:
   DOCKER_TLS_CERTDIR: ""
 
-include:
-  - template: Security/Secret-Detection.gitlab-ci.yml
-
-
 # different stages in the pipeline
 stages:
   - Formatter
-  - test
+  - Unittests
   - Deploy
 
 formatter:
@@ -39,7 +35,7 @@ pylint:
     expire_in: 1 week
 
 tests:
-  stage: test
+  stage: Unittests
   needs: []
   variables:
       QT_QPA_PLATFORM: "offscreen"
@@ -72,7 +68,7 @@ semver:
     - git tag
 
     # build
-    - pip install python-semantic-release==7.* wheel
+    - pip install python-semantic-release wheel
     - export GL_TOKEN=$CI_UPDATES
     - export REPOSITORY_USERNAME=__token__
     - export REPOSITORY_PASSWORD=$CI_PYPI_TOKEN
@@ -98,4 +94,4 @@ semver:
 #     - curl -X POST -d "branches=$CI_COMMIT_REF_NAME" -d "token=$RTD_TOKEN" https://readthedocs.org/api/v2/webhook/beamline-experiment-control/221870/
 #   rules:
 #     - if: '$CI_COMMIT_REF_NAME == "master"'
-#     - if: '$CI_COMMIT_REF_NAME == "production"'
+#     - if: '$CI_COMMIT_REF_NAME == "production"'

.pylintrc

@@ -1,581 +0,0 @@
-[MASTER]
-
-# A comma-separated list of package or module names from where C extensions may
-# be loaded. Extensions are loading into the active Python interpreter and may
-# run arbitrary code.
-extension-pkg-allow-list=PyQt5, pyqtgraph
-
-# A comma-separated list of package or module names from where C extensions may
-# be loaded. Extensions are loading into the active Python interpreter and may
-# run arbitrary code. (This is an alternative name to extension-pkg-allow-list
-# for backward compatibility.)
-extension-pkg-whitelist=
-
-# Return non-zero exit code if any of these messages/categories are detected,
-# even if score is above --fail-under value. Syntax same as enable. Messages
-# specified are enabled, while categories only check already-enabled messages.
-fail-on=
-
-# Specify a score threshold to be exceeded before program exits with error.
-fail-under=8.0
-
-# Files or directories to be skipped. They should be base names, not paths.
-ignore=CVS
-
-# Add files or directories matching the regex patterns to the ignore-list. The
-# regex matches against paths and can be in Posix or Windows format.
-ignore-paths=
-
-# Files or directories matching the regex patterns are skipped. The regex
-# matches against base names, not paths.
-ignore-patterns=
-
-# Python code to execute, usually for sys.path manipulation such as
-# pygtk.require().
-#init-hook=
-
-# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the
-# number of processors available to use.
-jobs=1
-
-# Control the amount of potential inferred values when inferring a single
-# object. This can help the performance when dealing with large functions or
-# complex, nested conditions.
-limit-inference-results=100
-
-# List of plugins (as comma separated values of python module names) to load,
-# usually to register additional checkers.
-load-plugins=
-
-# Pickle collected data for later comparisons.
-persistent=yes
-
-# Minimum Python version to use for version dependent checks. Will default to
-# the version used to run pylint.
-py-version=3.9
-
-# When enabled, pylint would attempt to guess common misconfiguration and emit
-# user-friendly hints instead of false-positive error messages.
-suggestion-mode=yes
-
-# Allow loading of arbitrary C extensions. Extensions are imported into the
-# active Python interpreter and may run arbitrary code.
-unsafe-load-any-extension=no
-
-
-[MESSAGES CONTROL]
-
-# Only show warnings with the listed confidence levels. Leave empty to show
-# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED.
-confidence=
-
-# Disable the message, report, category or checker with the given id(s). You
-# can either give multiple identifiers separated by comma (,) or put this
-# option multiple times (only on the command line, not in the configuration
-# file where it should appear only once). You can also use "--disable=all" to
-# disable everything first and then reenable specific checks. For example, if
-# you want to run only the similarities checker, you can use "--disable=all
-# --enable=similarities". If you want to run only the classes checker, but have
-# no Warning level messages displayed, use "--disable=all --enable=classes
-# --disable=W".
-disable=missing-module-docstring,
-        missing-class-docstring,
-        import-error,
-        no-name-in-module,
-        raw-checker-failed,
-        bad-inline-option,
-        locally-disabled,
-        file-ignored,
-        suppressed-message,
-        deprecated-pragma,
-        use-symbolic-message-instead,
-        unused-wildcard-import,
-        logging-fstring-interpolation,
-        line-too-long,
-        too-many-instance-attributes,
-        wrong-import-order
-
-# Enable the message, report, category or checker with the given id(s). You can
-# either give multiple identifier separated by comma (,) or put this option
-# multiple time (only on the command line, not in the configuration file where
-# it should appear only once). See also the "--disable" option for examples.
-enable=c-extension-no-member
-
-
-[REPORTS]
-
-# Python expression which should return a score less than or equal to 10. You
-# have access to the variables 'error', 'warning', 'refactor', and 'convention'
-# which contain the number of messages in each category, as well as 'statement'
-# which is the total number of statements analyzed. This score is used by the
-# global evaluation report (RP0004).
-evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
-
-# Template used to display messages. This is a python new-style format string
-# used to format the message information. See doc for all details.
-#msg-template=
-
-# Set the output format. Available formats are text, parseable, colorized, json
-# and msvs (visual studio). You can also give a reporter class, e.g.
-# mypackage.mymodule.MyReporterClass.
-output-format=text
-
-# Tells whether to display a full report or only the messages.
-reports=no
-
-# Activate the evaluation score.
-score=yes
-
-
-[REFACTORING]
-
-# Maximum number of nested blocks for function / method body
-max-nested-blocks=5
-
-# Complete name of functions that never returns. When checking for
-# inconsistent-return-statements if a never returning function is called then
-# it will be considered as an explicit return statement and no message will be
-# printed.
-never-returning-functions=sys.exit,argparse.parse_error
-
-
-[LOGGING]
-
-# The type of string formatting that logging methods do. `old` means using %
-# formatting, `new` is for `{}` formatting.
-logging-format-style=old
-
-# Logging modules to check that the string format arguments are in logging
-# function parameter format.
-logging-modules=logging
-
-
-[SPELLING]
-
-# Limits count of emitted suggestions for spelling mistakes.
-max-spelling-suggestions=4
-
-# Spelling dictionary name. Available dictionaries: none. To make it work,
-# install the 'python-enchant' package.
-spelling-dict=
-
-# List of comma separated words that should be considered directives if they
-# appear and the beginning of a comment and should not be checked.
-spelling-ignore-comment-directives=fmt: on,fmt: off,noqa:,noqa,nosec,isort:skip,mypy:
-
-# List of comma separated words that should not be checked.
-spelling-ignore-words=
-
-# A path to a file that contains the private dictionary; one word per line.
-spelling-private-dict-file=
-
-# Tells whether to store unknown words to the private dictionary (see the
-# --spelling-private-dict-file option) instead of raising a message.
-spelling-store-unknown-words=no
-
-
-[MISCELLANEOUS]
-
-# List of note tags to take in consideration, separated by a comma.
-notes=FIXME,
-      XXX,
-      TODO
-
-# Regular expression of note tags to take in consideration.
-#notes-rgx=
-
-
-[TYPECHECK]
-
-# List of decorators that produce context managers, such as
-# contextlib.contextmanager. Add to this list to register other decorators that
-# produce valid context managers.
-contextmanager-decorators=contextlib.contextmanager
-
-# List of members which are set dynamically and missed by pylint inference
-# system, and so shouldn't trigger E1101 when accessed. Python regular
-# expressions are accepted.
-generated-members=
-
-# Tells whether missing members accessed in mixin class should be ignored. A
-# class is considered mixin if its name matches the mixin-class-rgx option.
-ignore-mixin-members=yes
-
-# Tells whether to warn about missing members when the owner of the attribute
-# is inferred to be None.
-ignore-none=yes
-
-# This flag controls whether pylint should warn about no-member and similar
-# checks whenever an opaque object is returned when inferring. The inference
-# can return multiple potential results while evaluating a Python object, but
-# some branches might not be evaluated, which results in partial inference. In
-# that case, it might be useful to still emit no-member and other checks for
-# the rest of the inferred objects.
-ignore-on-opaque-inference=yes
-
-# List of class names for which member attributes should not be checked (useful
-# for classes with dynamically set attributes). This supports the use of
-# qualified names.
-ignored-classes=optparse.Values,thread._local,_thread._local
-
-# List of module names for which member attributes should not be checked
-# (useful for modules/projects where namespaces are manipulated during runtime
-# and thus existing member attributes cannot be deduced by static analysis). It
-# supports qualified module names, as well as Unix pattern matching.
-ignored-modules=
-
-# Show a hint with possible names when a member name was not found. The aspect
-# of finding the hint is based on edit distance.
-missing-member-hint=yes
-
-# The minimum edit distance a name should have in order to be considered a
-# similar match for a missing member name.
-missing-member-hint-distance=1
-
-# The total number of similar names that should be taken in consideration when
-# showing a hint for a missing member.
-missing-member-max-choices=1
-
-# Regex pattern to define which classes are considered mixins ignore-mixin-
-# members is set to 'yes'
-mixin-class-rgx=.*[Mm]ixin
-
-# List of decorators that change the signature of a decorated function.
-signature-mutators=
-
-
-[VARIABLES]
-
-# List of additional names supposed to be defined in builtins. Remember that
-# you should avoid defining new builtins when possible.
-additional-builtins=
-
-# Tells whether unused global variables should be treated as a violation.
-allow-global-unused-variables=yes
-
-# List of names allowed to shadow builtins
-allowed-redefined-builtins=
-
-# List of strings which can identify a callback function by name. A callback
-# name must start or end with one of those strings.
-callbacks=cb_,
-          _cb
-
-# A regular expression matching the name of dummy variables (i.e. expected to
-# not be used).
-dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_
-
-# Argument names that match this expression will be ignored. Default to name
-# with leading underscore.
-ignored-argument-names=_.*|^ignored_|^unused_
-
-# Tells whether we should check for unused import in __init__ files.
-init-import=no
-
-# List of qualified module names which can have objects that can redefine
-# builtins.
-redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
-
-
-[FORMAT]
-
-# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
-expected-line-ending-format=
-
-# Regexp for a line that is allowed to be longer than the limit.
-ignore-long-lines=^\s*(# )?<?https?://\S+>?$
-
-# Number of spaces of indent required inside a hanging or continued line.
-indent-after-paren=4
-
-# String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
-# tab).
-indent-string='    '
-
-# Maximum number of characters on a single line.
-max-line-length=100
-
-# Maximum number of lines in a module.
-max-module-lines=1000
-
-# Allow the body of a class to be on the same line as the declaration if body
-# contains single statement.
-single-line-class-stmt=no
-
-# Allow the body of an if to be on the same line as the test if there is no
-# else.
-single-line-if-stmt=no
-
-
-[SIMILARITIES]
-
-# Comments are removed from the similarity computation
-ignore-comments=yes
-
-# Docstrings are removed from the similarity computation
-ignore-docstrings=yes
-
-# Imports are removed from the similarity computation
-ignore-imports=no
-
-# Signatures are removed from the similarity computation
-ignore-signatures=no
-
-# Minimum lines number of a similarity.
-min-similarity-lines=4
-
-
-[BASIC]
-
-# Naming style matching correct argument names.
-argument-naming-style=snake_case
-
-# Regular expression matching correct argument names. Overrides argument-
-# naming-style.
-#argument-rgx=
-
-# Naming style matching correct attribute names.
-attr-naming-style=snake_case
-
-# Regular expression matching correct attribute names. Overrides attr-naming-
-# style.
-#attr-rgx=
-
-# Bad variable names which should always be refused, separated by a comma.
-bad-names=foo,
-          bar,
-          baz,
-          toto,
-          tutu,
-          tata
-
-# Bad variable names regexes, separated by a comma. If names match any regex,
-# they will always be refused
-bad-names-rgxs=
-
-# Naming style matching correct class attribute names.
-class-attribute-naming-style=any
-
-# Regular expression matching correct class attribute names. Overrides class-
-# attribute-naming-style.
-#class-attribute-rgx=
-
-# Naming style matching correct class constant names.
-class-const-naming-style=UPPER_CASE
-
-# Regular expression matching correct class constant names. Overrides class-
-# const-naming-style.
-#class-const-rgx=
-
-# Naming style matching correct class names.
-class-naming-style=PascalCase
-
-# Regular expression matching correct class names. Overrides class-naming-
-# style.
-#class-rgx=
-
-# Naming style matching correct constant names.
-const-naming-style=UPPER_CASE
-
-# Regular expression matching correct constant names. Overrides const-naming-
-# style.
-#const-rgx=
-
-# Minimum line length for functions/classes that require docstrings, shorter
-# ones are exempt.
-docstring-min-length=-1
-
-# Naming style matching correct function names.
-function-naming-style=snake_case
-
-# Regular expression matching correct function names. Overrides function-
-# naming-style.
-#function-rgx=
-
-# Good variable names which should always be accepted, separated by a comma.
-good-names=i,
-           ii,
-           jj,
-           kk,
-           dr,
-           j,
-           k,
-           ex,
-           Run,
-           cb,
-           _
-
-# Good variable names regexes, separated by a comma. If names match any regex,
-# they will always be accepted
-good-names-rgxs=.*scanID.*,.*RID.*,.*pointID.*,.*ID.*,.*_2D.*,.*_1D.*
-
-# Include a hint for the correct naming format with invalid-name.
-include-naming-hint=no
-
-# Naming style matching correct inline iteration names.
-inlinevar-naming-style=any
-
-# Regular expression matching correct inline iteration names. Overrides
-# inlinevar-naming-style.
-#inlinevar-rgx=
-
-# Naming style matching correct method names.
-method-naming-style=snake_case
-
-# Regular expression matching correct method names. Overrides method-naming-
-# style.
-#method-rgx=
-
-# Naming style matching correct module names.
-module-naming-style=snake_case
-
-# Regular expression matching correct module names. Overrides module-naming-
-# style.
-#module-rgx=
-
-# Colon-delimited sets of names that determine each other's naming style when
-# the name regexes allow several styles.
-name-group=
-
-# Regular expression which should only match function or class names that do
-# not require a docstring.
-no-docstring-rgx=^_
-
-# List of decorators that produce properties, such as abc.abstractproperty. Add
-# to this list to register other decorators that produce valid properties.
-# These decorators are taken in consideration only for invalid-name.
-property-classes=abc.abstractproperty
-
-# Naming style matching correct variable names.
-variable-naming-style=snake_case
-
-# Regular expression matching correct variable names. Overrides variable-
-# naming-style.
-#variable-rgx=
-
-
-[STRING]
-
-# This flag controls whether inconsistent-quotes generates a warning when the
-# character used as a quote delimiter is used inconsistently within a module.
-check-quote-consistency=no
-
-# This flag controls whether the implicit-str-concat should generate a warning
-# on implicit string concatenation in sequences defined over several lines.
-check-str-concat-over-line-jumps=no
-
-
-[IMPORTS]
-
-# List of modules that can be imported at any level, not just the top level
-# one.
-allow-any-import-level=
-
-# Allow wildcard imports from modules that define __all__.
-allow-wildcard-with-all=no
-
-# Analyse import fallback blocks. This can be used to support both Python 2 and
-# 3 compatible code, which means that the block might have code that exists
-# only in one or another interpreter, leading to false positives when analysed.
-analyse-fallback-blocks=no
-
-# Deprecated modules which should not be used, separated by a comma.
-deprecated-modules=
-
-# Output a graph (.gv or any supported image format) of external dependencies
-# to the given file (report RP0402 must not be disabled).
-ext-import-graph=
-
-# Output a graph (.gv or any supported image format) of all (i.e. internal and
-# external) dependencies to the given file (report RP0402 must not be
-# disabled).
-import-graph=
-
-# Output a graph (.gv or any supported image format) of internal dependencies
-# to the given file (report RP0402 must not be disabled).
-int-import-graph=
-
-# Force import order to recognize a module as part of the standard
-# compatibility libraries.
-known-standard-library=
-
-# Force import order to recognize a module as part of a third party library.
-known-third-party=enchant
-
-# Couples of modules and preferred modules, separated by a comma.
-preferred-modules=
-
-
-[CLASSES]
-
-# Warn about protected attribute access inside special methods
-check-protected-access-in-special-methods=no
-
-# List of method names used to declare (i.e. assign) instance attributes.
-defining-attr-methods=__init__,
-                      __new__,
-                      setUp,
-                      __post_init__
-
-# List of member names, which should be excluded from the protected access
-# warning.
-exclude-protected=_asdict,
-                  _fields,
-                  _replace,
-                  _source,
-                  _make
-
-# List of valid names for the first argument in a class method.
-valid-classmethod-first-arg=cls
-
-# List of valid names for the first argument in a metaclass class method.
-valid-metaclass-classmethod-first-arg=cls
-
-
-[DESIGN]
-
-# List of regular expressions of class ancestor names to ignore when counting
-# public methods (see R0903)
-exclude-too-few-public-methods=
-
-# List of qualified class names to ignore when counting class parents (see
-# R0901)
-ignored-parents=
-
-# Maximum number of arguments for function / method.
-max-args=5
-
-# Maximum number of attributes for a class (see R0902).
-max-attributes=7
-
-# Maximum number of boolean expressions in an if statement (see R0916).
-max-bool-expr=5
-
-# Maximum number of branch for function / method body.
-max-branches=12
-
-# Maximum number of locals for function / method body.
-max-locals=15
-
-# Maximum number of parents for a class (see R0901).
-max-parents=7
-
-# Maximum number of public methods for a class (see R0904).
-max-public-methods=20
-
-# Maximum number of return / yield for function / method body.
-max-returns=6
-
-# Maximum number of statements in function / method body.
-max-statements=50
-
-# Minimum number of public methods for a class (see R0903).
-min-public-methods=2
-
-
-[EXCEPTIONS]
-
-# Exceptions that will emit a warning when being caught. Defaults to
-# "BaseException, Exception".
-overgeneral-exceptions=BaseException,
-                       Exception

CHANGELOG.md

@@ -2,32 +2,6 @@
 
 <!--next-version-placeholder-->
 
-## v0.3.0 (2023-07-19)
-
-### Feature
-
-* Add auto-computed color_list from colormaps ([`3e1708b`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/3e1708bf48bc15a25c0d01242fff28d6db868e02))
-* Add functionality for plotting multiple signals ([`10e2906`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/10e29064455f50bc3b66c55b4361575957db1489))
-* Added lineplot widget ([`989a3f0`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/989a3f080839b98f1e1c2118600cddf449120124))
-* Added ctrl_c from grum ([`8fee13a`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/8fee13a67bef3ed6ed6de9d47438f04687f548d8))
-
-### Fix
-
-* Add warning for non-existing signalz ([`48075e4`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/48075e4fe3187f6ac8d0b61f94f8df73b8fd6daf))
-* Documentation and bugfix for mouse_moved ([`a460f3c`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/a460f3c0bd7b9e106a758bc330f361868407b1e3))
-
-### Documentation
-
-* Add notes about qt designer install via conda-forge ([`d8038a8`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/d8038a8cd0efa3a16df403390164603e4e8afdd8))
-* Added license ([`db2d33e`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/db2d33e8912dc493cce9ee7f09d8336155110079))
-
-## v0.2.1 (2023-07-13)
-
-### Fix
-
-* Fixed setup config (wrong name) ([`947db1e`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/947db1e0f32b067e67f94a7c8321da5194b1547b))
-* Fixed bec_lib dependency ([`86f4def`](https://gitlab.psi.ch/bec/bec-widgets/-/commit/86f4deffd899111e8997010487ec54c6c62c43ab))
-
 ## v0.2.0 (2023-07-13)
 
 ### Feature

LICENSE

@@ -1,29 +0,0 @@
-BSD 3-Clause License
-
-Copyright (c) 2023, bec
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

bec_widgets/cli.py

@@ -2,12 +2,12 @@ import argparse
 import os
 from threading import RLock
 
-from bec_lib.core import BECMessage, MessageEndpoints, RedisConnector
 from PyQt5 import uic
 from PyQt5.QtCore import pyqtSignal
 from PyQt5.QtWidgets import QApplication, QMainWindow
+from scan_plot import BECScanPlot
 
-from .scan_plot import BECScanPlot
+from bec_lib.core import BECMessage, MessageEndpoints, RedisConnector
 
 
 class BEC_UI(QMainWindow):

bec_widgets/config_plotter.py

@@ -2,11 +2,12 @@ from typing import List
 
 import numpy as np
 import pyqtgraph as pg
+from PyQt5.QtWidgets import QApplication, QGridLayout, QSizePolicy, QWidget
 from pyqtgraph import mkPen
-from pyqtgraph.Qt import QtCore, QtWidgets
+from pyqtgraph.Qt import QtCore
 
 
-class ConfigPlotter(pg.GraphicsWidget):
+class ConfigPlotter(QWidget):
     """
     ConfigPlotter is a widget that can be used to plot data from multiple channels
     in a grid layout. The layout is specified by a list of dicts, where each dict
@@ -28,7 +29,7 @@ class ConfigPlotter(pg.GraphicsWidget):
     """
 
     def __init__(self, configs: List[dict], parent=None):
-        super().__init__(parent)
+        super(ConfigPlotter, self).__init__()
         self.configs = configs
         self.plots = {}
         self._init_ui()
@@ -37,65 +38,73 @@ class ConfigPlotter(pg.GraphicsWidget):
     def _init_ui(self):
         pg.setConfigOption("background", "w")
         pg.setConfigOption("foreground", "k")
-
-        # pylint: disable=no-member
+        self.layout = QGridLayout()
+        self.setLayout(self.layout)
         self.pen = mkPen(color=(56, 76, 107), width=4, style=QtCore.Qt.SolidLine)
-
-        self.view = pg.GraphicsView()
-        self.view.setAntialiasing(True)
-        self.view.show()
-
-        self.layout = pg.GraphicsLayout()
-        self.view.setCentralWidget(self.layout)
+        self.show()
 
     def _init_plots(self):
         for config in self.configs:
             channels = config["config"]["channels"]
             for channel in channels:
-                item = pg.PlotItem()
-                self.layout.addItem(
-                    item,
-                    row=config["y"],
-                    col=config["x"],
-                    rowspan=config["rows"],
-                    colspan=config["cols"],
-                )
-
                 # call the corresponding init function, e.g. init_plotitem
                 init_func = getattr(self, f"init_{config['config']['item']}")
-                init_func(channel, config["config"], item)
+                init_func(channel, config)
 
                 # self.init_ImageItem(channel, config["config"], item)
 
-    def init_PlotItem(self, channel: str, config: dict, item: pg.GraphicsItem):
+    def init_PlotItem(self, channel: str, config: dict):
         """
         Initialize a PlotItem
 
         Args:
             channel(str): channel to plot
             config(dict): config dict for the channel
-            item(pg.GraphicsItem): PlotItem to plot the data
         """
         # pylint: disable=invalid-name
-        plot_data = item.plot(np.random.rand(100), pen=self.pen)
-        item.setLabel("left", channel)
-        self.plots[channel] = {"item": item, "plot_data": plot_data}
+        plot_widget = pg.PlotWidget()
+        plot_widget.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
+        self.layout.addWidget(plot_widget, config["y"], config["x"], config["rows"], config["cols"])
+        plot_data = plot_widget.plot(np.random.rand(100), pen=self.pen)
+        # item.setLabel("left", channel)
+        # self.plots[channel] = {"item": item, "plot_data": plot_data}
 
-    def init_ImageItem(self, channel: str, config: dict, item: pg.GraphicsItem):
+    def init_ImageItem(self, channel: str, config: dict):
         """
         Initialize an ImageItem
 
         Args:
             channel(str): channel to plot
             config(dict): config dict for the channel
-            item(pg.GraphicsItem): ImageItem to plot the data
         """
         # pylint: disable=invalid-name
+        item = pg.PlotItem()
+        self.layout.addItem(
+            item,
+            row=config["y"],
+            col=config["x"],
+            rowspan=config["rows"],
+            colspan=config["cols"],
+        )
         img = pg.ImageItem()
         item.addItem(img)
         img.setImage(np.random.rand(100, 100))
         self.plots[channel] = {"item": item, "plot_data": img}
 
+    def init_ImageView(self, channel: str, config: dict):
+        """
+        Initialize an ImageView
+
+        Args:
+            channel(str): channel to plot
+            config(dict): config dict for the channel
+        """
+        # pylint: disable=invalid-name
+        img = pg.ImageView()
+        img.setImage(np.random.rand(100, 100))
+        self.layout.addWidget(img, config["y"], config["x"], config["rows"], config["cols"])
+        self.plots[channel] = {"item": img, "plot_data": img}
+
 
 if __name__ == "__main__":
     import sys
@@ -120,10 +129,10 @@ if __name__ == "__main__":
             "rows": 2,
             "y": 0,
             "x": 1,
-            "config": {"channels": ["c"], "label_xy": ["", "c"], "item": "ImageItem"},
+            "config": {"channels": ["c"], "label_xy": ["", "c"], "item": "ImageView"},
         },
     ]
 
-    app = QtWidgets.QApplication(sys.argv)
+    app = QApplication(sys.argv)
     win = ConfigPlotter(CONFIG)
     pg.exec()

bec_widgets/ctrl_c.py

@@ -1,38 +0,0 @@
-import signal
-import socket
-from PyQt5.QtNetwork import QAbstractSocket
-
-
-def setup(app):
-    app.signalwatchdog = SignalWatchdog()  # need to store to keep socket pair alive
-    signal.signal(signal.SIGINT, make_quit_handler(app))
-
-
-def make_quit_handler(app):
-    def handler(*args):
-        print()  # make ^C appear on its own line
-        app.quit()
-
-    return handler
-
-
-class SignalWatchdog(QAbstractSocket):
-    def __init__(self):
-        """
-        Propagates system signals from Python to QEventLoop
-        adapted from https://stackoverflow.com/a/65802260/655404
-        """
-        super().__init__(QAbstractSocket.SctpSocket, None)
-
-        self.writer, self.reader = writer, reader = socket.socketpair()
-        writer.setblocking(False)
-
-        fd_writer = writer.fileno()
-        fd_reader = reader.fileno()
-
-        signal.set_wakeup_fd(fd_writer)  # Python hook
-        self.setSocketDescriptor(fd_reader)  # Qt hook
-
-        self.readyRead.connect(
-            lambda: None
-        )  # dummy function call that lets the Python interpreter run

bec_widgets/line_plot.py

@@ -1,273 +0,0 @@
-import os
-import warnings
-from typing import Any
-
-import numpy as np
-import pyqtgraph as pg
-from bec_lib import BECClient
-from pyqtgraph import mkBrush, mkColor, mkPen
-from pyqtgraph.Qt import QtCore, QtWidgets, uic
-from pyqtgraph.Qt.QtCore import pyqtSignal
-
-
-class BasicPlot(QtWidgets.QWidget):
-    update_signal = pyqtSignal()
-
-    def __init__(self, name="", y_value_list=["gauss_bpm"]) -> 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"].
-        """
-
-        super(BasicPlot, self).__init__()
-        # Set style for pyqtgraph plots
-        pg.setConfigOption("background", "w")
-        pg.setConfigOption("foreground", "k")
-        current_path = os.path.dirname(__file__)
-        uic.loadUi(os.path.join(current_path, "line_plot.ui"), self)
-
-        self._idle_time = 100
-        self.title = ""
-        self.label_bottom = ""
-        self.label_left = ""
-
-        self.scan_motors = []
-        self.y_value_list = y_value_list
-        self.plotter_data_x = []
-        self.plotter_data_y = []
-        self.curves = []
-        self.pens = []
-        self.brushs = []
-
-        self.plotter_scan_id = None
-
-        # TODO to be moved to utils function
-        plotstyles = {
-            "symbol": "o",
-            "symbolSize": 10,
-        }
-        color_list = ["#384c6b", "#e28a2b", "#5E3023", "#e41a1c", "#984e83", "#4daf4a"]
-        color_list = BasicPlot.golden_angle_color(colormap="CET-R2", num=len(self.y_value_list))
-
-        # setup plots
-        self.plot = self.plot_window.getPlotItem()
-        for ii in range(len(self.y_value_list)):
-            pen = mkPen(color=color_list[ii], width=2, style=QtCore.Qt.DashLine)
-            brush = mkBrush(color=color_list[ii])
-            curve = pg.PlotDataItem(**plotstyles, symbolBrush=brush, pen=pen, skipFiniteCheck=True)
-            self.plot.addItem(curve)
-            self.curves.append(curve)
-            self.pens.append(pen)
-            self.brushs.append(brush)
-
-        self.crosshair_v = pg.InfiniteLine(angle=90, movable=False)
-        self.plot.addItem(self.crosshair_v, ignoreBounds=True)
-
-        # Add textItems
-        self.add_text_items()
-
-        # Manage signals
-        self.proxy = pg.SignalProxy(
-            self.plot.scene().sigMouseMoved, rateLimit=60, slot=self.mouse_moved
-        )
-        self.proxy_update = pg.SignalProxy(self.update_signal, rateLimit=25, slot=self.update)
-
-    def add_text_items(self):
-        """Add text items to the plot"""
-
-        self.mouse_box_data.setText("Mouse cursor")
-        # TODO Via StyleSheet, one may set the color of the full QLabel
-        # self.mouse_box_data.setStyleSheet(f"QLabel {{color : rgba{self.pens[0].color().getRgb()}}}")
-
-    def mouse_moved(self, event: tuple) -> None:
-        """
-        Update the mouse box with the current mouse position and the corresponding data.
-
-        Args:
-            event (tuple):  Mouse event containing the position of the mouse cursor.
-                            The position is stored in first entry as horizontal, vertical pixel.
-        """
-        pos = event[0]
-        if not self.plot.sceneBoundingRect().contains(pos):
-            return
-        mousePoint = self.plot.vb.mapSceneToView(pos)
-        self.crosshair_v.setPos(mousePoint.x())
-        if not self.plotter_data_x:
-            return
-        self.mouse_box_data.setText("Mouse cursor")
-
-        for ii, y_value in enumerate(self.y_value_list):
-            closest_point = self.closest_x_y_value(
-                mousePoint.x(), self.plotter_data_x, self.plotter_data_y[ii]
-            )
-            # TODO fix text wobble in plot, see plot when it crosses 0
-            x_data = f"{closest_point[0]:.{self.precision}f}"
-            y_data = f"{closest_point[1]:.{self.precision}f}"
-            string_cap = 10
-            self.mouse_box_data.setText(
-                "".join(
-                    [
-                        self.mouse_box_data.text(),
-                        "\n",
-                        # TODO fix different fonts for mouse cursor!
-                        # f"<p'FONT COLOR=red';>",  # rgba{self.pens[ii].color().getRgb()
-                        f"{y_value}",
-                        "\n",
-                        f"X_data:   {x_data:>{string_cap}}",
-                        "\n",
-                        f"Y_data: {y_data:>{string_cap}}",
-                    ]
-                )
-            )
-
-    def closest_x_y_value(self, input_value, list_x, list_y) -> tuple:
-        """
-        Find the closest x and y value to the input value.
-
-        Args:
-            input_value (float): Input value
-            list_x (list): List of x values
-            list_y (list): List of y values
-
-        Returns:
-            tuple: Closest x and y value
-        """
-        arr = np.asarray(list_x)
-        i = (np.abs(arr - input_value)).argmin()
-        return list_x[i], list_y[i]
-
-    def update(self):
-        """Update the plot with the new data."""
-        if len(self.plotter_data_x) <= 1:
-            return
-        self.plot.setLabel("bottom", self.label_bottom)
-        self.plot.setLabel("left", self.label_left)
-        for ii in range(len(self.y_value_list)):
-            self.curves[ii].setData(self.plotter_data_x, self.plotter_data_y[ii])
-
-    def __call__(self, data: dict, metadata: dict, **kwds: Any) -> None:
-        """Update function that is called during the scan callback. To avoid
-        too many renderings, the GUI is only processing events every <_idle_time> ms.
-
-        Args:
-            data (dict): Dictionary containing a new scan segment
-            metadata (dict): Scan metadata
-
-        """
-        if metadata["scanID"] != self.plotter_scan_id:
-            self.plotter_scan_id = metadata["scanID"]
-            self._reset_plot_data()
-
-        self.title = f"Scan {metadata['scan_number']}"
-
-        self.scan_motors = scan_motors = metadata.get("scan_report_devices")
-        client = BECClient()
-        remove_y_value_index = [
-            index
-            for index, y_value in enumerate(self.y_value_list)
-            if y_value not in client.device_manager.devices
-        ]
-        if remove_y_value_index:
-            for ii in sorted(remove_y_value_index, reverse=True):
-                # TODO Use bec warning message??? to be discussed with Klaus
-                warnings.warn(
-                    f"Warning: no matching signal for {self.y_value_list[ii]} found in list of devices. Removing from plot."
-                )
-                self.y_value_list.pop(ii)
-        self.precision = client.device_manager.devices[scan_motors[0]]._info["describe"][
-            scan_motors[0]
-        ]["precision"]
-        # TODO after update of bec_lib, this will be new way to access data
-        # self.precision = client.device_manager.devices[scan_motors[0]].precision
-        x = data["data"][scan_motors[0]][scan_motors[0]]["value"]
-        self.plotter_data_x.append(x)
-        for ii, y_value in enumerate(self.y_value_list):
-            y = data["data"][y_value][y_value]["value"]
-            self.plotter_data_y[ii].append(y)
-        self.label_bottom = scan_motors[0]
-        self.label_left = f"{', '.join(self.y_value_list)}"
-
-        if len(self.plotter_data_x) <= 1:
-            return
-        self.update_signal.emit()
-
-    def _reset_plot_data(self):
-        """Reset the plot data."""
-        self.plotter_data_x = []
-        self.plotter_data_y = []
-        for ii in range(len(self.y_value_list)):
-            self.curves[ii].setData([], [])
-            self.plotter_data_y.append([])
-        self.mouse_box_data.setText("Mouse cursor")  # Crashes the Thread
-
-    @staticmethod
-    def golden_ratio(num: int) -> list:
-        """Calculate the golden ratio for a given number of angles.
-
-        Args:
-            num (int): Number of angles
-        """
-        phi = 2 * np.pi * ((1 + np.sqrt(5)) / 2)
-        angles = []
-        for ii in range(num):
-            x = np.cos(ii * phi)
-            y = np.sin(ii * phi)
-            angle = np.arctan2(y, x)
-            angles.append(angle)
-        return angles
-
-    @staticmethod
-    def golden_angle_color(colormap: str, num: int) -> list:
-        """
-        Extract num colors for from the specified colormap following golden angle distribution.
-
-        Args:
-            colormap (str): Name of the colormap
-            num (int): Number of requested colors
-
-        Returns:
-            list: List of colors with length <num>
-
-        Raises:
-            ValueError: If the number of requested colors is greater than the number of colors in the colormap.
-        """
-
-        cmap = pg.colormap.get(colormap)
-        cmap_colors = cmap.color
-        if num > len(cmap_colors):
-            raise ValueError(
-                f"Number of colors requested ({num}) is greater than the number of colors in the colormap ({len(cmap_colors)})"
-            )
-        angles = BasicPlot.golden_ratio(len(cmap_colors))
-        color_selection = np.round(np.interp(angles, (-np.pi, np.pi), (0, len(cmap_colors))))
-        colors = [
-            mkColor(tuple((cmap_colors[int(ii)] * 255).astype(int))) for ii in color_selection[:num]
-        ]
-        return colors
-
-
-if __name__ == "__main__":
-    import argparse
-
-    from bec_widgets import ctrl_c
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "--signals",
-        help="specify recorded signals",
-        nargs="+",
-        default=["gauss_bpm", "bpm4i", "bpm5i", "bpm6i", "xert"],
-    )
-    value = parser.parse_args()
-    print(f"Plotting signals for: {', '.join(value.signals)}")
-    client = BECClient()
-    client.start()
-    app = QtWidgets.QApplication([])
-    ctrl_c.setup(app)
-    plot = BasicPlot(y_value_list=value.signals)
-    plot.show()
-    client.callbacks.register("scan_segment", plot, sync=False)
-    app.exec_()

bec_widgets/line_plot.ui

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>layout</class>
- <widget class="QWidget" name="layout">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>800</width>
-    <height>600</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <property name="autoFillBackground">
-   <bool>false</bool>
-  </property>
-  <property name="styleSheet">
-   <string notr="true">background-color: rgb(255, 255, 255);
-border-color: rgb(166, 166, 166);</string>
-  </property>
-  <layout class="QHBoxLayout" name="layout_2">
-   <item>
-    <widget class="PlotWidget" name="plot_window" native="true"/>
-   </item>
-   <item>
-    <spacer name="Spacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>10</width>
-       <height>10</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <widget class="QLabel" name="mouse_box_data">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>TextLabel</string>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>PlotWidget</class>
-   <extends>QWidget</extends>
-   <header>pyqtgraph</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

bec_widgets/readme.md

@@ -2,6 +2,3 @@ Add/modify the path in the following variable to make the plugin avaiable in Qt
 ```
 $ export PYQTDESIGNERPATH=/<path to repo>/bec/bec_qtplugin:$PYQTDESIGNERPATH
 ```
-
-All the available conda-forge `pyqt >=5.15` packages don't seem to support loading Qt Designer
-python plugins at the time of writing. Use `pyqt =5.12` to solve the issue for now.

bec_widgets/scan_plot.py

@@ -1,9 +1,10 @@
 import itertools
 
 import pyqtgraph as pg
-from bec_lib.core.logger import bec_logger
 from PyQt5.QtCore import pyqtProperty, pyqtSlot
 
+from bec_lib.core.logger import bec_logger
+
 logger = bec_logger.logger
 
 
@@ -103,19 +104,3 @@ class BECScanPlot(pg.PlotWidget):
     @x_channel.setter
     def x_channel(self, new_val):
         self._x_channel = new_val
-
-
-if __name__ == "__main__":
-    import sys
-
-    from PyQt5.QtWidgets import QApplication
-
-    app = QApplication(sys.argv)
-
-    plot = BECScanPlot()
-    plot.y_channel_list = ["a", "b", "c"]
-
-    plot.initialize()
-    plot.show()
-
-    sys.exit(app.exec_())

bec_widgets/scan_plot_plugin.py

@@ -1,7 +1,6 @@
 from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin
 from PyQt5.QtGui import QIcon
-
-from .scan_plot import BECScanPlot
+from scan_plot import BECScanPlot
 
 
 class BECScanPlotPlugin(QPyDesignerCustomWidgetPlugin):

setup.cfg

@@ -1,11 +1,11 @@
 [metadata]
-name = bec_widgets
-description = BEC Widgets
+name = bec_lib
+description = BEC library
 long_description = file: README.md
 long_description_content_type = text/markdown
-url = https://gitlab.psi.ch/bec/bec-widgets
+url = https://gitlab.psi.ch/bec/bec
 project_urls =
-    Bug Tracker = https://gitlab.psi.ch/bec/bec-widgets/issues
+    Bug Tracker = https://gitlab.psi.ch/bec/bec/issues
 classifiers =
     Programming Language :: Python :: 3
     Development Status :: 3 - Alpha

setup.py

@@ -1,10 +1,13 @@
 from setuptools import setup
 
-__version__ = "0.3.0"
+__version__ = "0.2.0"
 
 if __name__ == "__main__":
     setup(
-        install_requires=["pyqt5", "pyqtgraph", "bec_lib"],
-        extras_require={"dev": ["pytest", "pytest-random-order", "coverage", "pytest-qt", "black"]},
+        install_requires=[
+            "pyqt5",
+            "pyqtgraph",
+        ],
+        extras_require={"dev": ["pytest", "pytest-random-order", "coverage", "pytest-qt"]},
         version=__version__,
     )

tests/test_line_plot.py

@@ -1,150 +0,0 @@
-from unittest import mock
-
-import numpy as np
-from pytestqt import qtbot
-
-from bec_widgets import line_plot
-
-
-def test_line_plot_emits_no_signal(qtbot):
-    """Test LinePlot emits no signal when only one data entry is present."""
-
-    y_value_list = ["y1", "y2"]
-    plot = line_plot.BasicPlot(y_value_list=y_value_list)
-    data = {
-        "data": {
-            "x": {"x": {"value": 1}},
-            "y1": {"y1": {"value": 1}},
-            "y2": {"y2": {"value": 3}},
-        }
-    }
-    metadata = {"scanID": "test", "scan_number": 1, "scan_report_devices": ["x"]}
-    with mock.patch("bec_widgets.line_plot.BECClient") as mock_client:
-        with mock.patch.object(plot, "update_signal") as mock_update_signal:
-            plot(data=data, metadata=metadata)
-            mock_update_signal.emit.assert_not_called()
-
-
-def test_line_plot_emits_signal(qtbot):
-    """Test LinePlot emits signal."""
-
-    y_value_list = ["y1", "y2"]
-    plot = line_plot.BasicPlot(y_value_list=y_value_list)
-    data = {
-        "data": {
-            "x": {"x": {"value": 1}},
-            "y1": {"y1": {"value": 1}},
-            "y2": {"y2": {"value": 3}},
-        }
-    }
-    plotter_data_y = [[1, 1], [3, 3]]
-    metadata = {"scanID": "test", "scan_number": 1, "scan_report_devices": ["x"]}
-    with mock.patch("bec_widgets.line_plot.BECClient") as mock_client:
-        # mock_client.device_manager.devices.keys.return_value = ["y1"]
-        with mock.patch.object(plot, "update_signal") as mock_update_signal:
-            mock_update_signal.emit()
-            plot(data=data, metadata=metadata)
-            plot(data=data, metadata=metadata)
-            mock_update_signal.emit.assert_called()
-            # TODO allow mock_client to create return values for device_manager_devices
-            # assert plot.plotter_data_y == plotter_data_y
-
-
-def test_line_plot_raise_warning_wrong_signal_request(qtbot):
-    """Test LinePlot raises warning and skips signal when entry not present in data."""
-
-    y_value_list = ["y1", "y22"]
-    plot = line_plot.BasicPlot(y_value_list=y_value_list)
-    data = {
-        "data": {
-            "x": {"x": {"value": [1, 2, 3, 4, 5]}},
-            "y1": {"y1": {"value": [1, 2, 3, 4, 5]}},
-            "y2": {"y2": {"value": [1, 2, 3, 4, 5]}},
-        }
-    }
-    metadata = {"scanID": "test", "scan_number": 1, "scan_report_devices": ["x"]}
-    with mock.patch("bec_widgets.line_plot.BECClient") as mock_client:
-        # TODO fix mock_client
-        mock_dict = {"y1": [1, 2]}
-        mock_client().device_manager.devices.__contains__.side_effect = mock_dict.__contains__
-
-        # = {"y1": [1, 2]}
-        with mock.patch.object(plot, "update_signal") as mock_update_signal:
-            mock_update_signal.emit()
-            plot(data=data, metadata=metadata)
-            assert plot.y_value_list == ["y1"]
-
-
-def test_line_plot_update(qtbot):
-    """Test LinePlot update."""
-
-    y_value_list = ["y1", "y2"]
-    plot = line_plot.BasicPlot(y_value_list=y_value_list)
-    plot.label_bottom = "x"
-    plot.label_left = f"{', '.join(y_value_list)}"
-    plot.plotter_data_x = [1, 2, 3, 4, 5]
-    plot.plotter_data_y = [[1, 2, 3, 4, 5], [3, 4, 5, 6, 7]]
-    plot.update()
-
-    assert all(plot.curves[0].getData()[0] == np.array([1, 2, 3, 4, 5]))
-    assert all(plot.curves[0].getData()[1] == np.array([1, 2, 3, 4, 5]))
-    assert all(plot.curves[1].getData()[1] == np.array([3, 4, 5, 6, 7]))
-
-
-# TODO Outputting the wrong data, e.g. motor is not in list of devices
-def test_line_plot_update(qtbot):
-    """Test LinePlot update."""
-
-    y_value_list = ["y1", "y2"]
-    plot = line_plot.BasicPlot(y_value_list=y_value_list)
-    plot.label_bottom = "x"
-    plot.label_left = f"{', '.join(y_value_list)}"
-    plot.plotter_data_x = [1, 2, 3, 4, 5]
-    plot.plotter_data_y = [[1, 2, 3, 4, 5], [3, 4, 5, 6, 7]]
-    plot.update()
-
-    assert all(plot.curves[0].getData()[0] == np.array([1, 2, 3, 4, 5]))
-    assert all(plot.curves[0].getData()[1] == np.array([1, 2, 3, 4, 5]))
-    assert all(plot.curves[1].getData()[1] == np.array([3, 4, 5, 6, 7]))
-
-
-def test_line_plot_mouse_moved(qtbot):
-    """Test LinePlot mouse_moved."""
-
-    y_value_list = ["y1", "y2"]
-    plot = line_plot.BasicPlot(y_value_list=y_value_list)
-    plot.plotter_data_x = [1, 2, 3, 4, 5]
-    plot.plotter_data_y = [[1, 2, 3, 4, 5], [3, 4, 5, 6, 7]]
-    plot.precision = 3
-    string_cap = 10
-    x_data = f"{3:.{plot.precision}f}"
-    y_data = f"{3:.{plot.precision}f}"
-    output_string = "".join(
-        [
-            "Mouse cursor",
-            "\n",
-            f"{y_value_list[0]}",
-            "\n",
-            f"X_data:   {x_data:>{string_cap}}",
-            "\n",
-            f"Y_data: {y_data:>{string_cap}}",
-        ]
-    )
-    x_data = f"{3:.{plot.precision}f}"
-    y_data = f"{5:.{plot.precision}f}"
-    output_string = "".join(
-        [
-            output_string,
-            "\n",
-            f"{y_value_list[1]}",
-            "\n",
-            f"X_data:   {x_data:>{string_cap}}",
-            "\n",
-            f"Y_data: {y_data:>{string_cap}}",
-        ]
-    )
-    with mock.patch.object(plot, "plot") as mock_plot:
-        mock_plot.sceneBoundingRect.contains.return_value = True
-        mock_plot.vb.mapSceneToView((20, 10)).x.return_value = 2.8
-        plot.mouse_moved((20, 10))
-        assert plot.mouse_box_data.text() == output_string

tests/test_scan_plot.py

@@ -1,64 +0,0 @@
-from pytestqt import qtbot
-
-from bec_widgets import scan_plot
-
-
-def test_scan_plot(qtbot):
-    """Test ScanPlot"""
-    plot = scan_plot.BECScanPlot()
-    qtbot.addWidget(plot)
-    plot.show()
-    qtbot.waitExposed(plot)
-
-    plot.x_channel = "x"
-    plot.y_channel_list = ["y1", "y2"]
-
-    plot.initialize()
-    plot.redraw_scan(
-        {"x": {"x": {"value": 1}}, "y1": {"y1": {"value": 1}}, "y2": {"y2": {"value": 3}}}
-    )
-    plot.redraw_scan(
-        {"x": {"x": {"value": 2}}, "y1": {"y1": {"value": 2}}, "y2": {"y2": {"value": 4}}}
-    )
-
-    assert all(plot.scan_curves["y1"].getData()[0] == [1, 2])
-    assert all(plot.scan_curves["y2"].getData()[1] == [3, 4])
-
-
-def test_scan_plot_clears_data(qtbot):
-    """Test ScanPlot"""
-    plot = scan_plot.BECScanPlot()
-    qtbot.addWidget(plot)
-    plot.show()
-    qtbot.waitExposed(plot)
-
-    plot.x_channel = "x"
-    plot.y_channel_list = ["y1", "y2"]
-
-    plot.initialize()
-    plot.redraw_scan(
-        {"x": {"x": {"value": 1}}, "y1": {"y1": {"value": 1}}, "y2": {"y2": {"value": 3}}}
-    )
-    plot.clearData()
-    plot.redraw_scan(
-        {"x": {"x": {"value": 2}}, "y1": {"y1": {"value": 2}}, "y2": {"y2": {"value": 4}}}
-    )
-
-    assert all(plot.scan_curves["y1"].getData()[0] == [2])
-    assert all(plot.scan_curves["y2"].getData()[1] == [4])
-
-
-def test_scan_plot_redraws_dap(qtbot):
-    """Test ScanPlot"""
-    plot = scan_plot.BECScanPlot()
-    qtbot.addWidget(plot)
-    plot.show()
-    qtbot.waitExposed(plot)
-
-    plot.y_channel_list = ["dap.y1", "dap.y2"]
-
-    plot.initialize()
-    plot.redraw_dap({"y1": {"x": [1], "y": [1]}, "y2": {"x": [2], "y": [2]}})
-
-    assert all(plot.dap_curves["y1"].getData()[0] == [1])
-    assert all(plot.dap_curves["y2"].getData()[1] == [2])