plopp 25.4.0__tar.gz → 25.5.0__tar.gz

{plopp-25.4.0 → plopp-25.5.0}/PKG-INFO

@@ -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 → plopp-25.5.0}/pyproject.toml

@@ -81,10 +81,9 @@ filterwarnings = [
   'ignore:Passing unrecognized arguments to super:DeprecationWarning',
   'ignore:Jupyter is migrating its paths:DeprecationWarning',
   'ignore:setDaemon\(\) is deprecated, set the daemon attribute instead:DeprecationWarning',
-  'ignore:TriCutTool is deprecated::',
-  'ignore:Cut3dTool is deprecated::',
   # Should be removed once https://github.com/plotly/plotly.py/issues/4997 is fixed
   'ignore: \*scattermapbox\* is deprecated:DeprecationWarning',
+  'ignore:There is no current event loop:DeprecationWarning',
 ]
 
 [tool.ruff]

{plopp-25.4.0 → plopp-25.5.0}/requirements/base.txt

@@ -32,7 +32,7 @@ pyparsing==3.2.1
     # via matplotlib
 python-dateutil==2.9.0.post0
     # via matplotlib
-scipp==25.4.0
+scipp==25.5.0
     # via -r base.in
 six==1.17.0
     # via python-dateutil

{plopp-25.4.0 → plopp-25.5.0}/requirements/basetest.txt

@@ -134,7 +134,7 @@ pytz==2025.1
     # via pandas
 requests==2.32.3
     # via pooch
-scipp==25.4.0
+scipp==25.5.0
     # via -r basetest.in
 scipy==1.15.2
     # via -r basetest.in

{plopp-25.4.0 → plopp-25.5.0}/src/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-25.4.0 → plopp-25.5.0}/src/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-25.4.0 → plopp-25.5.0}/src/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-25.4.0 → plopp-25.5.0}/src/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-25.4.0 → plopp-25.5.0}/src/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 → plopp-25.5.0}/src/plopp.egg-info/PKG-INFO

@@ -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 → plopp-25.5.0}/tests/backends/matplotlib/mpl_line_test.py

@@ -169,3 +169,45 @@ def test_line_color_with_errorbars():
     assert line.color == 'C1'
     assert line._line.get_color() == 'C1'
     assert to_hex(line._error.get_children()[0].get_color()) == to_hex('C1')
+
+
+def test_kwarg_zorder():
+    line = Line(canvas=Canvas(), data=data_array(ndim=1), zorder=3)
+    assert line._line.get_zorder() == 3
+
+
+def test_kwarg_zorder_masks():
+    line = Line(canvas=Canvas(), data=data_array(ndim=1, masks=True), zorder=5)
+    assert line._line.get_zorder() == 5
+    assert line._mask.get_zorder() > 5
+
+
+def test_kwarg_zorder_binedges():
+    line = Line(canvas=Canvas(), data=data_array(ndim=1, binedges=True), zorder=7)
+    assert line._line.get_zorder() == 7
+
+
+def test_kwarg_zorder_binedges_masks():
+    line = Line(
+        canvas=Canvas(), data=data_array(ndim=1, binedges=True, masks=True), zorder=9
+    )
+    assert line._line.get_zorder() == 9
+    assert line._mask.get_zorder() < 9
+
+
+def test_kwarg_zorder_errorbars():
+    line = Line(canvas=Canvas(), data=data_array(ndim=1, variances=True), zorder=12)
+    assert line._line.get_zorder() == 12
+    for artist in line._error.get_children():
+        assert artist.get_zorder() == 12
+
+
+def test_kwarg_zorder_binedges_errorbars():
+    line = Line(
+        canvas=Canvas(),
+        data=data_array(ndim=1, binedges=True, variances=True),
+        zorder=14,
+    )
+    assert line._line.get_zorder() == 14
+    for artist in line._error.get_children():
+        assert artist.get_zorder() == 14

{plopp-25.4.0 → plopp-25.5.0}/tests/backends/matplotlib/mpl_plot_test.py

@@ -193,3 +193,12 @@ def test_polar_axes_limits_small_range_fits_to_data():
     fig = pp.plot(da, ax=ax)
     assert fig.canvas.xmin > 0.0
     assert fig.canvas.xmax < 2 * np.pi
+
+
+def test_aspect_ratio():
+    da = data_array(ndim=1)
+    fig = da.plot(aspect='equal')
+    assert fig.canvas.ax.get_aspect() == 1.0
+    da = data_array(ndim=2)
+    fig = da.plot(aspect='equal')
+    assert fig.canvas.ax.get_aspect() == 1.0

{plopp-25.4.0 → plopp-25.5.0}/tests/graphics/canvas_test.py

@@ -148,6 +148,22 @@ class TestCanvasNo3d:
         assert canvas.xscale == 'linear'
         assert canvas.yscale == 'log'
 
+    def test_xrange_order_preserved(self, set_backend, backend, figure, data):
+        da = data()
+        fig = figure(Node(da))
+        fig.canvas.xrange = (52.0, -5.0)
+        fig.view.autoscale()
+        new_range = fig.canvas.xrange
+        assert new_range[0] > new_range[1]
+
+    def test_yrange_order_preserved(self, set_backend, backend, figure, data):
+        da = data()
+        fig = figure(Node(da))
+        fig.canvas.yrange = (61.0, -6.6)
+        fig.view.autoscale()
+        new_range = fig.canvas.yrange
+        assert new_range[0] > new_range[1]
+
 
 CASES1DINTERACTIVE = {
     k: c for k, c in CASES.items() if (c[1] is linefigure and c[0][1] != 'mpl-static')

{plopp-25.4.0 → plopp-25.5.0}/tests/plotting/common_test.py

@@ -25,6 +25,14 @@ def test_preprocess_use_non_dimension_coords():
     assert out.coords['yy2'].max() == 3.3 * da.coords['yy'].max()
 
 
+def test_preprocess_use_non_dimension_coord_single_str():
+    da = data_array(ndim=1)
+    da.coords['xx2'] = 7.5 * da.coords['xx']
+    out = preprocess(da, coords='xx2')
+    assert set(out.dims) == {'xx2'}
+    assert out.coords['xx2'].max() == 7.5 * da.coords['xx'].max()
+
+
 def test_preprocess_warns_when_coordinate_is_not_sorted():
     da = data_array(ndim=1)
     unsorted = sc.concat([da['xx', 20:], da['xx', :20]], dim='xx')
@@ -40,12 +48,12 @@ def test_preprocess_no_warning_if_dtype_cannot_be_sorted():
         dims=['xx'], values=np.random.random((da.sizes['xx'], 3))
     )
     out = preprocess(da)  # no warning should be emitted
-    assert 'vecs' in out.coords
+    assert 'vecs' not in out.coords  # coord doesn't participate in plot
     da.coords['strings'] = sc.array(
         dims=['xx'], values=list('ba' * (da.sizes['xx'] // 2))
     )
     out = preprocess(da)  # no warning should be emitted
-    assert 'strings' in out.coords
+    assert 'strings' not in out.coords  # coord doesn't participate in plot
 
 
 @pytest.mark.parametrize(
@@ -70,3 +78,26 @@ def test_preprocess_raises_for_unsupported_dtype(dtype_and_shape):
         match=f'The input has dtype {dtype} which is not supported by Plopp',
     ):
         preprocess(v)
+
+
+def test_preprocess_drops_coords_that_are_not_plotted_dim_coords():
+    da = data_array(ndim=2)
+    da.coords['xx2'] = 7.5 * da.coords['xx']
+    da.coords['yy2'] = 3.3 * da.coords['yy']
+    out = preprocess(da)
+    assert set(out.coords) == {'xx', 'yy'}
+
+
+def test_preprocess_drops_coords_that_are_not_plotted_custom_coords():
+    da = data_array(ndim=2)
+    da.coords['xx2'] = 7.5 * da.coords['xx']
+    da.coords['yy2'] = 3.3 * da.coords['yy']
+    out = preprocess(da, coords=['yy2', 'xx'])
+    assert set(out.coords) == {'xx', 'yy2'}
+
+
+def test_preprocess_drops_coords_that_are_not_plotted_custom_coord_single_str():
+    da = data_array(ndim=1)
+    da.coords['xx2'] = 7.5 * da.coords['xx']
+    out = preprocess(da, coords='xx')
+    assert set(out.coords) == {'xx'}

{plopp-25.4.0 → plopp-25.5.0}/tests/plotting/plot_1d_test.py

@@ -414,6 +414,16 @@ def test_plot_1d_datetime_length_1():
     pp.plot(da)
 
 
+def test_plot_1d_extra_datetime_coord_binedges():
+    da = data_array(ndim=1)
+    dim = da.dim
+    size = da.sizes[dim]
+    da.coords['times'] = (sc.arange('t', 2 * size, unit='s') + sc.epoch(unit='s')).fold(
+        dim='t', sizes={dim: size, 't': 2}
+    )
+    pp.plot(da)
+
+
 def test_plot_1d_data_with_errorbars():
     da = data_array(ndim=1, variances=True)
     p = da.plot()