Fix user figure DPI silently overridden by pl.show() (#575)

Author: timtreis

src/spatialdata_plot/pl/utils.py

@@ -244,14 +244,17 @@ def _prepare_params_plot(
     # handle axes and size
     wspace = 0.75 / rcParams["figure.figsize"][0] + 0.02 if wspace is None else wspace
     figsize = rcParams["figure.figsize"] if figsize is None else figsize
-    dpi = rcParams["figure.dpi"] if dpi is None else dpi
+    # When creating a new figure, fall back to rcParams; when the user provides
+    # their own axes, preserve the figure's existing DPI (only override if
+    # the user explicitly passed dpi= to show()).
+    resolved_dpi = rcParams["figure.dpi"] if dpi is None else dpi
     if num_panels > 1 and ax is None:
         fig, grid = _panel_grid(
             num_panels=num_panels,
             hspace=hspace,
             wspace=wspace,
             ncols=ncols,
-            dpi=dpi,
+            dpi=resolved_dpi,
             figsize=figsize,
         )
         axs: None | Sequence[Axes] = [plt.subplot(grid[c]) for c in range(num_panels)]
@@ -266,14 +269,16 @@ def _prepare_params_plot(
             )
         assert ax is None or isinstance(ax, Sequence), f"Invalid type of `ax`: {type(ax)}, expected `Sequence`."
         axs = ax
+        if dpi is not None:
+            fig.set_dpi(dpi)
     else:
         axs = None
         if ax is None:
-            fig, ax = plt.subplots(figsize=figsize, dpi=dpi, constrained_layout=True)
+            fig, ax = plt.subplots(figsize=figsize, dpi=resolved_dpi, constrained_layout=True)
         elif isinstance(ax, Axes):
-            # needed for rasterization if user provides Axes object
             fig = ax.get_figure()
-            fig.set_dpi(dpi)
+            if dpi is not None:
+                fig.set_dpi(dpi)
 
     # set scalebar
     if scalebar_dx is not None:
@@ -1955,10 +1960,10 @@ def _rasterize_if_necessary(
     target_y_dims = dpi * height
     target_x_dims = dpi * width
 
-    # Heuristics for when to rasterize
+    # Rasterize when the source image is substantially larger than what the
+    # current figure DPI × size requires.  The +100 margin avoids rasterizing
+    # when the image is only slightly larger than the target.
     do_rasterization = y_dims > target_y_dims + 100 or x_dims > target_x_dims + 100
-    if x_dims < 2000 and y_dims < 2000:
-        do_rasterization = False
 
     if do_rasterization:
         logger.info("Rasterizing image for faster rendering.")