plopp 25.4.0__py3-none-any.whl → 25.5.0__py3-none-any.whl

plopp/backends/matplotlib/line.py

@@ -81,6 +81,7 @@ class Line:
             'linestyle': 'solid',
             'linewidth': 1.5,
             'color': f'C{artist_number}',
+            'zorder': 2,
         }
         markers = list(Line2D.markers.keys())
         default_plot_style = {
@@ -88,6 +89,7 @@ class Line:
             'linewidth': 1.5,
             'marker': markers[(artist_number + 2) % len(markers)],
             'color': f'C{artist_number}',
+            'zorder': 2,
         }
 
         if line_data["hist"]:
@@ -95,40 +97,35 @@ class Line:
                 line_data['values']['x'],
                 line_data['values']['y'],
                 label=self.label,
-                zorder=10,
                 **{**default_step_style, **line_args},
             )[0]
 
             self._mask = self._ax.step(line_data['mask']['x'], line_data['mask']['y'])[
                 0
             ]
-            self._mask.update_from(self._line)
-            self._mask.set_color(mask_color)
-            self._mask.set_label(None)
-            self._mask.set_linewidth(self._mask.get_linewidth() * 3)
-            self._mask.set_zorder(self._mask.get_zorder() - 1)
-            self._mask.set_visible(line_data['mask']['visible'])
         else:
             self._line = self._ax.plot(
                 line_data['values']['x'],
                 line_data['values']['y'],
                 label=self.label,
-                zorder=10,
                 **{**default_plot_style, **line_args},
             )[0]
-            self._mask = self._ax.plot(
-                line_data['mask']['x'],
-                line_data['mask']['y'],
-                zorder=11,
-                mec=mask_color,
-                mfc="None",
-                mew=3.0,
-                linestyle="none",
-                marker=self._line.get_marker(),
-                visible=line_data['mask']['visible'],
-            )[0]
+            self._mask = self._ax.plot(line_data['mask']['x'], line_data['mask']['y'])[
+                0
+            ]
 
-        self.line_mask = sc.array(dims=['x'], values=~np.isnan(line_data['mask']['y']))
+        self._mask.update_from(self._line)
+        self._mask.set_color(mask_color)
+        self._mask.set_label(None)
+        self._mask.set_visible(line_data['mask']['visible'])
+        if self._line.get_marker().lower() != 'none':
+            self._mask.set(
+                mec=mask_color, mfc='None', mew=3.0, zorder=self._line.get_zorder() + 1
+            )
+        if self._line.get_linestyle().lower() != 'none':
+            self._mask.set(
+                lw=self._line.get_linewidth() * 3, zorder=self._line.get_zorder() - 1
+            )
 
         # Add error bars
         if errorbars and (line_data['stddevs'] is not None):
@@ -137,7 +134,7 @@ class Line:
                 line_data['stddevs']['y'],
                 yerr=line_data['stddevs']['e'],
                 color=self._line.get_color(),
-                zorder=10,
+                zorder=self._line.get_zorder(),
                 fmt="none",
             )
 
@@ -153,7 +150,6 @@ class Line:
         check_ndim(new_values, ndim=1, origin='Line')
         self._data = new_values
         line_data = make_line_data(data=self._data, dim=self._dim)
-        self.line_mask = sc.array(dims=['x'], values=~np.isnan(line_data['mask']['y']))
 
         self._line.set_data(line_data['values']['x'], line_data['values']['y'])
         self._mask.set_data(line_data['mask']['x'], line_data['mask']['y'])

plopp/backends/plotly/line.py

@@ -60,7 +60,7 @@ class Line:
         artist_number: int = 0,
         errorbars: bool = True,
         mask_color: str = 'black',
-        mode: str = 'markers',
+        mode: str | None = None,
         marker: str | None = None,
         **kwargs,
     ):
@@ -87,14 +87,17 @@ class Line:
             'color': default_colors[artist_number % len(default_colors)]
         }
         default_marker_style = {
-            'symbol': artist_number % 53
-        }  # Plotly has 52 marker styles
+            'symbol': artist_number % 52  # Plotly has 52 marker styles
+        }
 
         line_shape = None
 
-        if line_data["hist"]:
-            line_shape = 'vh'
-            mode = 'lines'
+        if mode is None:
+            if line_data["hist"]:
+                line_shape = 'vh'
+                mode = 'lines'
+            else:
+                mode = 'markers'
 
         marker_style = default_marker_style if marker is None else marker
         line_style = {**default_line_style, **line_args}
@@ -130,7 +133,7 @@ class Line:
             line_style['width'] *= 5
         else:
             line_style['width'] = 5
-        if line_data["hist"]:
+        if 'lines' in mode:
             line_style['color'] = mask_color
 
         self._mask = go.Scatter(
@@ -149,7 +152,7 @@ class Line:
         # that ends up in the figure is a copy of the one above.
         # Plotly has no concept of zorder, so we need to add the traces in a specific
         # order
-        if line_data["hist"]:
+        if 'lines' in mode:
             self._fig.add_trace(self._mask)
             self._mask = self._fig.data[-1]
             self._fig.add_trace(self._line)
@@ -165,9 +168,8 @@ class Line:
                 self._error = self._fig.data[-1]
             self._fig.add_trace(self._mask)
             self._mask = self._fig.data[-1]
-        self._line._plopp_id = self.uid
-        self.line_mask = sc.array(dims=['x'], values=~np.isnan(line_data['mask']['y']))
 
+        self._line._plopp_id = self.uid
         self._mask._plopp_id = self.uid
         if self._error is not None:
             self._error._plopp_id = self.uid
@@ -184,7 +186,6 @@ class Line:
         check_ndim(new_values, ndim=1, origin='Line')
         self._data = new_values
         line_data = make_line_data(data=self._data, dim=self._dim)
-        self.line_mask = sc.array(dims=['x'], values=~np.isnan(line_data['mask']['y']))
 
         with self._fig.batch_update():
             self._line.update(

plopp/graphics/graphicalview.py

@@ -21,6 +21,15 @@ def _none_if_not_finite(x: float | None) -> float | int | None:
     return x if np.isfinite(x) else None
 
 
+def _make_range(
+    old: tuple[float, float], new: tuple[float, float]
+) -> tuple[float | None, float | None]:
+    new = (_none_if_not_finite(new[0]), _none_if_not_finite(new[1]))
+    if (old is not None) and (None not in old) and (old[0] > old[1]):
+        new = (new[1], new[0])
+    return new
+
+
 class GraphicalView(View):
     """
     Base class for graphical 1d and 2d views.
@@ -113,18 +122,15 @@ class GraphicalView(View):
             bbox = bbox.union(artist.bbox(**scales))
         self.bbox = bbox
         self.bbox = self.bbox.override(self.canvas.bbox)
-        self.canvas.xrange = (
-            _none_if_not_finite(self.bbox.xmin),
-            _none_if_not_finite(self.bbox.xmax),
+        self.canvas.xrange = _make_range(
+            old=self.canvas.xrange, new=(self.bbox.xmin, self.bbox.xmax)
         )
-        self.canvas.yrange = (
-            _none_if_not_finite(self.bbox.ymin),
-            _none_if_not_finite(self.bbox.ymax),
+        self.canvas.yrange = _make_range(
+            old=self.canvas.yrange, new=(self.bbox.ymin, self.bbox.ymax)
         )
         if hasattr(self.canvas, 'zrange'):
-            self.canvas.zrange = (
-                _none_if_not_finite(self.bbox.zmin),
-                _none_if_not_finite(self.bbox.zmax),
+            self.canvas.zrange = _make_range(
+                old=self.canvas.zrange, new=(self.bbox.zmin, self.bbox.zmax)
             )
 
     def update(self, *args, **kwargs) -> None:

plopp/plotting/common.py

@@ -2,7 +2,7 @@
 # Copyright (c) 2023 Scipp contributors (https://github.com/scipp)
 
 import warnings
-from collections.abc import Callable
+from collections.abc import Callable, Iterable
 from typing import Any
 
 import numpy as np
@@ -76,8 +76,30 @@ def to_variable(obj) -> sc.Variable:
     return out
 
 
+def _ensure_data_array_coords(
+    da: sc.DataArray, coords: list[str] | None
+) -> sc.DataArray:
+    if coords is None:
+        coords = list(da.dims)
+    elif missing := set(coords) - set(da.coords.keys()):
+        raise ValueError(f"Specified coords do not exist: {missing}")
+
+    # Remove unused coords
+    da = da.drop_coords(list(set(da.coords) - set(coords)))
+    # Assign dim coords where missing. The above checks ensure that all missing
+    # coords are dim coords, i.e., that `name in out.dims`.
+    da = da.assign_coords(
+        {
+            name: sc.arange(name, da.sizes[name], unit=None)
+            for name in set(coords) - set(da.coords)
+        }
+    )
+    return da
+
+
 def to_data_array(
     obj: Plottable | list,
+    coords: list[str] | None = None,
 ) -> sc.DataArray:
     """
     Convert an input to a DataArray, potentially adding fake coordinates if they are
@@ -87,6 +109,8 @@ def to_data_array(
     ----------
     obj:
         The input object to be converted.
+    coords:
+        If supplied, use these coords instead of the input's dimension coordinates.
     """
     out = _maybe_to_variable(obj)
     if isinstance(out, sc.Variable):
@@ -94,15 +118,13 @@ def to_data_array(
     out = from_compatible_lib(out)
     if not isinstance(out, sc.DataArray):
         raise TypeError(f"Cannot convert input of type {type(obj)} to a DataArray.")
-    out = out.copy(deep=False)
-    for dim, size in out.sizes.items():
-        if dim not in out.coords:
-            out.coords[dim] = sc.arange(dim, size, unit=None)
-        if not out.coords[dim].dims:
+    out = _ensure_data_array_coords(out, coords)
+    for name, coord in out.coords.items():
+        if not coord.dims:
             raise ValueError(
                 "Input data cannot be plotted: it has a scalar coordinate along "
-                f"dimension {dim}. Consider dropping this coordinate before plotting. "
-                f"Use ``data.drop_coords('{dim}').plot()``."
+                f"dimension {name}. Consider dropping this coordinate before plotting. "
+                f"Use ``data.drop_coords('{name}').plot()``."
             )
     for name in out.coords:
         other_dims = [dim for dim in out.coords[name].dims if dim not in out.dims]
@@ -171,7 +193,7 @@ def preprocess(
     obj: Plottable | list,
     name: str | None = None,
     ignore_size: bool = False,
-    coords: list[str] | None = None,
+    coords: Iterable[str] | str | None = None,
 ) -> sc.DataArray:
     """
     Pre-process input data for plotting.
@@ -192,7 +214,12 @@ def preprocess(
     coords:
         If supplied, use these coords instead of the input's dimension coordinates.
     """
-    out = to_data_array(obj)
+    if isinstance(coords, str):
+        coords = [coords]
+    elif coords is not None:
+        coords = list(coords)
+
+    out = to_data_array(obj, coords)
     check_not_binned(out)
     check_allowed_dtypes(out)
     if name is not None:
@@ -201,8 +228,6 @@ def preprocess(
         _check_size(out)
     if coords is not None:
         renamed_dims = {}
-        if isinstance(coords, str):
-            coords = [coords]
         for dim in coords:
             underlying = out.coords[dim].dims[-1]
             if underlying in renamed_dims:

plopp/plotting/plot.py

@@ -85,6 +85,7 @@ def plot(
     """
 
     common_args = {
+        'aspect': aspect,
         'grid': grid,
         'norm': norm,
         'scale': scale,
@@ -119,12 +120,7 @@ def plot(
     elif ndim == 2:
         if len(nodes) > 1:
             raise_multiple_inputs_for_2d_plot_error(origin='plot')
-        return imagefigure(
-            *nodes,
-            aspect=aspect,
-            cbar=cbar,
-            **common_args,
-        )
+        return imagefigure(*nodes, cbar=cbar, **common_args)
     else:
         raise ValueError(
             'The plot function can only plot 1d and 2d data, got input '

{plopp-25.4.0.dist-info → plopp-25.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plopp
-Version: 25.4.0
+Version: 25.5.0
 Summary: Visualization library for Scipp
 Author: Scipp contributors
 License: BSD 3-Clause License

{plopp-25.4.0.dist-info → plopp-25.5.0.dist-info}/RECORD

@@ -8,7 +8,7 @@ plopp/backends/matplotlib/canvas.py,sha256=aAiDC2PfirZlffX671Xzs7GswtOfJjywf_nCh
 plopp/backends/matplotlib/fast_image.py,sha256=1tF4G8kTmgmiybdD-KPIatU2dWwv0dgv4r8IMDQTTGE,6532
 plopp/backends/matplotlib/figure.py,sha256=Emj8KCIFvesEfAoKIWn4M4TcgZhq6zFTfRTFnLZHGxE,5515
 plopp/backends/matplotlib/image.py,sha256=YnczwdxsGmh0Nvrk1A8xL93ap2rzKI-0G428OCQmSCc,974
-plopp/backends/matplotlib/line.py,sha256=5umUmPU-7yJVHRGd4WCddWrw197asJc4RmVCmcxQDyM,8982
+plopp/backends/matplotlib/line.py,sha256=xWZx_3j7_O1IoNjVOu-KM4Ue9haQ5IqHjRsY-VhyKak,8779
 plopp/backends/matplotlib/mesh_image.py,sha256=4ndrauA71asWJdA6ZDkh6iPnQPk07kNd3m1h0_bTM6U,8542
 plopp/backends/matplotlib/scatter.py,sha256=NuYi9G4csQTklUjB7WXSjothrH77C0NY0KHiMPHBqcw,6739
 plopp/backends/matplotlib/tiled.py,sha256=BfFHNQ-or19X44N-XaaUf9A3trdSSaCfC2CIAR1WTPg,6127
@@ -16,7 +16,7 @@ plopp/backends/matplotlib/utils.py,sha256=24gmT2sBHS_wUitUThSLavwSK95uqbLAhadNdx
 plopp/backends/plotly/__init__.py,sha256=QNPZgWV3wO8psaMkSB-GtTOP-OIe9jSfwDdEt2xgbZg,107
 plopp/backends/plotly/canvas.py,sha256=JQXl8c23Ju-DTame2rZ4T_lgrArgH1WElUGJIaGyEbU,8943
 plopp/backends/plotly/figure.py,sha256=60QsXUFjr3CqXjxVpAbvd1c-wtq7T5fptotwybgUEcI,1356
-plopp/backends/plotly/line.py,sha256=JkguZatKpsJVxXkw2C_sGzfpHvByBkBhRvbK8Hbv4Tw,9623
+plopp/backends/plotly/line.py,sha256=yVpJW-xWa0Wy_oMdmvDn2ESIJymT9Fg6wN7RhIRK6Dw,9533
 plopp/backends/pythreejs/__init__.py,sha256=XvSD58Tj5WBrrOjkePcCrRW6RbbyrvhhWI_S8-AR92U,107
 plopp/backends/pythreejs/canvas.py,sha256=yn6iz4BcaNpJZa-lUlyQ5BnYTThb3zYTUv7zWohhaMo,11942
 plopp/backends/pythreejs/figure.py,sha256=n9R1YokZMRPGA2XP9qeMIGGe-wcTt91vAiexVf7YRnc,2022
@@ -43,14 +43,14 @@ plopp/graphics/bbox.py,sha256=3WeMgu5LgWIXLJTYVT7_USwaAcS7cQPNCk6B0gvuNGo,3596
 plopp/graphics/camera.py,sha256=fXc1YH7Tp-rwKkcYeE-mHrxMz3SKauj5xJCRuKv-QPs,5323
 plopp/graphics/colormapper.py,sha256=u5cADKU9lrRkJ_a969i_5z-mdT0-lBnEonc0PW_xSXA,9643
 plopp/graphics/figures.py,sha256=PLWQLnQNWz8epubYlK7HLSkvPGJmTAmHjJM2DqpvLe8,2735
-plopp/graphics/graphicalview.py,sha256=uX6KLMy5r0yqbFVSE3y0T7kW7oAg8CVuioIBOtTNVTc,9183
+plopp/graphics/graphicalview.py,sha256=u5sz3CebhVLoEeKPpzlBlPfRrRORxDmruyfhLXDbH00,9436
 plopp/graphics/tiled.py,sha256=gXYZVAs6wRFKezzN3VlEvm7_z2zx3IDYfGZQZqrpL80,1386
 plopp/plotting/__init__.py,sha256=s25RIbKplHSRn0jjtLADPQl72JLf_KLRMRCfeMDI_UA,205
 plopp/plotting/__init__.pyi,sha256=95wYGfM5PT0Y0Ov_ue7rBrHvHxrtex-2WEYtfFzBvE0,475
-plopp/plotting/common.py,sha256=ZEFJ8dZC0aQ_Ucrvu7JXiwaKZ6YT7qfdg8pMZVpX62Y,8696
+plopp/plotting/common.py,sha256=7xR2aWUWzKyxshlPn8B-OWQ5Hy8wiMn-qtPywkLsNRs,9515
 plopp/plotting/inspector.py,sha256=fT4v342pqTzihKaweoGD4WaQ5eDdyngK7W451Mh2Ffw,3586
 plopp/plotting/mesh3d.py,sha256=KjAtlVlLYslwgP_uE067WtJRgNURkhaz0PPUuYLlJyw,2778
-plopp/plotting/plot.py,sha256=S3Af6PQb7Eu0_t7qoKMMkS6hyt6iah-Hm1RWGi5PnEA,3934
+plopp/plotting/plot.py,sha256=WQzw1vHGljWY1tQU1InQWe2-M-vCW2IRiL-v7cnw46w,3886
 plopp/plotting/scatter.py,sha256=ybPWFHFwxt_Bzv3Dy-yAFCRHW5HQEggcNihpzWduH7A,3161
 plopp/plotting/scatter3d.py,sha256=oizd-BCgmvNu_fSV6FQt9oe7lPn4h2Zc1ohKmor-d78,3819
 plopp/plotting/slicer.py,sha256=A3g26czD6GM3vBlVS-IBOnCOlpaERqUhjT-_POYJEHQ,5877
@@ -68,8 +68,8 @@ plopp/widgets/slice.py,sha256=ihiGEGGva_2WZIug-kizg1I5SFdMzu4_8DDzuHWIKeA,4212
 plopp/widgets/style.py,sha256=Fw4S8te0xDyT8-kWu4Ut35aLgyr98qMlWZRbXbd1-dk,184
 plopp/widgets/toolbar.py,sha256=ueNeOZSC2suAG7nCJzqwl8DmtWD5c2J8VkuP-XzJRwI,4683
 plopp/widgets/tools.py,sha256=9l7LmB8qG0OTt5ZJihJzqRna1ouxJthO_Ahnq7WKTtY,7172
-plopp-25.4.0.dist-info/licenses/LICENSE,sha256=fCqnkzCwkGneGtgOidkO2b3ed6SGZT0yhuworuJG0K0,1553
-plopp-25.4.0.dist-info/METADATA,sha256=cqHue5Jw4_iSbJaip6MORBBRqbOOHbFqyiBpaZfNDT0,4533
-plopp-25.4.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-plopp-25.4.0.dist-info/top_level.txt,sha256=Lk_GLFh37eX-3PO3c6bPkDpir7GjJmbQHYza3IpIphc,6
-plopp-25.4.0.dist-info/RECORD,,
+plopp-25.5.0.dist-info/licenses/LICENSE,sha256=fCqnkzCwkGneGtgOidkO2b3ed6SGZT0yhuworuJG0K0,1553
+plopp-25.5.0.dist-info/METADATA,sha256=bFuzQ8XlAfiKyqMeiONKwEdMhN1te45ZHTGETPx8CtE,4533
+plopp-25.5.0.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+plopp-25.5.0.dist-info/top_level.txt,sha256=Lk_GLFh37eX-3PO3c6bPkDpir7GjJmbQHYza3IpIphc,6
+plopp-25.5.0.dist-info/RECORD,,

{plopp-25.4.0.dist-info → plopp-25.5.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py3-none-any