batplot 1.7.27__py3-none-any.whl → 1.8.0__py3-none-any.whl

batplot/operando_ec_interactive.py

@@ -18,6 +18,7 @@ from typing import Tuple, Dict, Optional, Any
 import json
 import os
 import time
+import sys
 
 import matplotlib.pyplot as plt
 from matplotlib.colors import LinearSegmentedColormap
@@ -41,6 +42,37 @@ from .color_utils import (
 from .utils import choose_style_file
 
 
+class _FilterIMKWarning:
+    """Filter that suppresses macOS IMKCFRunLoopWakeUpReliable warnings while preserving other errors."""
+    def __init__(self, original_stderr):
+        self.original_stderr = original_stderr
+    
+    def write(self, message):
+        # Filter out the harmless macOS IMK warning
+        if 'IMKCFRunLoopWakeUpReliable' not in message:
+            self.original_stderr.write(message)
+    
+    def flush(self):
+        self.original_stderr.flush()
+
+
+def _safe_input(prompt: str = "") -> str:
+    """Wrapper around input() that suppresses macOS IMKCFRunLoopWakeUpReliable warnings.
+    
+    This is a harmless macOS system message that appears when using input() in terminals.
+    """
+    # Filter stderr to hide macOS IMK warnings while preserving other errors
+    original_stderr = sys.stderr
+    sys.stderr = _FilterIMKWarning(original_stderr)
+    try:
+        result = input(prompt)
+        return result
+    except (KeyboardInterrupt, EOFError):
+        raise
+    finally:
+        sys.stderr = original_stderr
+
+
 def _axis_tick_width(axis_obj, which: str = 'major'):
     """Return tick line width from axis tick params or rc defaults."""
     try:
@@ -344,6 +376,94 @@ 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
+
+        # APPROACH 1: Try to find and disconnect the callback ID
+        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
+
+        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
+
+        # APPROACH 2: Disconnect ALL callbacks from the image (nuclear option)
+        try:
+            cbreg = getattr(im, 'callbacksSM', None)
+            if cbreg is not None:
+                # Try to clear all callbacks
+                if hasattr(cbreg, 'callbacks'):
+                    try:
+                        cbreg.callbacks.clear()
+                    except Exception:
+                        pass
+                # Also try the _signals dict if it exists
+                if hasattr(cbreg, '_signals'):
+                    try:
+                        for signal_dict in cbreg._signals.values():
+                            if hasattr(signal_dict, 'clear'):
+                                signal_dict.clear()
+                    except Exception:
+                        pass
+        except Exception:
+            pass
+
+        # APPROACH 3: Monkey-patch the update_normal method to be a no-op
+        # This is the most reliable approach for preventing the callback
+        try:
+            if hasattr(cbar, 'update_normal'):
+                def _noop_update(*args, **kwargs):
+                    pass
+                cbar.update_normal = _noop_update
+        except Exception:
+            pass
+
+        # APPROACH 4: Prevent future built-in updates by nulling internal state
+        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 +660,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 +1029,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 +1332,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
@@ -1667,7 +1795,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
             print("Crosshair OFF.")
     while True:
         try:
-            cmd = input("Press a key: ").strip().lower()
+            cmd = _safe_input("Press a key: ").strip().lower()
         except (KeyboardInterrupt, EOFError):
             print("\n\nExiting interactive menu...")
             break
@@ -1675,7 +1803,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
             continue
         if cmd == 'q':
             try:
-                ans = input("Quit interactive? Remember to save (e=export, s=save). Quit now? (y/n): ").strip().lower()
+                ans = _safe_input("Quit interactive? Remember to save (e=export, s=save). Quit now? (y/n): ").strip().lower()
             except Exception:
                 ans = 'y'
             if ans == 'y':
@@ -1718,9 +1846,9 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 
                 last_figure_path = getattr(fig, '_last_figure_export_path', None)
                 if last_figure_path:
-                    fname = input("Export filename (default .svg if no extension), number to overwrite, or o to overwrite last (q=cancel): ").strip()
+                    fname = _safe_input("Export filename (default .svg if no extension), number to overwrite, or o to overwrite last (q=cancel): ").strip()
                 else:
-                    fname = input("Export filename (default .svg if no extension) or number to overwrite (q=cancel): ").strip()
+                    fname = _safe_input("Export filename (default .svg if no extension) or number to overwrite (q=cancel): ").strip()
                 if not fname or fname.lower() == 'q':
                     print_menu(); continue
                 
@@ -1733,7 +1861,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     if not os.path.exists(last_figure_path):
                         print(f"Previous export file not found: {last_figure_path}")
                         print_menu(); continue
-                    yn = input(f"Overwrite '{os.path.basename(last_figure_path)}'? (y/n): ").strip().lower()
+                    yn = _safe_input(f"Overwrite '{os.path.basename(last_figure_path)}'? (y/n): ").strip().lower()
                     if yn != 'y':
                         print_menu(); continue
                     target = last_figure_path
@@ -1744,7 +1872,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     idx = int(fname)
                     if 1 <= idx <= len(files):
                         name = files[idx-1]
-                        yn = input(f"Overwrite '{name}'? (y/n): ").strip().lower()
+                        yn = _safe_input(f"Overwrite '{name}'? (y/n): ").strip().lower()
                         if yn != 'y':
                             print_menu(); continue
                         target = file_list[idx-1][1]  # Full path from list
@@ -1823,7 +1951,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     cb_h_offset = getattr(cbar.ax, '_cb_h_offset_in', 0.0)
                     ec_h_offset = getattr(ec_ax, '_ec_h_offset_in', 0.0)
                     print(f"Toggle: 1=colorbar, 2=EC panel, 3=both, 4=colorbar label mode, 5=colorbar label text, m=move horizontal position (cb:{cb_h_offset:.3f}\", ec:{ec_h_offset:.3f}\"), q=cancel")
-                    choice = input("v> ").strip().lower()
+                    choice = _safe_input("v> ").strip().lower()
                     if choice == '1':
                         # Toggle colorbar
                         cb_vis = cbar.ax.get_visible()
@@ -1857,7 +1985,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                         # Change colorbar label text
                         current_label = getattr(cbar.ax, '_colorbar_label', 'Intensity')
                         print(f"Current colorbar label: {current_label}")
-                        new_label = input("New colorbar label (blank to keep): ").strip()
+                        new_label = _safe_input("New colorbar label (blank to keep): ").strip()
                         if new_label:
                             cbar.ax._colorbar_label = new_label
                             try:
@@ -1878,12 +2006,12 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             if ec_ax is not None:
                                 print(f"  EC panel offset: {ec_h_offset:.3f}\" (positive=right, negative=left)")
                             print("Commands: c=colorbar, e=EC panel, q=back")
-                            sub = input("m> ").strip().lower()
+                            sub = _safe_input("m> ").strip().lower()
                             if not sub or sub == 'q':
                                 break
                             if sub == 'c':
                                 try:
-                                    new_offset = input(f"Enter colorbar horizontal offset in inches (current: {cb_h_offset:.3f}\"): ").strip()
+                                    new_offset = _safe_input(f"Enter colorbar horizontal offset in inches (current: {cb_h_offset:.3f}\"): ").strip()
                                     if new_offset:
                                         cb_h_offset = float(new_offset)
                                         setattr(cbar.ax, '_cb_h_offset_in', cb_h_offset)
@@ -1891,6 +2019,8 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                                         _apply_group_layout_inches(fig, ax, cbar.ax, ec_ax, ax_w_in, ax_h_in, cb_w_in, cb_gap_in, ec_gap_in, ec_w_in)
                                         fig.canvas.draw_idle()
                                         print(f"Colorbar horizontal offset set to {cb_h_offset:.3f}\"")
+                                    # Continue in loop to show menu again
+                                    continue
                                 except ValueError:
                                     print("Invalid input. Enter a number.")
                                 except Exception as e:
@@ -1900,7 +2030,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                                     print("EC panel not available.")
                                     continue
                                 try:
-                                    new_offset = input(f"Enter EC panel horizontal offset in inches (current: {ec_h_offset:.3f}\"): ").strip()
+                                    new_offset = _safe_input(f"Enter EC panel horizontal offset in inches (current: {ec_h_offset:.3f}\"): ").strip()
                                     if new_offset:
                                         ec_h_offset = float(new_offset)
                                         setattr(ec_ax, '_ec_h_offset_in', ec_h_offset)
@@ -1908,6 +2038,8 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                                         _apply_group_layout_inches(fig, ax, cbar.ax, ec_ax, ax_w_in, ax_h_in, cb_w_in, cb_gap_in, ec_gap_in, ec_w_in)
                                         fig.canvas.draw_idle()
                                         print(f"EC panel horizontal offset set to {ec_h_offset:.3f}\"")
+                                    # Continue in loop to show menu again
+                                    continue
                                 except ValueError:
                                     print("Invalid input. Enter a number.")
                                 except Exception as e:
@@ -1920,7 +2052,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     # Operando-only mode: toggle colorbar or change label mode
                     cb_h_offset = getattr(cbar.ax, '_cb_h_offset_in', 0.0)
                     print(f"Toggle: 1=colorbar visibility, 2=colorbar label mode, 3=colorbar label text, m=move horizontal position (cb:{cb_h_offset:.3f}\"), q=cancel")
-                    choice = input("v> ").strip().lower()
+                    choice = _safe_input("v> ").strip().lower()
                     if choice == '1':
                         cb_vis = cbar.ax.get_visible()
                         cbar.ax.set_visible(not cb_vis)
@@ -1940,7 +2072,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                         # Change colorbar label text
                         current_label = getattr(cbar.ax, '_colorbar_label', 'Intensity')
                         print(f"Current colorbar label: {current_label}")
-                        new_label = input("New colorbar label (blank to keep): ").strip()
+                        new_label = _safe_input("New colorbar label (blank to keep): ").strip()
                         if new_label:
                             cbar.ax._colorbar_label = new_label
                             try:
@@ -1958,12 +2090,12 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             print(f"\nHorizontal position (relative to canvas center):")
                             print(f"  Colorbar offset: {cb_h_offset:.3f}\" (positive=right, negative=left)")
                             print("Commands: c=colorbar, q=back")
-                            sub = input("m> ").strip().lower()
+                            sub = _safe_input("m> ").strip().lower()
                             if not sub or sub == 'q':
                                 break
                             if sub == 'c':
                                 try:
-                                    new_offset = input(f"Enter colorbar horizontal offset in inches (current: {cb_h_offset:.3f}\"): ").strip()
+                                    new_offset = _safe_input(f"Enter colorbar horizontal offset in inches (current: {cb_h_offset:.3f}\"): ").strip()
                                     if new_offset:
                                         cb_h_offset = float(new_offset)
                                         setattr(cbar.ax, '_cb_h_offset_in', cb_h_offset)
@@ -1971,6 +2103,8 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                                         _apply_group_layout_inches(fig, ax, cbar.ax, ec_ax, ax_w_in, ax_h_in, cb_w_in, cb_gap_in, ec_gap_in, ec_w_in)
                                         fig.canvas.draw_idle()
                                         print(f"Colorbar horizontal offset set to {cb_h_offset:.3f}\"")
+                                    # Continue in loop to show menu again
+                                    continue
                                 except ValueError:
                                     print("Invalid input. Enter a number.")
                                 except Exception as e:
@@ -2013,7 +2147,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     prompt = "Enter new filename (no ext needed), number to overwrite, or o to overwrite last (q=cancel): "
                 else:
                     prompt = "Enter new filename (no ext needed) or number to overwrite (q=cancel): "
-                choice = input(prompt).strip()
+                choice = _safe_input(prompt).strip()
                 if not choice or choice.lower() == 'q':
                     print_menu(); continue
                 if choice.lower() == 'o':
@@ -2024,7 +2158,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     if not os.path.exists(last_session_path):
                         print(f"Previous save file not found: {last_session_path}")
                         print_menu(); continue
-                    yn = input(f"Overwrite '{os.path.basename(last_session_path)}'? (y/n): ").strip().lower()
+                    yn = _safe_input(f"Overwrite '{os.path.basename(last_session_path)}'? (y/n): ").strip().lower()
                     if yn != 'y':
                         print_menu(); continue
                     dump_operando_session(last_session_path, fig=fig, ax=ax, im=im, cbar=cbar, ec_ax=ec_ax, skip_confirm=True)
@@ -2034,7 +2168,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     idx = int(choice)
                     if 1 <= idx <= len(files):
                         name = files[idx-1]
-                        yn = input(f"Overwrite '{name}'? (y/n): ").strip().lower()
+                        yn = _safe_input(f"Overwrite '{name}'? (y/n): ").strip().lower()
                         if yn != 'y':
                             print_menu(); continue
                         target = os.path.join(folder, name)
@@ -2051,7 +2185,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                         name = name + '.pkl'
                     target = name if os.path.isabs(name) else os.path.join(folder, name)
                     if os.path.exists(target):
-                        yn = input(f"'{os.path.basename(target)}' exists. Overwrite? (y/n): ").strip().lower()
+                        yn = _safe_input(f"'{os.path.basename(target)}' exists. Overwrite? (y/n): ").strip().lower()
                         if yn != 'y':
                             print_menu(); continue
                     dump_operando_session(target, fig=fig, ax=ax, im=im, cbar=cbar, ec_ax=ec_ax, skip_confirm=True)
@@ -2076,7 +2210,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
             # Always read fresh value from attribute to avoid stale cached value
             ax_h_in = getattr(ax, '_fixed_ax_h_in', ax_h_in)
             print(f"Current height: {ax_h_in:.2f} in")
-            val = input("New height (inches): ").strip()
+            val = _safe_input("New height (inches): ").strip()
             if val:
                 _snapshot("height")
                 try:
@@ -2116,7 +2250,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
             print(f"\nFont submenu (current: family='{cur_family}', size={cur_size})")
             print("  f: change family  |  s: change size  |  q: back")
             while True:
-                sub = input("Font> ").strip().lower()
+                sub = _safe_input("Font> ").strip().lower()
                 if not sub:
                     continue
                 if sub == 'q':
@@ -2129,7 +2263,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     for i, font in enumerate(fonts, 1):
                         print(f"  {i}: {font}")
                     print("Or enter custom font name directly.")
-                    choice = input("Font family (number or name): ").strip()
+                    choice = _safe_input("Font family (number or name): ").strip()
                     if not choice:
                         continue
                     _snapshot("font-family")
@@ -2149,7 +2283,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 elif sub == 's':
                     # Show current size and accept direct input
                     cur_size = plt.rcParams.get('font.size', None)
-                    choice = input(f"Font size (current: {cur_size}): ").strip()
+                    choice = _safe_input(f"Font size (current: {cur_size}): ").strip()
                     if not choice:
                         continue
                     _snapshot("font-size")
@@ -2172,7 +2306,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
             print(_colorize_inline_commands("  1.5 2.5  - set frame=1.5, ticks=2.5"))
             print(_colorize_inline_commands("  q        - cancel"))
             
-            inp = input("Line widths> ").strip().lower()
+            inp = _safe_input("Line widths> ").strip().lower()
             if not inp or inp == 'q':
                 print_menu()
                 continue
@@ -2235,6 +2369,8 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
             # Unified WASD ticks/labels/spines submenu for either pane
             # Import here to avoid scoping issues with nested functions
             from matplotlib.ticker import AutoMinorLocator, NullFormatter, MaxNLocator, NullLocator
+            # Import UI positioning functions locally to ensure they're accessible in nested functions
+            from .ui import position_top_xlabel as _ui_position_top_xlabel, position_bottom_xlabel as _ui_position_bottom_xlabel, position_left_ylabel as _ui_position_left_ylabel, position_right_ylabel as _ui_position_right_ylabel
             
             def _get_tick_state(a):
                 # Unified keys with fallbacks for legacy combined flags
@@ -2320,7 +2456,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     print(_colorize_inline_commands("Choose pane: o=operando, e=ec, q=back"))
                 else:
                     print(_colorize_inline_commands("Choose pane: o=operando, q=back"))
-                pane = input("ot> ").strip().lower()
+                pane = _safe_input("ot> ").strip().lower()
                 if not pane:
                     continue
                 if pane == 'q':
@@ -2539,7 +2675,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 print(_colorize_inline_commands("Type 'i' to invert tick direction, 'l' to change tick length, 'list' for state, 'q' to return."))
                 print(_colorize_inline_commands("  p = adjust title offsets (w=top, s=bottom, a=left, d=right)"))
                 while True:
-                    cmd2 = input(_colorize_prompt("Toggle> ")).strip().lower()
+                    cmd2 = _safe_input(_colorize_prompt("Toggle> ")).strip().lower()
                     if not cmd2:
                         continue
                     if cmd2 == 'q':
@@ -2564,7 +2700,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             # Get current major tick length from axes
                             current_major = ax.xaxis.get_major_ticks()[0].tick1line.get_markersize() if ax.xaxis.get_major_ticks() else 4.0
                             print(f"Current major tick length: {current_major}")
-                            new_length_str = input("Enter new major tick length (e.g., 6.0): ").strip()
+                            new_length_str = _safe_input("Enter new major tick length (e.g., 6.0): ").strip()
                             if not new_length_str:
                                 continue
                             new_major = float(new_length_str)
@@ -2657,7 +2793,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                                 current_y_px = _px_value('_top_xlabel_manual_offset_y_pts', target)
                                 current_x_px = _px_value('_top_xlabel_manual_offset_x_pts', target)
                                 print(f"Top title offset: Y={current_y_px:+.2f} px (positive=up), X={current_x_px:+.2f} px (positive=right)")
-                                sub = input(_colorize_prompt("top (w=up, s=down, a=left, d=right, 0=reset, q=back): ")).strip().lower()
+                                sub = _safe_input(_colorize_prompt("top (w=up, s=down, a=left, d=right, 0=reset, q=back): ")).strip().lower()
                                 if not sub:
                                     continue
                                 if sub == 'q':
@@ -2694,7 +2830,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             while True:
                                 current_y_px = _px_value('_bottom_xlabel_manual_offset_y_pts', target)
                                 print(f"Bottom title offset: Y={current_y_px:+.2f} px (positive=down)")
-                                sub = input(_colorize_prompt("bottom (s=down, w=up, 0=reset, q=back): ")).strip().lower()
+                                sub = _safe_input(_colorize_prompt("bottom (s=down, w=up, 0=reset, q=back): ")).strip().lower()
                                 if not sub:
                                     continue
                                 if sub == 'q':
@@ -2724,7 +2860,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             while True:
                                 current_x_px = _px_value('_left_ylabel_manual_offset_x_pts', target)
                                 print(f"Left title offset: X={current_x_px:+.2f} px (positive=left)")
-                                sub = input(_colorize_prompt("left (a=left, d=right, 0=reset, q=back): ")).strip().lower()
+                                sub = _safe_input(_colorize_prompt("left (a=left, d=right, 0=reset, q=back): ")).strip().lower()
                                 if not sub:
                                     continue
                                 if sub == 'q':
@@ -2761,7 +2897,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                                 current_x_px = _px_value('_right_ylabel_manual_offset_x_pts', target)
                                 current_y_px = _px_value('_right_ylabel_manual_offset_y_pts', target)
                                 print(f"Right title offset: X={current_x_px:+.2f} px (positive=right), Y={current_y_px:+.2f} px (positive=up)")
-                                sub = input(_colorize_prompt("right (d=right, a=left, w=up, s=down, 0=reset, q=back): ")).strip().lower()
+                                sub = _safe_input(_colorize_prompt("right (d=right, a=left, w=up, s=down, 0=reset, q=back): ")).strip().lower()
                                 if not sub:
                                     continue
                                 if sub == 'q':
@@ -2800,7 +2936,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             print("  " + _colorize_menu('d : adjust right title (d=right, a=left, w=up, s=down)'))
                             print("  " + _colorize_menu('r : reset all offsets'))
                             print("  " + _colorize_menu('q : return'))
-                            choice = input(_colorize_prompt("p> ")).strip().lower()
+                            choice = _safe_input(_colorize_prompt("p> ")).strip().lower()
                             if not choice:
                                 continue
                             if choice == 'q':
@@ -2916,7 +3052,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
         elif cmd == 'ox':
             while True:
                 cur = ax.get_xlim(); print(f"Current operando X: {cur[0]:.4g} {cur[1]:.4g}")
-                line = input("New X range (min max), w=upper only, s=lower only, a=auto (restore original), q=back: ").strip()
+                line = _safe_input("New X range (min max), w=upper only, s=lower only, a=auto (restore original), q=back: ").strip()
                 if not line or line.lower() == 'q':
                     break
                 if line.lower() == 'w':
@@ -2924,7 +3060,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     while True:
                         cur = ax.get_xlim()
                         print(f"Current operando X: {cur[0]:.4g} {cur[1]:.4g}")
-                        val = input(f"Enter new upper X limit (current lower: {cur[0]:.4g}, q=back): ").strip()
+                        val = _safe_input(f"Enter new upper X limit (current lower: {cur[0]:.4g}, q=back): ").strip()
                         if not val or val.lower() == 'q':
                             break
                         try:
@@ -2943,7 +3079,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     while True:
                         cur = ax.get_xlim()
                         print(f"Current operando X: {cur[0]:.4g} {cur[1]:.4g}")
-                        val = input(f"Enter new lower X limit (current upper: {cur[1]:.4g}, q=back): ").strip()
+                        val = _safe_input(f"Enter new lower X limit (current upper: {cur[1]:.4g}, q=back): ").strip()
                         if not val or val.lower() == 'q':
                             break
                         try:
@@ -2989,7 +3125,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
         elif cmd == 'oy':
             while True:
                 cur = ax.get_ylim(); print(f"Current operando Y: {cur[0]:.4g} {cur[1]:.4g}")
-                line = input("New Y range (min max), w=upper only, s=lower only, a=auto (restore original), q=back: ").strip()
+                line = _safe_input("New Y range (min max), w=upper only, s=lower only, a=auto (restore original), q=back: ").strip()
                 if not line or line.lower() == 'q':
                     break
                 if line.lower() == 'w':
@@ -2997,7 +3133,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     while True:
                         cur = ax.get_ylim()
                         print(f"Current operando Y: {cur[0]:.4g} {cur[1]:.4g}")
-                        val = input(f"Enter new upper Y limit (current lower: {cur[0]:.4g}, q=back): ").strip()
+                        val = _safe_input(f"Enter new upper Y limit (current lower: {cur[0]:.4g}, q=back): ").strip()
                         if not val or val.lower() == 'q':
                             break
                         try:
@@ -3016,7 +3152,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     while True:
                         cur = ax.get_ylim()
                         print(f"Current operando Y: {cur[0]:.4g} {cur[1]:.4g}")
-                        val = input(f"Enter new lower Y limit (current upper: {cur[1]:.4g}, q=back): ").strip()
+                        val = _safe_input(f"Enter new lower Y limit (current upper: {cur[1]:.4g}, q=back): ").strip()
                         if not val or val.lower() == 'q':
                             break
                         try:
@@ -3119,9 +3255,9 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     auto_available = False
                 
                 if auto_available:
-                    line = input("New intensity range (min max, w=upper only, s=lower only, a=auto-fit to visible, q=back): ").strip()
+                    line = _safe_input("New intensity range (min max, w=upper only, s=lower only, a=auto-fit to visible, q=back): ").strip()
                 else:
-                    line = input("New intensity range (min max, w=upper only, s=lower only, q=back): ").strip()
+                    line = _safe_input("New intensity range (min max, w=upper only, s=lower only, q=back): ").strip()
                 
                 if not line or line.lower() == 'q':
                     break
@@ -3135,7 +3271,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                         except Exception:
                             print("Could not retrieve current color scale range")
                             break
-                        val = input(f"Enter new upper intensity limit (current lower: {cur[0]:.4g}, q=back): ").strip()
+                        val = _safe_input(f"Enter new upper intensity limit (current lower: {cur[0]:.4g}, q=back): ").strip()
                         if not val or val.lower() == 'q':
                             break
                         try:
@@ -3161,7 +3297,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                         except Exception:
                             print("Could not retrieve current color scale range")
                             break
-                        val = input(f"Enter new lower intensity limit (current upper: {cur[1]:.4g}, q=back): ").strip()
+                        val = _safe_input(f"Enter new lower intensity limit (current upper: {cur[1]:.4g}, q=back): ").strip()
                         if not val or val.lower() == 'q':
                             break
                         try:
@@ -3212,7 +3348,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
             while True:
                 ax_w_in = getattr(ax, '_fixed_ax_w_in', ax_w_in)
                 print(f"Current operando width: {ax_w_in:.2f} in")
-                val = input("New width (inches, q=back): ").strip()
+                val = _safe_input("New width (inches, q=back): ").strip()
                 if not val or val.lower() == 'q':
                     break
                 _snapshot("operando-width")
@@ -3232,7 +3368,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
             while True:
                 ec_w_in = getattr(ec_ax, '_fixed_ec_w_in', ec_w_in)
                 print(f"Current EC width: {ec_w_in:.2f} in")
-                val = input("New EC width (inches, q=back): ").strip()
+                val = _safe_input("New EC width (inches, q=back): ").strip()
                 if not val or val.lower() == 'q':
                     break
                 _snapshot("ec-width")
@@ -3275,7 +3411,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
             if optional:
                 print("\nOther available: " + ", ".join(optional))
             print(_colorize_inline_commands("Append _r to reverse (e.g., viridis_r or 1_r). Blank to cancel."))
-            choice = input(f"Palette name or number (1-{len(rec_palettes)}): ").strip()
+            choice = _safe_input(f"Palette name or number (1-{len(rec_palettes)}): ").strip()
             if not choice:
                 print_menu(); continue
             try:
@@ -3524,7 +3660,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     last_style_path = getattr(fig, '_last_style_export_path', None)
                     if ec_ax is None:
                         print("\nNote: Style export (.bps/.bpsg) is only available in dual-pane mode (with EC file).")
-                        sub = input("Style submenu: (q=return, r=refresh): ").strip().lower()
+                        sub = _safe_input("Style submenu: (q=return, r=refresh): ").strip().lower()
                         if sub == 'q':
                             break
                         if sub == 'r' or sub == '':
@@ -3534,9 +3670,9 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             continue
                     else:
                         if last_style_path:
-                            sub = input("Style submenu: (e=export, o=overwrite last, q=return, r=refresh): ").strip().lower()
+                            sub = _safe_input("Style submenu: (e=export, o=overwrite last, q=return, r=refresh): ").strip().lower()
                         else:
-                            sub = input("Style submenu: (e=export, q=return, r=refresh): ").strip().lower()
+                            sub = _safe_input("Style submenu: (e=export, q=return, r=refresh): ").strip().lower()
                         if sub == 'q':
                             break
                         if sub == 'r' or sub == '':
@@ -3549,7 +3685,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             if not os.path.exists(last_style_path):
                                 print(f"Previous export file not found: {last_style_path}")
                                 continue
-                            yn = input(f"Overwrite '{os.path.basename(last_style_path)}'? (y/n): ").strip().lower()
+                            yn = _safe_input(f"Overwrite '{os.path.basename(last_style_path)}'? (y/n): ").strip().lower()
                             if yn != 'y':
                                 continue
                             # Determine export type from existing file and rebuild config
@@ -3570,7 +3706,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             print("Export options:")
                             print("  ps  = style only (.bps)")
                             print("  psg = style + geometry (.bpsg)")
-                            exp_choice = input("Export choice (ps/psg, q=cancel): ").strip().lower()
+                            exp_choice = _safe_input("Export choice (ps/psg, q=cancel): ").strip().lower()
                             if not exp_choice or exp_choice == 'q':
                                 print("Style export canceled.")
                                 continue
@@ -3764,7 +3900,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             else:
                                 print(f"  {_i}: {fname}")
                     
-                    choice_name = input("Enter new filename or number to overwrite (q=cancel): ").strip()
+                    choice_name = _safe_input("Enter new filename or number to overwrite (q=cancel): ").strip()
                     if not choice_name or choice_name.lower() == 'q':
                         print("Style export canceled.")
                         continue
@@ -3773,7 +3909,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                         _idx = int(choice_name)
                         if 1 <= _idx <= len(_style_files):
                             name = _style_files[_idx-1]
-                            yn = input(f"Overwrite '{name}'? (y/n): ").strip().lower()
+                            yn = _safe_input(f"Overwrite '{name}'? (y/n): ").strip().lower()
                             if yn == 'y':
                                 target = file_list[_idx-1][1]  # Full path from list
                         else:
@@ -3790,7 +3926,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                         else:
                             target = get_organized_path(name, 'style', base_path=save_base)
                         if os.path.exists(target):
-                            yn = input(f"'{os.path.basename(target)}' exists. Overwrite? (y/n): ").strip().lower()
+                            yn = _safe_input(f"'{os.path.basename(target)}' exists. Overwrite? (y/n): ").strip().lower()
                             if yn != 'y':
                                 target = None
                     if target:
@@ -3921,7 +4057,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
                 
@@ -4488,14 +4624,14 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 print("  Subscript: H$_2$O → H₂O  |  Superscript: m$^2$ → m²")
                 print("  Bullet: $\\bullet$ → •   |  Greek: $\\alpha$, $\\beta$  |  Angstrom: $\\AA$ → Å")
                 while True:
-                    sub = input("or> ").strip().lower()
+                    sub = _safe_input("or> ").strip().lower()
                     if not sub:
                         continue
                     if sub == 'q':
                         break
                     if sub == 'x':
                         cur = ax.get_xlabel() or ''
-                        lab = input(f"New operando X label (blank=cancel, current='{cur}'): ")
+                        lab = _safe_input(f"New operando X label (blank=cancel, current='{cur}'): ")
                         if lab:
                             _snapshot("rename-op-x")
                             try:
@@ -4508,7 +4644,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                                 pass
                     elif sub == 'y':
                         cur = ax.get_ylabel() or ''
-                        lab = input(f"New operando Y label (blank=cancel, current='{cur}'): ")
+                        lab = _safe_input(f"New operando Y label (blank=cancel, current='{cur}'): ")
                         if lab:
                             _snapshot("rename-op-y")
                             try:
@@ -4540,14 +4676,14 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 print("  Subscript: H$_2$O → H₂O  |  Superscript: m$^2$ → m²")
                 print("  Greek: $\\alpha$, $\\beta$  |  Angstrom: $\\AA$ → Å")
                 while True:
-                    sub = input("er> ").strip().lower()
+                    sub = _safe_input("er> ").strip().lower()
                     if not sub:
                         continue
                     if sub == 'q':
                         break
                     if sub == 'x':
                         cur = ec_ax.get_xlabel() or ''
-                        lab = input(f"New EC X label (blank=cancel, current='{cur}'): ")
+                        lab = _safe_input(f"New EC X label (blank=cancel, current='{cur}'): ")
                         if lab:
                             _snapshot("rename-ec-x")
                             try:
@@ -4559,7 +4695,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                                 pass
                     elif sub == 'y':
                         cur = ec_ax.get_ylabel() or ''
-                        lab = input(f"New EC Y label (blank=cancel, current='{cur}'): ")
+                        lab = _safe_input(f"New EC Y label (blank=cancel, current='{cur}'): ")
                         if lab:
                             _snapshot("rename-ec-y")
                             try:
@@ -4597,7 +4733,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     print_menu(); continue
                 print("EC line submenu: c=color, l=linewidth, q=back")
                 while True:
-                    sub = input("el> ").strip().lower()
+                    sub = _safe_input("el> ").strip().lower()
                     if not sub:
                         continue
                     if sub == 'q':
@@ -4613,7 +4749,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                         else:
                             print("\nNo saved colors. Type 'u' to manage saved colors.")
                         print("  (Enter color name/hex, saved color number, or 'u' to manage)")
-                        val = input(f"Color (current={cur}, blank=cancel): ").strip()
+                        val = _safe_input(f"Color (current={cur}, blank=cancel): ").strip()
                         if not val:
                             continue
                         if val.lower() == 'u':
@@ -4630,7 +4766,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             print(f"Invalid color: {e}")
                     elif sub == 'l':
                         cur = ln.get_linewidth()
-                        val = input(f"Line width (current={cur}, blank=cancel): ").strip()
+                        val = _safe_input(f"Line width (current={cur}, blank=cancel): ").strip()
                         if not val:
                             continue
                         _snapshot("ec-line-width")
@@ -4655,7 +4791,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 continue
             while True:
                 cur = ec_ax.get_ylim(); print(f"Current EC time range (Y): {cur[0]:.4g} {cur[1]:.4g}")
-                line = input("New time range (min max), w=upper only, s=lower only, a=auto (restore original), q=back: ").strip()
+                line = _safe_input("New time range (min max), w=upper only, s=lower only, a=auto (restore original), q=back: ").strip()
                 if not line or line.lower() == 'q':
                     break
                 if line.lower() == 'w':
@@ -4663,7 +4799,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     while True:
                         cur = ec_ax.get_ylim()
                         print(f"Current EC time range (Y): {cur[0]:.4g} {cur[1]:.4g}")
-                        val = input(f"Enter new upper time limit (current lower: {cur[0]:.4g}, q=back): ").strip()
+                        val = _safe_input(f"Enter new upper time limit (current lower: {cur[0]:.4g}, q=back): ").strip()
                         if not val or val.lower() == 'q':
                             break
                         try:
@@ -4681,7 +4817,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     while True:
                         cur = ec_ax.get_ylim()
                         print(f"Current EC time range (Y): {cur[0]:.4g} {cur[1]:.4g}")
-                        val = input(f"Enter new lower time limit (current upper: {cur[1]:.4g}, q=back): ").strip()
+                        val = _safe_input(f"Enter new lower time limit (current upper: {cur[1]:.4g}, q=back): ").strip()
                         if not val or val.lower() == 'q':
                             break
                         try:
@@ -4795,7 +4931,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     print("The .mpt file must contain the '<I>/mA' column to use this feature.")
                     print_menu(); continue
                 while True:
-                    sub = input("ey submenu: n=ions, t=time, q=back: ").strip().lower()
+                    sub = _safe_input("ey submenu: n=ions, t=time, q=back: ").strip().lower()
                     if not sub:
                         continue
                     if sub == 'q':
@@ -4812,7 +4948,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             prompt = "Enter mass(mg), capacity-per-ion(mAh g^-1), start-ions (e.g. 4.5 26.8 0), q=cancel: "
                         else:
                             prompt = f"Enter mass,cap-per-ion,start-ions (blank=reuse {mass_mg} {cap_per_ion} {start_ions}; q=cancel): "
-                        s = input(prompt).strip()
+                        s = _safe_input(prompt).strip()
                         if not s:
                             if need_input:
                                 continue
@@ -5098,7 +5234,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
             while True:
                 cur = ec_ax.get_xlim()
                 print(f"Current EC X range: {cur[0]:.4g} {cur[1]:.4g}")
-                line = input("New EC X range (min max), w=upper only, s=lower only, a=auto (restore original), q=back: ").strip()
+                line = _safe_input("New EC X range (min max), w=upper only, s=lower only, a=auto (restore original), q=back: ").strip()
                 if not line or line.lower() == 'q':
                     break
                 if line.lower() == 'w':
@@ -5106,7 +5242,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     while True:
                         cur = ec_ax.get_xlim()
                         print(f"Current EC X range: {cur[0]:.4g} {cur[1]:.4g}")
-                        val = input(f"Enter new upper EC X limit (current lower: {cur[0]:.4g}, q=back): ").strip()
+                        val = _safe_input(f"Enter new upper EC X limit (current lower: {cur[0]:.4g}, q=back): ").strip()
                         if not val or val.lower() == 'q':
                             break
                         try:
@@ -5125,7 +5261,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     while True:
                         cur = ec_ax.get_xlim()
                         print(f"Current EC X range: {cur[0]:.4g} {cur[1]:.4g}")
-                        val = input(f"Enter new lower EC X limit (current upper: {cur[1]:.4g}, q=back): ").strip()
+                        val = _safe_input(f"Enter new lower EC X limit (current upper: {cur[1]:.4g}, q=back): ").strip()
                         if not val or val.lower() == 'q':
                             break
                         try:
@@ -5187,7 +5323,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
             cur_w, cur_h = _get_fig_size(fig)
             print(f"Current canvas size: {cur_w:.2f} x {cur_h:.2f} in (W x H)")
             print("Canvas: only figure size will change; panel widths/gaps are not altered.")
-            line = input("New canvas size 'W H' (blank=cancel): ").strip()
+            line = _safe_input("New canvas size 'W H' (blank=cancel): ").strip()
             if line:
                 _snapshot("canvas-size")
                 try: