Clean up syntax and remove unused code. Add regression tests for Plot2D methods and ensure top-level imports are accessible.

Author: CSSFrancis

Examples/Interactive/plot_key_bindings.py

@@ -4,21 +4,22 @@
 
 Demonstrates the ``on_key`` callback API: press a key while the plot is
 focused to add an overlay widget centred on the current cursor position,
-or press **Delete** to remove the last widget you clicked.
+or press **Backspace / Delete** to remove the last widget you clicked.
 
 **Key bindings**
 
-+-------+---------------------------+
-| Key   | Action                    |
-+=======+===========================+
-| ``q`` | Add a rectangle           |
-+-------+---------------------------+
-| ``w`` | Add a circle              |
-+-------+---------------------------+
-| ``e`` | Add an annulus            |
-+-------+---------------------------+
-| ``Delete`` | Remove last-clicked  |
-+-------+---------------------------+
++-------------------------------+---------------------------+
+| Key                           | Action                    |
++===============================+===========================+
+| ``q``                         | Add a rectangle           |
++-------------------------------+---------------------------+
+| ``w``                         | Add a circle              |
++-------------------------------+---------------------------+
+| ``e``                         | Add an annulus            |
++-------------------------------+---------------------------+
+| ``Backspace`` (macOS ⌫)       | Remove last-clicked       |
+| ``Delete`` (Windows / Linux)  |                           |
++-------------------------------+---------------------------+
 
 **Built-in 2-D shortcuts** (not overridden in this example):
 
@@ -40,7 +41,8 @@
 
 .. note::
    Move the mouse over the image first so the plot panel receives focus,
-   then press a key.
+   then press a key.  On macOS the backspace key (⌫) is used for deletion;
+   on Windows / Linux use the **Delete** key.
 """
 
 import numpy as np
@@ -95,19 +97,25 @@ def add_annulus(event):
     )
 
 
+# macOS sends 'Backspace' for the ⌫ key; Windows/Linux send 'Delete'.
+# Register both so the example works cross-platform.
+@plot.on_key('Backspace')
 @plot.on_key('Delete')
 def delete_last(event):
-    """Press Delete — remove the last widget that was clicked / dragged."""
+    """Press Backspace/Delete — remove the last widget that was clicked."""
     wid = event.last_widget_id
     if wid and wid in {w.id for w in plot.list_widgets()}:
         plot.remove_widget(wid)
 
 
-# ── Catch-all handler (optional) — print every registered key press ──────────
+# ── Catch-all handler (optional) — log every registered key press ─────────────
 
 @plot.on_key
 def log_key(event):
-    print(f"[on_key] key={event.key!r}  img=({event.img_x:.1f}, {event.img_y:.1f})"
+    img_x = getattr(event, 'img_x', None)
+    img_y = getattr(event, 'img_y', None)
+    pos = f"({img_x:.1f}, {img_y:.1f})" if img_x is not None else "n/a"
+    print(f"[on_key] key={event.key!r}  img={pos}"
           f"  last_widget={event.last_widget_id!r}")
 
 fig

anyplotlib/__init__.py

@@ -1,5 +1,6 @@
 from anyplotlib.figure import Figure, GridSpec, SubplotSpec, subplots
-from anyplotlib.figure_plots import PlotMesh, Plot3D, PlotBar
+from anyplotlib.figure_plots import Axes, Plot1D, Plot2D, PlotMesh, Plot3D, PlotBar
+from anyplotlib.callbacks import CallbackRegistry, Event
 from anyplotlib.widgets import (
     Widget, RectangleWidget, CircleWidget, AnnularWidget,
     CrosshairWidget, PolygonWidget, LabelWidget,
@@ -8,7 +9,8 @@
 
 __all__ = [
     "Figure", "GridSpec", "SubplotSpec", "subplots",
-    "PlotMesh", "Plot3D", "PlotBar",
+    "Axes", "Plot1D", "Plot2D", "PlotMesh", "Plot3D", "PlotBar",
+    "CallbackRegistry", "Event",
     "Widget", "RectangleWidget", "CircleWidget", "AnnularWidget",
     "CrosshairWidget", "PolygonWidget", "LabelWidget",
     "VLineWidget", "HLineWidget", "RangeWidget",

anyplotlib/_repr_utils.py

@@ -7,7 +7,7 @@
 
 Strategy
 --------
- and 1. Serialise every synced traitlet value to a plain JSON dict.
+1. Serialise every synced traitlet value to a plain JSON dict.
 2. Embed that dict and the widget's ``_esm`` source directly in the page.
 3. Provide a minimal model shim (get/set/on/save_changes) so the ESM's
    render() function works without any Jupyter comm infrastructure.

anyplotlib/figure.py

@@ -163,7 +163,6 @@ def _on_resize(self, change) -> None:
     @traitlets.observe("event_json")
     def _on_event(self, change) -> None:
         """Dispatch a JS interaction event to the relevant plot and widget callbacks."""
-        print("_on_event:", change["new"])
         raw = change["new"]
         if not raw or raw == "{}":
             return

anyplotlib/figure_esm.js

@@ -84,7 +84,7 @@ function render({ model, el }) {
 
   // ── outer DOM ────────────────────────────────────────────────────────────
   const outerDiv = document.createElement('div');
-  outerDiv.style.cssText = 'position:relative;display:inline-block;user-select:none;';
+  outerDiv.style.cssText = 'position:relative;display:inline-block;user-select:none;z-index:1;isolation:isolate;';
   el.appendChild(outerDiv);
 
   const gridDiv = document.createElement('div');
@@ -95,7 +95,7 @@ function render({ model, el }) {
   const resizeHandle = document.createElement('div');
   resizeHandle.style.cssText =
     'position:absolute;bottom:2px;right:2px;width:16px;height:16px;cursor:nwse-resize;' +
-    'background:linear-gradient(135deg,transparent 50%,#888 50%);border-radius:0 0 4px 0;z-index:20;';
+    'background:linear-gradient(135deg,transparent 50%,#888 50%);border-radius:0 0 4px 0;z-index:100;';
   resizeHandle.title = 'Drag to resize figure';
   outerDiv.appendChild(resizeHandle);
 
@@ -170,7 +170,7 @@ function render({ model, el }) {
 
   function _createPanelDOM(id, kind, pw, ph, spec) {
     const cell = document.createElement('div');
-    cell.style.cssText = 'position:relative;overflow:visible;line-height:0;';
+    cell.style.cssText = 'position:relative;overflow:visible;line-height:0;display:flex;justify-content:center;align-items:flex-start;';
     cell.style.gridRow    = `${spec.row_start+1} / ${spec.row_stop+1}`;
     cell.style.gridColumn = `${spec.col_start+1} / ${spec.col_stop+1}`;
     gridDiv.appendChild(cell);
@@ -1240,14 +1240,14 @@ function render({ model, el }) {
           last_widget_id: p.lastWidgetId || null,
           mouse_x: p.mouseX, mouse_y: p.mouseY,
         });
-        e.preventDefault(); return;
+        e.stopPropagation(); e.preventDefault(); return;
       }
       if (e.key.toLowerCase() === 'r') {
         p.state.azimuth = -60; p.state.elevation = 30; p.state.zoom = 1;
         draw3d(p);
         model.set(`panel_${p.id}_json`, JSON.stringify(p.state));
         model.save_changes();
-        e.preventDefault();
+        e.stopPropagation(); e.preventDefault();
       }
     });
     overlayCanvas.tabIndex = 0;
@@ -1820,26 +1820,26 @@ function render({ model, el }) {
           img_x:imgX, img_y:imgY,
           phys_x:physX, phys_y:physY,
         });
-        e.preventDefault(); return;
+        e.stopPropagation(); e.preventDefault(); return;
       }
       const key=e.key.toLowerCase();
       if(key==='r'){
         st.zoom=1; st.center_x=0.5; st.center_y=0.5;
         draw2d(p); model.set(`panel_${p.id}_json`,JSON.stringify(st)); model.save_changes();
-        e.preventDefault();
+        e.stopPropagation(); e.preventDefault();
       } else if(key==='c'){
         st.show_colorbar=!st.show_colorbar;
         draw2d(p);
         model.set(`panel_${p.id}_json`,JSON.stringify(st)); model.save_changes();
-        e.preventDefault();
+        e.stopPropagation(); e.preventDefault();
       } else if(key==='l'){
         st.scale_mode=st.scale_mode==='log'?'linear':'log';
         draw2d(p); model.set(`panel_${p.id}_json`,JSON.stringify(st)); model.save_changes();
-        e.preventDefault();
+        e.stopPropagation(); e.preventDefault();
       } else if(key==='s'){
         st.scale_mode=st.scale_mode==='symlog'?'linear':'symlog';
         draw2d(p); model.set(`panel_${p.id}_json`,JSON.stringify(st)); model.save_changes();
-        e.preventDefault();
+        e.stopPropagation(); e.preventDefault();
       }
     });
     overlayCanvas.addEventListener('mouseenter',()=>overlayCanvas.focus());
@@ -1933,9 +1933,9 @@ function render({ model, el }) {
           mouse_x:p.mouseX, mouse_y:p.mouseY,
           phys_x:physX,
         });
-        e.preventDefault(); return;
+        e.stopPropagation(); e.preventDefault(); return;
       }
-      if(e.key.toLowerCase()==='r'){st.view_x0=0;st.view_x1=1;draw1d(p);model.set(`panel_${p.id}_json`,JSON.stringify(st));model.save_changes();e.preventDefault();}
+      if(e.key.toLowerCase()==='r'){st.view_x0=0;st.view_x1=1;draw1d(p);model.set(`panel_${p.id}_json`,JSON.stringify(st));model.save_changes();e.stopPropagation();e.preventDefault();}
     });
     overlayCanvas.tabIndex=0;overlayCanvas.style.outline='none';
     overlayCanvas.addEventListener('mouseenter',()=>overlayCanvas.focus());
@@ -2767,7 +2767,7 @@ function render({ model, el }) {
           last_widget_id: p.lastWidgetId || null,
           mouse_x: p.mouseX, mouse_y: p.mouseY,
         });
-        e.preventDefault();
+        e.stopPropagation(); e.preventDefault();
       }
     });
     overlayCanvas.tabIndex = 0;

anyplotlib/figure_plots.py

@@ -404,7 +404,7 @@ def _normalize_image(data: np.ndarray):
     "plasma":        "fire",      # warm sequential (dark→bright)
     "inferno":       "kb",        # dark→blue→white
     "magma":         "kbc",       # dark→blue→cyan sequential
-    "cividis":       "dimgray",   # accessible, low-chroma sequential
+    "cividis":       "bgy",        # accessible, blue→green→yellow sequential
     "hot":           "fire",
     "afmhot":        "fire",
     "jet":           "rainbow4",
@@ -805,21 +805,58 @@ def disconnect(self, cid: int) -> None:
     # ------------------------------------------------------------------
     # View control
     # ------------------------------------------------------------------
-    def set_view(self, x0: float | None = None, x1: float | None = None) -> None:
+    def set_view(self,
+                 x0: float | None = None, x1: float | None = None,
+                 y0: float | None = None, y1: float | None = None) -> None:
+        """Set the viewport to a data-space rectangle.
+
+        Parameters
+        ----------
+        x0, x1 : float, optional
+            Horizontal data-space range to show.  If omitted the full
+            x-extent is used for zoom calculation.
+        y0, y1 : float, optional
+            Vertical data-space range to show.  If omitted the full
+            y-extent is used for zoom calculation.
+
+        Translates the requested rectangle into the ``zoom`` / ``center_x``
+        / ``center_y`` state values used by the 2-D JS renderer.
+        """
         xarr = np.asarray(self._state["x_axis"])
-        if len(xarr) < 2:
+        yarr = np.asarray(self._state["y_axis"])
+        if len(xarr) < 2 or len(yarr) < 2:
             return
+
         xmin, xmax = float(xarr[0]), float(xarr[-1])
-        span = xmax - xmin or 1.0
-        f0 = 0.0 if x0 is None else max(0.0, min(1.0, (float(x0)-xmin)/span))
-        f1 = 1.0 if x1 is None else max(0.0, min(1.0, (float(x1)-xmin)/span))
-        self._state["view_x0"] = f0
-        self._state["view_x1"] = f1
+        ymin, ymax = float(yarr[0]), float(yarr[-1])
+        x_span = xmax - xmin or 1.0
+        y_span = ymax - ymin or 1.0
+
+        zoom_candidates = []
+
+        if x0 is not None and x1 is not None:
+            fx0 = max(0.0, min(1.0, (float(x0) - xmin) / x_span))
+            fx1 = max(0.0, min(1.0, (float(x1) - xmin) / x_span))
+            if fx1 > fx0:
+                self._state["center_x"] = (fx0 + fx1) / 2.0
+                zoom_candidates.append(1.0 / (fx1 - fx0))
+
+        if y0 is not None and y1 is not None:
+            fy0 = max(0.0, min(1.0, (float(y0) - ymin) / y_span))
+            fy1 = max(0.0, min(1.0, (float(y1) - ymin) / y_span))
+            if fy1 > fy0:
+                self._state["center_y"] = (fy0 + fy1) / 2.0
+                zoom_candidates.append(1.0 / (fy1 - fy0))
+
+        if zoom_candidates:
+            self._state["zoom"] = min(zoom_candidates)
         self._push()
 
     def reset_view(self) -> None:
-        self._state["view_x0"] = 0.0
-        self._state["view_x1"] = 1.0
+        """Reset pan and zoom to show the full image."""
+        self._state["zoom"]     = 1.0
+        self._state["center_x"] = 0.5
+        self._state["center_y"] = 0.5
         self._push()
 
     # ------------------------------------------------------------------
@@ -833,8 +870,8 @@ def add_circles(self, offsets, name=None, *, radius=5,
                     linewidths=1.5, alpha=0.3,
                     hover_edgecolors=None, hover_facecolors=None,
                     labels=None, label=None) -> "MarkerGroup":  # noqa: F821
-        # On 1-D panels the native type is "points" (radius maps to sizes).
-        return self._add_marker("points", name, offsets=offsets, sizes=radius,
+        """Add circle markers at (x, y) positions in data coordinates."""
+        return self._add_marker("circles", name, offsets=offsets, radius=radius,
                                 facecolors=facecolors, edgecolors=edgecolors,
                                 linewidths=linewidths, alpha=alpha,
                                 hover_edgecolors=hover_edgecolors,
@@ -847,7 +884,7 @@ def add_points(self, offsets, name=None, *, sizes=5,
                    hover_edgecolors=None, hover_facecolors=None,
                    labels=None, label=None) -> "MarkerGroup":  # noqa: F821
         """Add point markers at (x, y) positions in data coordinates."""
-        return self._add_marker("points", name, offsets=offsets, sizes=sizes,
+        return self._add_marker("circles", name, offsets=offsets, radius=sizes,
                                 edgecolors=color, facecolors=facecolors,
                                 linewidths=linewidths, alpha=alpha,
                                 hover_edgecolors=hover_edgecolors,
@@ -965,6 +1002,12 @@ def list_markers(self) -> list:
                 out.append({"type": mtype, "name": name, "n": g._count()})
         return out
 
+    def __repr__(self) -> str:
+        w = self._state.get("image_width", "?")
+        h = self._state.get("image_height", "?")
+        cmap = self._state.get("colormap_name", "?")
+        return f"Plot2D({w}\u00d7{h}, cmap={cmap!r})"
+
 
 # ---------------------------------------------------------------------------
 # PlotMesh  (pcolormesh-style 2-D panel)
@@ -1323,6 +1366,11 @@ def update(self, x, y, z) -> None:
         })
         self._push()
 
+    def __repr__(self) -> str:
+        geom = self._state.get("geom_type", "?")
+        n = len(self._state.get("vertices", []))
+        return f"Plot3D(geom={geom!r}, n_vertices={n})"
+
 
 # ---------------------------------------------------------------------------
 # Plot1D
@@ -1779,6 +1827,11 @@ def list_markers(self) -> list:
                 out.append({"type": mtype, "name": name, "n": g._count()})
         return out
 
+    def __repr__(self) -> str:
+        n = len(self._state.get("data", []))
+        color = self._state.get("line_color", "?")
+        return f"Plot1D(n={n}, color={color!r})"
+
 
 # ---------------------------------------------------------------------------
 # _bar_x_axis helper

pyproject.toml

@@ -13,9 +13,7 @@ requires-python = ">=3.10"
 dependencies = [
     "anywidget>=0.9.0",
     "colorcet>=3.0",
-    "jupyterlab>=4.5.5",
     "numpy>=2.0.0",
-    "pytest>=9.0.2",
     "traitlets>=5.0.0",
 ]
 
@@ -27,10 +25,14 @@ docs = [
     "pillow>=10.0",
     "matplotlib>=3.7",
 ]
+jupyter = [
+    "jupyterlab>=4.5.5",
+]
 
 [dependency-groups]
 dev = [
     "playwright>=1.58.0",
+    "pytest>=9.0.2",
 ]