plopp 25.7.1__py3-none-any.whl → 25.9.0__py3-none-any.whl

plopp/backends/matplotlib/tiled.py

@@ -68,6 +68,8 @@ class Tiled:
         nrows: int,
         ncols: int,
         figsize: tuple[float, float] | None = None,
+        hspace: float = 0.05,
+        wspace: float = 0.1,
         **kwargs: Any,
     ) -> None:
         self.nrows = nrows
@@ -81,7 +83,9 @@ class Tiled:
             layout='constrained',
         )
 
-        self.gs = gridspec.GridSpec(nrows, ncols, figure=self.fig, **kwargs)
+        self.gs = gridspec.GridSpec(
+            nrows, ncols, figure=self.fig, wspace=wspace, hspace=hspace, **kwargs
+        )
         self.figures = np.full((nrows, ncols), None)
         self._history = []
 

plopp/data/examples.py

@@ -98,7 +98,9 @@ def three_bands(npeaks=200, per_peak=500, spread=30.0):
         data=sc.ones(sizes=xcoord.sizes, unit='counts'),
         coords={'x': xcoord, 'y': ycoord},
     )
-    return table.hist(y=300, x=300) + sc.scalar(1.0, unit='counts')
+    xedges = sc.linspace('x', -50, 350, num=nx + 1, unit='cm')
+    yedges = sc.linspace('y', -50, 350, num=ny + 1, unit='cm')
+    return table.hist(y=yedges, x=xedges) + sc.scalar(1.0, unit='counts')
 
 
 def clusters3d(nclusters=100, npercluster=2000):

plopp/graphics/colormapper.py

@@ -17,28 +17,58 @@ from ..core.limits import find_limits, fix_empty_range
 from ..core.utils import maybe_variable_to_number, merge_masks
 
 
-def _get_cmap(name: str, nan_color: str | None = None) -> Colormap:
+def _shift_color(color: float, delta: float) -> float:
+    """
+    Shift a color (number from 0 to 1) by delta. If the result is out of bounds,
+    the color is shifted in the opposite direction.
+    """
+    shifted = color + delta
+    if shifted > 1.0 or shifted < 0.0:
+        return color - delta
+    return shifted
+
+
+def _get_cmap(colormap: str | Colormap, nan_color: str | None = None) -> Colormap:
     """
     Get a colormap object from a colormap name.
+    We also set the 'over', 'under' and 'bad' colors. The 'bad' color is set to
+    ``nan_color`` if it is not None. The 'over' and 'under' colors are set to be
+    slightly lighter or darker than the first and last colors in the colormap.
 
     Parameters
     ----------
-    name:
+    colormap:
         Name of the colormap. If the name is just a single html color, this will
-        create a colormap with that single color.
+        create a colormap with that single color. If ``cmap`` is already a Colormap,
+        it will be used as is.
     nan_color:
         The color to use for NAN values.
     """
 
+    if isinstance(colormap, Colormap):
+        return colormap
+
     try:
         if hasattr(mpl, 'colormaps'):
-            cmap = copy(mpl.colormaps[name])
+            cmap = copy(mpl.colormaps[colormap])
         else:
-            cmap = mpl.cm.get_cmap(name)
+            cmap = mpl.cm.get_cmap(colormap)
     except (KeyError, ValueError):
-        cmap = LinearSegmentedColormap.from_list('tmp', [name, name])
-    # TODO: we need to set under and over values for the cmap with
-    # `cmap.set_under` and `cmap.set_over`. Ideally these should come from a config?
+        cmap = LinearSegmentedColormap.from_list('tmp', [colormap, colormap])
+
+    # Add under and over values to the cmap
+    delta = 0.15
+    cmap = cmap.copy()
+    over = cmap.get_over()
+    under = cmap.get_under()
+    # Note that we only shift the first 3 RGB values, leaving alpha unchanged.
+    cmap.set_over(
+        [_shift_color(c, delta * (-1 + 2 * (np.mean(over) > 0.5))) for c in over[:3]]
+    )
+    cmap.set_under(
+        [_shift_color(c, delta * (-1 + 2 * (np.mean(under) > 0.5))) for c in under[:3]]
+    )
+
     if nan_color is not None:
         cmap.set_bad(color=nan_color)
     return cmap
@@ -90,8 +120,8 @@ class ColorMapper:
         self,
         canvas: Any | None = None,
         cbar: bool = True,
-        cmap: str = 'viridis',
-        mask_cmap: str = 'gray',
+        cmap: str | Colormap = 'viridis',
+        mask_cmap: str | Colormap = 'gray',
         norm: Literal['linear', 'log'] = 'linear',
         vmin: sc.Variable | float | None = None,
         vmax: sc.Variable | float | None = None,

plopp/plotting/common.py

@@ -133,11 +133,14 @@ def check_not_binned(da: sc.DataArray) -> None:
         )
 
 
-def check_allowed_dtypes(da: sc.DataArray) -> None:
+def to_allowed_dtypes(da: sc.DataArray) -> sc.DataArray:
     """
     Currently, Plopp cannot plot data that contains vector and matrix dtypes.
     This function will raise an error if the input data type is not supported.
 
+    We also convert boolean data to integers, as some operations downstream
+    may not support boolean data types.
+
     Parameters
     ----------
     da:
@@ -147,6 +150,9 @@ def check_allowed_dtypes(da: sc.DataArray) -> None:
         raise TypeError(
             f'The input has dtype {da.dtype} which is not supported by Plopp.'
         )
+    if da.dtype == bool:
+        da = da.to(dtype='int32')
+    return da
 
 
 def _all_dims_sorted(var, order='ascending') -> bool:
@@ -283,7 +289,7 @@ def preprocess(
 
     out = to_data_array(obj)
     check_not_binned(out)
-    check_allowed_dtypes(out)
+    out = to_allowed_dtypes(out)
     if name is not None:
         out.name = str(name)
     if not ignore_size:

plopp/widgets/slice.py

@@ -27,15 +27,14 @@ class DimSlicer(ipw.VBox):
             )
         widget_args = {
             'step': 1,
-            'description': dim,
             'min': 0,
             'max': size - 1,
             'value': (size - 1) // 2 if slider_constr is ipw.IntSlider else None,
             'continuous_update': True,
             'readout': False,
             'layout': {"width": "200px", "margin": "0px 0px 0px 10px"},
-            'style': {'description_width': 'initial'},
         }
+        self.dim_label = ipw.Label(value=dim)
         self.slider = slider_constr(**widget_args)
         self.continuous_update = ipw.Checkbox(
             value=True,
@@ -50,7 +49,7 @@ class DimSlicer(ipw.VBox):
             (self.continuous_update, 'value'), (self.slider, 'continuous_update')
         )
 
-        children = [self.slider, self.continuous_update, self.label]
+        children = [self.dim_label, self.slider, self.continuous_update, self.label]
         if enable_player:
             self.player = ipw.Play(
                 value=self.slider.value,

{plopp-25.7.1.dist-info → plopp-25.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plopp
-Version: 25.7.1
+Version: 25.9.0
 Summary: Visualization library for Scipp
 Author: Scipp contributors
 License-Expression: BSD-3-Clause
@@ -12,13 +12,12 @@ Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
 Classifier: Typing :: Typed
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: lazy-loader>=0.4
@@ -41,7 +40,7 @@ Requires-Dist: mpltoolbox>=24.6.0; extra == "test"
 Requires-Dist: pandas>=2.2.2; extra == "test"
 Requires-Dist: plotly>=5.15.0; extra == "test"
 Requires-Dist: pooch>=1.5; extra == "test"
-Requires-Dist: pyarrow>=10.0.0; extra == "test"
+Requires-Dist: pyarrow>=13.0.0; extra == "test"
 Requires-Dist: pytest>=7.0; extra == "test"
 Requires-Dist: pythreejs>=2.4.1; extra == "test"
 Requires-Dist: scipp>=25.5.0; extra == "test"

{plopp-25.7.1.dist-info → plopp-25.9.0.dist-info}/RECORD

@@ -11,7 +11,7 @@ plopp/backends/matplotlib/image.py,sha256=YnczwdxsGmh0Nvrk1A8xL93ap2rzKI-0G428OC
 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
+plopp/backends/matplotlib/tiled.py,sha256=dy5bKixJP7MYoFJ-bAU4vc6baZaw6aKenD-WoahF_ZM,6238
 plopp/backends/matplotlib/utils.py,sha256=24gmT2sBHS_wUitUThSLavwSK95uqbLAhadNdxC19I0,3479
 plopp/backends/plotly/__init__.py,sha256=QNPZgWV3wO8psaMkSB-GtTOP-OIe9jSfwDdEt2xgbZg,107
 plopp/backends/plotly/canvas.py,sha256=JQXl8c23Ju-DTame2rZ4T_lgrArgH1WElUGJIaGyEbU,8943
@@ -33,7 +33,7 @@ plopp/core/typing.py,sha256=JL_mMdFq2dNu6LuZYSBfOXGZSEn0VIJK_lr-LbC11t4,2903
 plopp/core/utils.py,sha256=qxdOLRODgv3b0dDywT0JomsVrgifS_siC-ZpzJqgblo,7120
 plopp/core/view.py,sha256=9WulgLHg8aPjePz967WLWieTM40dvqlgJitu-AS3WdM,1972
 plopp/data/__init__.py,sha256=sOTLyBuiH-dxmpiVsZxd7L7YTkFMfAQUvah1g04AiQk,581
-plopp/data/examples.py,sha256=ysXNnZRywZUU9xDrACaFNK-8UCY_v70ZB169XXvToF4,3726
+plopp/data/examples.py,sha256=OoMKhxBvz_YaWfCJWXJmxSrXYFwI8sBbvE3YnPnd3fU,3858
 plopp/data/factory.py,sha256=A9plNosKSdKFfQdeY538EHcjK7IU4yqsSoj9p1-5Q-k,7026
 plopp/data/testing.py,sha256=g1PT5o7omwucdtRp37ep1fjr__kVBjpMkP4fz5xC2So,430
 plopp/graphics/__init__.py,sha256=s25RIbKplHSRn0jjtLADPQl72JLf_KLRMRCfeMDI_UA,205
@@ -41,13 +41,13 @@ plopp/graphics/__init__.pyi,sha256=yZQkWxUfP9eKHSP47WjrBiu59Z-uhP5gE2eUrPDa6jU,6
 plopp/graphics/basefig.py,sha256=N5gBQE8w2968biRV7a3wkxxq-BM14ncfX52y5HziWiQ,824
 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/colormapper.py,sha256=SEr68k3nRJW2VPV_42SwtQq7-gJHPA3n37YWoXNtgJs,10685
 plopp/graphics/figures.py,sha256=PLWQLnQNWz8epubYlK7HLSkvPGJmTAmHjJM2DqpvLe8,2735
 plopp/graphics/graphicalview.py,sha256=07xpJVnvuNlaWGsJshg_wL81jG57JhRxI23E7_WYI2M,9435
 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=dwtOpmMNY8deLWskiByKXficZUqX1pPGrkT_ieDN36c,10984
+plopp/plotting/common.py,sha256=L4qWscC6u8bgViecysVUi0mV6DHxycObkq_-nNdJb28,11182
 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
@@ -64,12 +64,12 @@ plopp/widgets/clip3d.py,sha256=L90HUd3bjEU3BaPdK8DnUbeeFNqfFyBWDEwaG9nP-M8,14602
 plopp/widgets/debounce.py,sha256=V5aIcnb465oqXZX-UG_DR7GjvoG6D_C2jjEUBmguGDA,1292
 plopp/widgets/drawing.py,sha256=Pcozffq7I5H9x57GNBJVvkCjVR6eaPBuxyHlFkEEjzQ,6252
 plopp/widgets/linesave.py,sha256=s5QcY-31x7Hvf9iLHmzfFIzodXTD9BX0Av3NlG8GS88,2458
-plopp/widgets/slice.py,sha256=hG1QzLsjmxjY4fjQwtlu8GxK6zzalrZsZxZzhwIaskg,5499
+plopp/widgets/slice.py,sha256=rWBxvNru7m9PDWSjUUb-WGPCTDfOcNDQBjP88HFEqbc,5474
 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.7.1.dist-info/licenses/LICENSE,sha256=fCqnkzCwkGneGtgOidkO2b3ed6SGZT0yhuworuJG0K0,1553
-plopp-25.7.1.dist-info/METADATA,sha256=noV3Jq7bY-J5VfnuPJ9kqXjYryD7ExTFR4pjDi3Q9Yk,2900
-plopp-25.7.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-plopp-25.7.1.dist-info/top_level.txt,sha256=Lk_GLFh37eX-3PO3c6bPkDpir7GjJmbQHYza3IpIphc,6
-plopp-25.7.1.dist-info/RECORD,,
+plopp-25.9.0.dist-info/licenses/LICENSE,sha256=fCqnkzCwkGneGtgOidkO2b3ed6SGZT0yhuworuJG0K0,1553
+plopp-25.9.0.dist-info/METADATA,sha256=M-OflE2x859M-foyGiW1pCHiH-cXd7Y7jZQ-wreNwkU,2849
+plopp-25.9.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+plopp-25.9.0.dist-info/top_level.txt,sha256=Lk_GLFh37eX-3PO3c6bPkDpir7GjJmbQHYza3IpIphc,6
+plopp-25.9.0.dist-info/RECORD,,