plopp 25.4.0__tar.gz → 25.4.1__tar.gz

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

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

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

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

{plopp-25.4.0 → plopp-25.4.1}/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.4.1}/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