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

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-25.4.1.dist-info → plopp-25.5.0.dist-info}/METADATA

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

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

@@ -43,11 +43,11 @@ 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=WQzw1vHGljWY1tQU1InQWe2-M-vCW2IRiL-v7cnw46w,3886
@@ -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.1.dist-info/licenses/LICENSE,sha256=fCqnkzCwkGneGtgOidkO2b3ed6SGZT0yhuworuJG0K0,1553
-plopp-25.4.1.dist-info/METADATA,sha256=ldO8vURvNcAl2TRMrj6JGatMte8GybEgq-d0lf7vwDo,4533
-plopp-25.4.1.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-plopp-25.4.1.dist-info/top_level.txt,sha256=Lk_GLFh37eX-3PO3c6bPkDpir7GjJmbQHYza3IpIphc,6
-plopp-25.4.1.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.1.dist-info → plopp-25.5.0.dist-info}/WHEEL

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