bec-widgets 0.119.0__tar.gz → 1.0.0__tar.gz

{bec_widgets-0.119.0 → bec_widgets-1.0.0}/CHANGELOG.md

@@ -1,24 +1,20 @@
 # CHANGELOG
 
 
-## v0.119.0 (2024-10-17)
+## v1.0.0 (2024-10-18)
 
-### Features
+### Breaking
 
-* feat: new PositionerGroup widget ([`af9655d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/af9655de0c541092437accfbaa779628a2f48ccb))
+* feat!: ability to disable scatter from waveform & compatible crosshair with down sampling ([`2ab12ed`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/2ab12ed60abb995abc381d9330fdcf399796d9e5))
 
-* feat: add 'expand_popup' property to CompactPopupWidget
+### Bug Fixes
 
-This property tells if expand should show a popup (by default), or
-if the widget should expand in-place ([`e4121a0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e4121a01cb6b8d496e630cd43bc642b994b8f310))
+* fix(crosshair): downsample clear markers ([`f9a889f`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f9a889fc6d380b9e587edcb465203122ea0bffc1))
 
-* feat: PositionerBox with a popup view ([`2615787`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/261578796f1de8ca9cab9b91659bc1484f7aa89d))
 
-* feat: emit 'device_selected' and 'scan_axis' from scan control widget ([`0b9b1a3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0b9b1a3c89a98505079f7d4078915b7bbfaa1e23))
-
-* feat: new 'device_selected' signals to ScanControl, ScanGroupBox, DeviceLineEdit ([`9801d27`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9801d2769eb0ee95c94ec0c011e1dac1407142ae))
+## v0.119.0 (2024-10-17)
 
-### Fixes
+### Bug Fixes
 
 * fix: fix syntax due to change of api for simulated devices ([`19f4e40`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/19f4e407e00ee242973ca4c3f90e4e41a4d3e315))
 
@@ -30,6 +26,21 @@ if the widget should expand in-place ([`e4121a0`](https://gitlab.psi.ch/bec/bec_
 
 * fix: set (Minimum, Fixed) size policy on Stop button ([`523cc43`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/523cc435725b10b7d59a4477a1aaa24a1f3e37a2))
 
+### Features
+
+* feat: new PositionerGroup widget ([`af9655d`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/af9655de0c541092437accfbaa779628a2f48ccb))
+
+* feat: add 'expand_popup' property to CompactPopupWidget
+
+This property tells if expand should show a popup (by default), or
+if the widget should expand in-place ([`e4121a0`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e4121a01cb6b8d496e630cd43bc642b994b8f310))
+
+* feat: PositionerBox with a popup view ([`2615787`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/261578796f1de8ca9cab9b91659bc1484f7aa89d))
+
+* feat: emit 'device_selected' and 'scan_axis' from scan control widget ([`0b9b1a3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0b9b1a3c89a98505079f7d4078915b7bbfaa1e23))
+
+* feat: new 'device_selected' signals to ScanControl, ScanGroupBox, DeviceLineEdit ([`9801d27`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/9801d2769eb0ee95c94ec0c011e1dac1407142ae))
+
 ### Refactoring
 
 * refactor: redesign of scan selection and scan control boxes ([`a69d287`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/a69d2870e2b3539739781d741b27b8599c0f4abd))
@@ -50,7 +61,7 @@ if the widget should expand in-place ([`e4121a0`](https://gitlab.psi.ch/bec/bec_
 
 ## v0.117.1 (2024-10-11)
 
-### Fixes
+### Bug Fixes
 
 * fix(FPS): qtimer cleanup leaking ([`3a22392`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/3a2239278075de7489ad10a58c31d7d89715e221))
 
@@ -94,18 +105,26 @@ complete UI ([`49268e3`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/49268e38
 
 ## v0.115.0 (2024-10-08)
 
+### Bug Fixes
+
+* fix: make Alignment1D a MainWindow as it is an application ([`c5e9ed6`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c5e9ed6e422acb908e1ada32822f5d7cc256ade7))
+
+* fix: adjust bec_qthemes dependency ([`b207e45`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b207e45a67818ee061272ce00a09fe7ea31cd1ba))
+
 ### Features
 
 * feat: add bec-app script to launch applications ([`8bf4842`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/8bf48427884338672a8e3de3deb20439b0bfdf99))
 
-### Fixes
 
-* fix: make Alignment1D a MainWindow as it is an application ([`c5e9ed6`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/c5e9ed6e422acb908e1ada32822f5d7cc256ade7))
+## v0.114.0 (2024-10-02)
 
-* fix: adjust bec_qthemes dependency ([`b207e45`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b207e45a67818ee061272ce00a09fe7ea31cd1ba))
+### Bug Fixes
 
+* fix: prevent exception when empty string updates are coming from widget ([`04cfb1e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/04cfb1edf19437d54f07b868bcf3cfc2a35fd3bc))
 
-## v0.114.0 (2024-10-02)
+* fix: use new 'scan_axis' signal, to set_x and select x axis on waveform
+
+Fixes #361, do not try to change x axis when not permitted ([`efa2763`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/efa276358b0f5a45cce9fa84fa5f9aafaf4284f7))
 
 ### Features
 
@@ -115,16 +134,12 @@ Signal is emitted before "scan_started", to inform about scan positioner
 and (start, stop) positions. In case of multiple bundles, the signal
 is emitted multiple times. ([`f084e25`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f084e2514bc9459cccaa951b79044bc25884e738))
 
-### Fixes
-
-* fix: prevent exception when empty string updates are coming from widget ([`04cfb1e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/04cfb1edf19437d54f07b868bcf3cfc2a35fd3bc))
-
-* fix: use new 'scan_axis' signal, to set_x and select x axis on waveform
 
-Fixes #361, do not try to change x axis when not permitted ([`efa2763`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/efa276358b0f5a45cce9fa84fa5f9aafaf4284f7))
+## v0.113.0 (2024-10-02)
 
+### Bug Fixes
 
-## v0.113.0 (2024-10-02)
+* fix: add is_log checks and functionality to plot_indicator_items ([`0f9953e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0f9953e8fdcf3f9b5a09f994c69edb6b34756df9))
 
 ### Features
 
@@ -132,10 +147,6 @@ Fixes #361, do not try to change x axis when not permitted ([`efa2763`](https://
 
 * feat: add move to position button to lmfit dialog ([`281cb27`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/281cb27d8b5433e27a7ba0ca0a19e4b45b9c544f))
 
-### Fixes
-
-* fix: add is_log checks and functionality to plot_indicator_items ([`0f9953e`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/0f9953e8fdcf3f9b5a09f994c69edb6b34756df9))
-
 ### Refactoring
 
 * refactor: various minor improvements for the alignment gui ([`f554f3c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/f554f3c1672c4fe32968a5991dc98802556a6f3b))
@@ -157,14 +168,3 @@ Fixes #361, do not try to change x axis when not permitted ([`efa2763`](https://
 ### Unknown
 
 * feat : Add bec_signal_proxy to handle signals with option to unblock them manually. ([`1dcfeb6`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/1dcfeb6cfce3c69f0c5401731d4d3f9a1981b22e))
-
-
-## v0.112.1 (2024-09-19)
-
-### Documentation
-
-* docs(dap_combo_box): updated screenshot ([`e3b5e33`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/e3b5e338bfaec276979183fb6d79ab41a7ca21e1))
-
-### Fixes
-
-* fix: test e2e dap wait_for_fit ([`b2f7d3c`](https://gitlab.psi.ch/bec/bec_widgets/-/commit/b2f7d3c5f3f4bf00cc628f788e2c278ebb5688ae))

{bec_widgets-0.119.0 → bec_widgets-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec_widgets
-Version: 0.119.0
+Version: 1.0.0
 Summary: BEC Widgets
 Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec_widgets/issues
 Project-URL: Homepage, https://gitlab.psi.ch/bec/bec_widgets

{bec_widgets-0.119.0 → bec_widgets-1.0.0}/bec_widgets/cli/client.py

@@ -552,6 +552,7 @@ class BECFigure(RPCBase):
     def image(
         self,
         monitor: "str" = None,
+        monitor_type: "Literal['1d', '2d']" = "2d",
         color_bar: "Literal['simple', 'full']" = "full",
         color_map: "str" = "magma",
         data: "np.ndarray" = None,
@@ -856,6 +857,7 @@ class BECImageShow(RPCBase):
     def image(
         self,
         monitor: "str",
+        monitor_type: "Literal['1d', '2d']" = "2d",
         color_map: "Optional[str]" = "magma",
         color_bar: "Optional[Literal['simple', 'full']]" = "full",
         downsample: "Optional[bool]" = True,
@@ -868,6 +870,7 @@ class BECImageShow(RPCBase):
 
         Args:
             monitor(str): The name of the monitor to display.
+            monitor_type(Literal["1d","2d"]): The type of 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.
@@ -1180,6 +1183,7 @@ class BECImageWidget(RPCBase):
     def image(
         self,
         monitor: "str",
+        monitor_type: "Optional[Literal['1d', '2d']]" = "2d",
         color_map: "Optional[str]" = "magma",
         color_bar: "Optional[Literal['simple', 'full']]" = "full",
         downsample: "Optional[bool]" = True,
@@ -2096,6 +2100,15 @@ class BECWaveform(RPCBase):
             colormap(str, optional): Scale the colors of curves to colormap. If None, use the default color palette.
         """
 
+    @rpc_call
+    def enable_scatter(self, enable: "bool"):
+        """
+        Enable/Disable scatter plot on all curves.
+
+        Args:
+            enable(bool): If True, enable scatter markers; if False, disable them.
+        """
+
     @rpc_call
     def enable_fps_monitor(self, enable: "bool" = True):
         """
@@ -2419,6 +2432,15 @@ class BECWaveformWidget(RPCBase):
             enabled(bool): If True, enable the FPS monitor.
         """
 
+    @rpc_call
+    def enable_scatter(self, enabled: "bool"):
+        """
+        Enable the scatter plot of the plot widget.
+
+        Args:
+            enabled(bool): If True, enable the scatter plot.
+        """
+
     @rpc_call
     def lock_aspect_ratio(self, lock: "bool"):
         """

{bec_widgets-0.119.0 → bec_widgets-1.0.0}/bec_widgets/utils/crosshair.py

@@ -8,6 +8,14 @@ from qtpy.QtCore import QObject, Qt
 from qtpy.QtCore import Signal as pyqtSignal
 
 
+class NonDownsamplingScatterPlotItem(pg.ScatterPlotItem):
+    def setDownsampling(self, ds=None, auto=None, method=None):
+        pass
+
+    def setClipToView(self, state):
+        pass
+
+
 class Crosshair(QObject):
     positionChanged = pyqtSignal(tuple)
     positionClicked = pyqtSignal(tuple)
@@ -47,6 +55,7 @@ class Crosshair(QObject):
         self.plot_item.ctrl.derivativeCheck.checkStateChanged.connect(self.check_derivatives)
         self.plot_item.ctrl.logXCheck.checkStateChanged.connect(self.check_log)
         self.plot_item.ctrl.logYCheck.checkStateChanged.connect(self.check_log)
+        self.plot_item.ctrl.downsampleSpin.valueChanged.connect(self.clear_markers)
 
         # Initialize markers
         self.marker_moved_1d = {}
@@ -64,7 +73,7 @@ class Crosshair(QObject):
                     continue
                 pen = item.opts["pen"]
                 color = pen.color() if hasattr(pen, "color") else pg.mkColor(pen)
-                marker_moved = pg.ScatterPlotItem(
+                marker_moved = NonDownsamplingScatterPlotItem(
                     size=10, pen=pg.mkPen(color), brush=pg.mkBrush(None)
                 )
                 marker_moved.skip_auto_range = True
@@ -73,7 +82,7 @@ class Crosshair(QObject):
 
                 # Create glowing effect markers for clicked events
                 for size, alpha in [(18, 64), (14, 128), (10, 255)]:
-                    marker_clicked = pg.ScatterPlotItem(
+                    marker_clicked = NonDownsamplingScatterPlotItem(
                         size=size,
                         pen=pg.mkPen(None),
                         brush=pg.mkBrush(color.red(), color.green(), color.blue(), alpha),

{bec_widgets-0.119.0 → bec_widgets-1.0.0}/bec_widgets/widgets/figure/plots/waveform/waveform.py

@@ -72,6 +72,7 @@ class BECWaveform(BECPlotBase):
         "set_y_lim",
         "set_grid",
         "set_colormap",
+        "enable_scatter",
         "enable_fps_monitor",
         "lock_aspect_ratio",
         "export",
@@ -371,6 +372,20 @@ class BECWaveform(BECPlotBase):
         else:
             raise ValueError("Identifier must be either an integer (index) or a string (curve_id).")
 
+    def enable_scatter(self, enable: bool):
+        """
+        Enable/Disable scatter plot on all curves.
+
+        Args:
+            enable(bool): If True, enable scatter markers; if False, disable them.
+        """
+        for curve in self.curves:
+            if isinstance(curve, BECCurve):
+                if enable:
+                    curve.set_symbol("o")  # You can choose any symbol you like
+                else:
+                    curve.set_symbol(None)
+
     def plot(
         self,
         arg1: list | np.ndarray | str | None = None,

{bec_widgets-0.119.0 → bec_widgets-1.0.0}/bec_widgets/widgets/figure/plots/waveform/waveform_curve.py

@@ -42,7 +42,7 @@ 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.")
-    symbol: Optional[str] = Field("o", description="The symbol of the curve.")
+    symbol: Optional[str | None] = Field("o", description="The symbol of the curve.")
     symbol_color: Optional[str | tuple] = Field(
         None, description="The color of the symbol of the curve."
     )
@@ -201,7 +201,8 @@ class BECCurve(BECConnector, pg.PlotDataItem):
             symbol(str): Symbol of the curve.
         """
         self.config.symbol = symbol
-        self.apply_config()
+        self.setSymbol(symbol)
+        self.updateItems()
 
     def set_symbol_color(self, symbol_color: str):
         """

{bec_widgets-0.119.0 → bec_widgets-1.0.0}/bec_widgets/widgets/waveform/waveform_widget.py

@@ -53,6 +53,7 @@ class BECWaveformWidget(BECWidget, QWidget):
         "set_auto_range",
         "set_grid",
         "enable_fps_monitor",
+        "enable_scatter",
         "lock_aspect_ratio",
         "export",
         "export_to_matplotlib",
@@ -650,6 +651,15 @@ class BECWaveformWidget(BECWidget, QWidget):
         """
         self.waveform.set_outer_axes(show)
 
+    def enable_scatter(self, enabled: bool):
+        """
+        Enable the scatter plot of the plot widget.
+
+        Args:
+            enabled(bool): If True, enable the scatter plot.
+        """
+        self.waveform.enable_scatter(enabled)
+
     def lock_aspect_ratio(self, lock: bool):
         """
         Lock the aspect ratio of the plot widget.

{bec_widgets-0.119.0 → bec_widgets-1.0.0}/pyproject.toml

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