batplot 1.7.27__tar.gz → 1.7.28__tar.gz

{batplot-1.7.27/batplot.egg-info → batplot-1.7.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.7.27
+Version: 1.7.28
 Summary: Interactive plotting tool for material science (1D plot) and electrochemistry (GC, CV, dQ/dV, CPC, operando) with batch processing
 Author-email: Tian Dai <tianda@uio.no>
 License: MIT License

{batplot-1.7.27 → batplot-1.7.28}/batplot/__init__.py

@@ -1,5 +1,5 @@
 """batplot: Interactive plotting for battery data visualization."""
 
-__version__ = "1.7.27"
+__version__ = "1.7.28"
 
 __all__ = ["__version__"]

{batplot-1.7.27 → batplot-1.7.28}/batplot/operando_ec_interactive.py

@@ -344,6 +344,64 @@ def _update_custom_colorbar(cbar_ax, im=None, label=None, label_mode=None):
     _draw_custom_colorbar(cbar_ax, im, label, label_mode)
 
 
+def _detach_mpl_colorbar_callbacks(cbar, im) -> None:
+    """Detach a Matplotlib Colorbar from its mappable callbacks.
+
+    Why this exists:
+    - In this interactive menu we draw a *custom* colorbar by clearing/redrawing `cbar.ax`.
+    - If `cbar` is a real `matplotlib.colorbar.Colorbar` (e.g., loaded from a session),
+      it remains connected to `im` via `im.callbacksSM`. Subsequent `im.set_clim()` /
+      `im.set_cmap()` triggers `Colorbar.update_normal()`, which can crash after we
+      cleared/redrew the axes (observed as: NotImplementedError: cannot remove artist).
+    - We therefore disconnect that callback once and always update the custom colorbar
+      via `_update_custom_colorbar(...)`.
+    """
+    try:
+        if cbar is None or im is None:
+            return
+        cax = getattr(cbar, 'ax', None)
+        if cax is not None and getattr(cax, '_bp_detached_mpl_colorbar', False):
+            return
+
+        # Matplotlib's Colorbar stores the callback id as `_cid` (most versions).
+        cid = None
+        for attr in ('_cid', '_cid_colorbar', 'cid'):
+            try:
+                v = getattr(cbar, attr, None)
+                if isinstance(v, int):
+                    cid = v
+                    break
+            except Exception:
+                pass
+
+        # Disconnect from the ScalarMappable callback registry.
+        if cid is not None:
+            try:
+                cbreg = getattr(im, 'callbacksSM', None)
+                if cbreg is not None and hasattr(cbreg, 'disconnect'):
+                    cbreg.disconnect(cid)
+            except Exception:
+                pass
+
+        # Prevent future built-in updates (best-effort; safe for mock colorbars too).
+        try:
+            if hasattr(cbar, 'mappable'):
+                cbar.mappable = None
+        except Exception:
+            pass
+        try:
+            if hasattr(cbar, 'solids'):
+                cbar.solids = None
+        except Exception:
+            pass
+
+        if cax is not None:
+            setattr(cax, '_bp_detached_mpl_colorbar', True)
+    except Exception:
+        # Never let detaching break the interactive menu.
+        return
+
+
 def _ensure_fixed_params(fig, ax, cbar_ax, ec_ax):
     """Initialize and return fixed geometry parameters in inches.
     
@@ -540,6 +598,11 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
     # Normalize file path list for downstream helpers
     file_paths = list(file_paths) if file_paths else []
 
+    # If we were given a real Matplotlib Colorbar (e.g. from session load),
+    # detach it from `im` immediately. This must happen before any function
+    # that may clear/redraw `cbar.ax` (custom colorbar) is called.
+    _detach_mpl_colorbar_callbacks(cbar, im)
+
     def _renormalize_to_visible():
         """Adjust color scale to match the intensity range of the currently visible region.
         
@@ -904,6 +967,9 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
     # Initialize custom colorbar (replaces matplotlib's colorbar)
     cbar_label = getattr(cbar.ax, '_colorbar_label', 'Intensity')
     cbar_label_mode = getattr(fig, '_colorbar_label_mode', 'normal')
+    # If we were given a real Matplotlib Colorbar (e.g. from session load),
+    # detach it from `im` before we clear/redraw the axes for the custom colorbar.
+    _detach_mpl_colorbar_callbacks(cbar, im)
     _draw_custom_colorbar(cbar.ax, im, cbar_label, cbar_label_mode)
     # Decrease distance between operando and EC plots once per session
     if not getattr(ec_ax, '_ec_gap_adjusted', False):
@@ -1204,7 +1270,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 if snap.get('cmap'):
                     im.set_cmap(snap['cmap'])
                     if cbar is not None:
-                        cbar.update_normal(im)
+                        _update_custom_colorbar(cbar.ax, im)
             except Exception:
                 pass
             # Restore colorbar side (ticks/label) and redraw custom colorbar to keep position
@@ -3921,7 +3987,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     try:
                         im.set_cmap(cmap)
                         if cbar is not None:
-                            cbar.update_normal(im)
+                            _update_custom_colorbar(cbar.ax, im)
                     except Exception:
                         pass
                 

{batplot-1.7.27 → batplot-1.7.28/batplot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.7.27
+Version: 1.7.28
 Summary: Interactive plotting tool for material science (1D plot) and electrochemistry (GC, CV, dQ/dV, CPC, operando) with batch processing
 Author-email: Tian Dai <tianda@uio.no>
 License: MIT License

{batplot-1.7.27 → batplot-1.7.28}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "batplot"
-version = "1.7.27"
+version = "1.7.28"
 description = "Interactive plotting tool for material science (1D plot) and electrochemistry (GC, CV, dQ/dV, CPC, operando) with batch processing"
 authors = [
     { name = "Tian Dai", email = "tianda@uio.no" }