Refactor: Enhance subplot adjustment method to allow optional spacing parameters and improve error handling for axis scale settings

Author: CSSFrancis

anyplotlib/_utils.py

@@ -51,7 +51,7 @@ def _norm_linestyle(ls: str) -> str:
     if canonical is None:
         raise ValueError(
             f"Unknown linestyle {ls!r}. Expected one of: "
-            "'solid', 'dashed', 'dotted', 'dashdot', 'step-mid' "
+            "'solid', 'dashed', 'dotted', 'dashdot', 'step-mid' (alias: 'steps-mid') "
             "or shorthands '-', '--', ':', '-.'."
         )
     return canonical

anyplotlib/figure/_figure.py

@@ -151,23 +151,27 @@ def set_help(self, text: str) -> None:
         """
         self.help_text = self._resolve_help(text)
 
-    def subplots_adjust(self, hspace: float = 0.0, wspace: float = 0.0) -> None:
+    def subplots_adjust(self, hspace: float | None = None,
+                        wspace: float | None = None) -> None:
         """Set the spacing between subplot panels.
 
+        Only the arguments that are explicitly provided are updated; omitting
+        an argument leaves the current value unchanged.
+
         Parameters
         ----------
         hspace : float, optional
             Fraction of the average row height to use as vertical gap between
             panels.  ``0.1`` adds a gap of 10 % of the mean row height.
-            Default ``0.0`` (no gap).  Before ``subplots_adjust`` is called,
-            figures use a 4 px browser default gap.
+            ``None`` (default) leaves the current hspace unchanged.
         wspace : float, optional
             Fraction of the average column width to use as horizontal gap.
-            Default ``0.0`` (no gap).  Before ``subplots_adjust`` is called,
-            figures use a 4 px browser default gap.
+            ``None`` (default) leaves the current wspace unchanged.
         """
-        self._hspace = float(hspace)
-        self._wspace = float(wspace)
+        if hspace is not None:
+            self._hspace = float(hspace)
+        if wspace is not None:
+            self._wspace = float(wspace)
         self._push_layout()
 
     # ── subplot creation ──────────────────────────────────────────────────────
@@ -502,7 +506,7 @@ def close(self) -> None:
             if hasattr(plot, "callbacks"):
                 plot.callbacks.fire(close_event)
         try:
-            self.layout = {"display": "none"}
+            self.layout.display = "none"
         except Exception:
             pass
 

anyplotlib/figure_esm.js

@@ -2468,8 +2468,8 @@ function render({ model, el }) {
           const [cx,cy]= tfm==='data' ? _offToCanvas(off) : _tc2d(off[0],off[1]!=null?off[1]:0);
           const wd=ms.widths[i]!=null?ms.widths[i]:(ms.widths[0]||10);
           const hd=ms.heights[i]!=null?ms.heights[i]:(ms.heights[0]||10);
-          const rw=Math.max(1,Math.abs(_xPx(off[0]+wd/2)-_xPx(off[0]-wd/2))/2);
-          const rh=Math.max(1,Math.abs(_yPx((off[1]||0)-hd/2)-_yPx((off[1]||0)+hd/2))/2);
+          const rw=Math.max(1, tfm==='data' ? Math.abs(_xPx(off[0]+wd/2)-_xPx(off[0]-wd/2))/2 : wd/2);
+          const rh=Math.max(1, tfm==='data' ? Math.abs(_yPx((off[1]||0)-hd/2)-_yPx((off[1]||0)+hd/2))/2 : hd/2);
           const ang=((ms.angles&&(ms.angles[i]!=null?ms.angles[i]:ms.angles[0])||0)*Math.PI)/180;
           mkCtx.beginPath();mkCtx.ellipse(cx,cy,rw,rh,ang,0,Math.PI*2);
           if(fch){mkCtx.save();mkCtx.globalAlpha=fa;mkCtx.fillStyle=fch;mkCtx.fill();mkCtx.restore();}
@@ -2482,8 +2482,8 @@ function render({ model, el }) {
           const [cx,cy]= tfm==='data' ? _offToCanvas(off) : _tc2d(off[0],off[1]!=null?off[1]:0);
           const wd=ms.widths[i]!=null?ms.widths[i]:(ms.widths[0]||10);
           const hd=heights[i]!=null?heights[i]:(heights[0]||10);
-          const rw=Math.max(1,Math.abs(_xPx(off[0]+wd/2)-_xPx(off[0]-wd/2)));
-          const rh=Math.max(1,Math.abs(_yPx((off[1]||0)-hd/2)-_yPx((off[1]||0)+hd/2)));
+          const rw=Math.max(1, tfm==='data' ? Math.abs(_xPx(off[0]+wd/2)-_xPx(off[0]-wd/2)) : wd);
+          const rh=Math.max(1, tfm==='data' ? Math.abs(_yPx((off[1]||0)-hd/2)-_yPx((off[1]||0)+hd/2)) : hd);
           const ang=((ms.angles&&(ms.angles[i]!=null?ms.angles[i]:ms.angles[0])||0)*Math.PI)/180;
           mkCtx.save();mkCtx.translate(cx,cy);mkCtx.rotate(ang);
           if(fch){mkCtx.save();mkCtx.globalAlpha=fa;mkCtx.fillStyle=fch;mkCtx.fillRect(-rw/2,-rh/2,rw,rh);mkCtx.restore();}

anyplotlib/plot1d/_plot1d.py

@@ -250,6 +250,9 @@ def __init__(self, data: np.ndarray,
         self._id:  str = ""
         self._fig: object = None
 
+        if yscale not in ("linear", "log"):
+            raise ValueError("yscale must be 'linear' or 'log'")
+
         data = np.asarray(data, dtype=float)
         if data.ndim != 1:
             raise ValueError(f"data must be 1-D, got {data.shape}")

anyplotlib/plot1d/_plotbar.py

@@ -107,6 +107,11 @@ def __init__(self, x, height=None, width: float = 0.8, bottom: float = 0.0, *,
         self._id:  str = ""
         self._fig: object = None
 
+        if align not in ("center", "edge"):
+            raise ValueError("align must be 'center' or 'edge'")
+        if orient not in ("v", "h"):
+            raise ValueError("orient must be 'v' or 'h'")
+
         # ── legacy resolution ──────────────────────────────────────────
         if height is None:
             if values is not None:

anyplotlib/plot3d/_plot3d.py

@@ -199,15 +199,15 @@ def set_title(self, label: str) -> None:
         self._push()
 
     def set_xlabel(self, label: str) -> None:
-        self._state["x_label"] = label
+        self._state["x_label"] = str(label)
         self._push()
 
     def set_ylabel(self, label: str) -> None:
-        self._state["y_label"] = label
+        self._state["y_label"] = str(label)
         self._push()
 
     def set_zlabel(self, label: str) -> None:
-        self._state["z_label"] = label
+        self._state["z_label"] = str(label)
         self._push()
 
     def get_xlim(self) -> tuple: