batplot 1.7.28__py3-none-any.whl → 1.8.1__py3-none-any.whl

batplot/electrochem_interactive.py

@@ -9,6 +9,7 @@ from __future__ import annotations
 from typing import Dict, Iterable, List, Optional, Tuple
 import json
 import os
+import sys
 
 import matplotlib.pyplot as plt
 import matplotlib.cm as cm
@@ -30,6 +31,7 @@ from .utils import (
     choose_style_file,
     list_files_in_subdirectory,
     get_organized_path,
+    convert_label_shortcuts,
 )
 import time
 from .color_utils import (
@@ -42,6 +44,37 @@ from .color_utils import (
 )
 
 
+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 _colorize_menu(text):
     """Colorize menu items: command in cyan, colon in white, description in default."""
     if ':' not in text:
@@ -470,6 +503,28 @@ def _rebuild_legend(ax):
     fig = ax.figure
     # Capture existing title before any rebuild so it isn't lost
     _store_legend_title(fig, ax)
+    # If no stored position yet, try to capture the current legend location once
+    # so rebuilds (e.g., after renaming) don't jump to a new "best" spot.
+    try:
+        if getattr(fig, '_ec_legend_xy_in', None) is None:
+            leg0 = ax.get_legend()
+            if leg0 is not None and leg0.get_visible():
+                try:
+                    renderer = fig.canvas.get_renderer()
+                except Exception:
+                    fig.canvas.draw()
+                    renderer = fig.canvas.get_renderer()
+                bb = leg0.get_window_extent(renderer=renderer)
+                cx = 0.5 * (bb.x0 + bb.x1)
+                cy = 0.5 * (bb.y0 + bb.y1)
+                fx, fy = fig.transFigure.inverted().transform((cx, cy))
+                fw, fh = fig.get_size_inches()
+                offset = ((fx - 0.5) * fw, (fy - 0.5) * fh)
+                offset = _sanitize_legend_offset(fig, offset)
+                if offset is not None:
+                    fig._ec_legend_xy_in = offset
+    except Exception:
+        pass
     if not _get_legend_user_pref(fig):
         leg = ax.get_legend()
         if leg is not None:
@@ -937,6 +992,9 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
 
     def _title_offset_menu():
         """Allow nudging duplicate top/right titles by single-pixel increments."""
+        # 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 _dpi():
             try:
                 return float(fig.dpi)
@@ -980,7 +1038,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 current_y_px = _px_value('_top_xlabel_manual_offset_y_pts')
                 current_x_px = _px_value('_top_xlabel_manual_offset_x_pts')
                 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':
@@ -1018,7 +1076,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 current_x_px = _px_value('_right_ylabel_manual_offset_x_pts')
                 current_y_px = _px_value('_right_ylabel_manual_offset_y_pts')
                 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':
@@ -1055,7 +1113,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             while True:
                 current_y_px = _px_value('_bottom_xlabel_manual_offset_y_pts')
                 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':
@@ -1085,7 +1143,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             while True:
                 current_x_px = _px_value('_left_ylabel_manual_offset_x_pts')
                 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':
@@ -1116,7 +1174,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             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':
@@ -1587,7 +1645,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
     _print_menu(len(all_cycles), is_dqdv)
     while True:
         try:
-            key = input("Press a key: ").strip().lower()
+            key = _safe_input("Press a key: ").strip().lower()
         except (KeyboardInterrupt, EOFError):
             print("\n\nExiting interactive menu...")
             break
@@ -1595,7 +1653,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             continue
         if key == 'q':
             try:
-                confirm = input(_colorize_prompt("Quit EC interactive? Remember to save (e=export, s=save). Quit now? (y/n): ")).strip().lower()
+                confirm = _safe_input(_colorize_prompt("Quit EC interactive? Remember to save (e=export, s=save). Quit now? (y/n): ")).strip().lower()
             except Exception:
                 confirm = 'y'
             if confirm == 'y':
@@ -1630,9 +1688,9 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 
                 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(len(all_cycles), is_dqdv)
                     continue
@@ -1648,7 +1706,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         print(f"Previous export file not found: {last_figure_path}")
                         _print_menu(len(all_cycles), is_dqdv)
                         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(len(all_cycles), is_dqdv)
                         continue
@@ -1660,7 +1718,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     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(len(all_cycles), is_dqdv)
                             continue
@@ -1798,7 +1856,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 xy_in = _sanitize_legend_offset(fig, getattr(fig, '_ec_legend_xy_in', (0.0, 0.0))) or (0.0, 0.0)
                 print(f"Legend is {'ON' if vis else 'off'}; position (inches from center): x={xy_in[0]:.2f}, y={xy_in[1]:.2f}")
                 while True:
-                    sub = input(_colorize_prompt("Legend: (t=toggle, p=set position, q=back): ")).strip().lower()
+                    sub = _safe_input(_colorize_prompt("Legend: (t=toggle, p=set position, q=back): ")).strip().lower()
                     if not sub:
                         continue
                     if sub == 'q':
@@ -1822,7 +1880,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         while True:
                             xy_in = _sanitize_legend_offset(fig, getattr(fig, '_ec_legend_xy_in', (0.0, 0.0))) or (0.0, 0.0)
                             print(f"Current position: x={xy_in[0]:.2f}, y={xy_in[1]:.2f}")
-                            pos_cmd = input(_colorize_prompt("Position: (x y) or x=x only, y=y only, q=back: ")).strip().lower()
+                            pos_cmd = _safe_input(_colorize_prompt("Position: (x y) or x=x only, y=y only, q=back: ")).strip().lower()
                             if not pos_cmd or pos_cmd == 'q':
                                 break
                             if pos_cmd == 'x':
@@ -1830,7 +1888,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                                 while True:
                                     xy_in = _sanitize_legend_offset(fig, getattr(fig, '_ec_legend_xy_in', (0.0, 0.0))) or (0.0, 0.0)
                                     print(f"Current position: x={xy_in[0]:.2f}, y={xy_in[1]:.2f}")
-                                    val = input(f"Enter new x position (current y: {xy_in[1]:.2f}, q=back): ").strip()
+                                    val = _safe_input(f"Enter new x position (current y: {xy_in[1]:.2f}, q=back): ").strip()
                                     if not val or val.lower() == 'q':
                                         break
                                     try:
@@ -1857,7 +1915,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                                 while True:
                                     xy_in = _sanitize_legend_offset(fig, getattr(fig, '_ec_legend_xy_in', (0.0, 0.0))) or (0.0, 0.0)
                                     print(f"Current position: x={xy_in[0]:.2f}, y={xy_in[1]:.2f}")
-                                    val = input(f"Enter new y position (current x: {xy_in[0]:.2f}, q=back): ").strip()
+                                    val = _safe_input(f"Enter new y position (current x: {xy_in[0]:.2f}, q=back): ").strip()
                                     if not val or val.lower() == 'q':
                                         break
                                     try:
@@ -1932,9 +1990,9 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     
                     last_style_path = getattr(fig, '_last_style_export_path', None)
                     if last_style_path:
-                        sub = input(_colorize_prompt("Style submenu: (e=export, o=overwrite last, q=return, r=refresh): ")).strip().lower()
+                        sub = _safe_input(_colorize_prompt("Style submenu: (e=export, o=overwrite last, q=return, r=refresh): ")).strip().lower()
                     else:
-                        sub = input(_colorize_prompt("Style submenu: (e=export, q=return, r=refresh): ")).strip().lower()
+                        sub = _safe_input(_colorize_prompt("Style submenu: (e=export, q=return, r=refresh): ")).strip().lower()
                     if sub == 'q':
                         break
                     if sub == 'r' or sub == '':
@@ -1947,7 +2005,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         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
                         # Rebuild config based on current state
@@ -1974,7 +2032,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         print("Export options:")
                         print("  ps  = style only (.bps)")
                         print("  psg = style + geometry (.bpsg)")
-                        exp_choice = input(_colorize_prompt("Export choice (ps/psg, q=cancel): ")).strip().lower()
+                        exp_choice = _safe_input(_colorize_prompt("Export choice (ps/psg, q=cancel): ")).strip().lower()
                         if not exp_choice or exp_choice == 'q':
                             print("Style export canceled.")
                             continue
@@ -2426,13 +2484,13 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     print(f"  {_colorize_menu('ld : show line and dots (markers) for all curves')}")
                     print(f"  {_colorize_menu('d  : show only dots (no connecting line) for all curves')}")
                     print(f"  {_colorize_menu('q  : return')}")
-                    sub = input(_colorize_prompt("Choose (c/f/g/l/ld/d/q): ")).strip().lower()
+                    sub = _safe_input(_colorize_prompt("Choose (c/f/g/l/ld/d/q): ")).strip().lower()
                     if not sub:
                         continue
                     if sub == 'q':
                         break
                     if sub == 'c':
-                        spec = input("Curve linewidth (single value for all curves, q=cancel): ").strip()
+                        spec = _safe_input("Curve linewidth (single value for all curves, q=cancel): ").strip()
                         if not spec or spec.lower() == 'q':
                             continue
                         # Apply single width to all curves
@@ -2461,7 +2519,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         except ValueError:
                             print("Invalid width value.")
                     elif sub == 'f':
-                        fw_in = input("Enter frame/tick width (e.g., 1.5) or 'm M' (major minor) or q: ").strip()
+                        fw_in = _safe_input("Enter frame/tick width (e.g., 1.5) or 'm M' (major minor) or q: ").strip()
                         if not fw_in or fw_in.lower() == 'q':
                             print("Canceled.")
                             continue
@@ -2536,7 +2594,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         # Line + dots for all curves
                         push_state("line+dots")
                         try:
-                            msize_in = input("Marker size (blank=auto ~3*lw): ").strip()
+                            msize_in = _safe_input("Marker size (blank=auto ~3*lw): ").strip()
                             custom_msize = float(msize_in) if msize_in else None
                         except ValueError:
                             custom_msize = None
@@ -2566,7 +2624,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         # Dots only for all curves
                         push_state("dots-only")
                         try:
-                            msize_in = input("Marker size (blank=auto ~3*lw): ").strip()
+                            msize_in = _safe_input("Marker size (blank=auto ~3*lw): ").strip()
                             custom_msize = float(msize_in) if msize_in else None
                         except ValueError:
                             custom_msize = None
@@ -2613,7 +2671,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                             print(f"  {idx}: {color_block(color)} {color}")
                         print("Type 'u' to edit saved colors.")
                     print("q: back to main menu")
-                    line = input("Enter mappings (e.g., w:red a:#4561F7) or q: ").strip()
+                    line = _safe_input("Enter mappings (e.g., w:red a:#4561F7) or q: ").strip()
                     if not line or line.lower() == 'q':
                         break
                     if line.lower() == 'u':
@@ -2662,16 +2720,18 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 print("Tip: Use LaTeX/mathtext for special characters:")
                 print("  Subscript: H$_2$O → H₂O  |  Superscript: m$^2$ → m²")
                 print("  Bullet: $\\bullet$ → •   |  Greek: $\\alpha$, $\\beta$  |  Angstrom: $\\AA$ → Å")
+                print("  Shortcuts: g{super(-1)} → g$^{\\mathrm{-1}}$  |  Li{sub(2)}O → Li$_{\\mathrm{2}}$O")
                 while True:
                     print("Rename axis: x, y, both, q=back")
-                    sub = input("Rename> ").strip().lower()
+                    sub = _safe_input("Rename> ").strip().lower()
                     if not sub:
                         continue
                     if sub == 'q':
                         break
                     if sub in ('x','both'):
-                        txt = input("New X-axis label (blank=cancel): ")
+                        txt = _safe_input("New X-axis label (blank=cancel): ")
                         if txt:
+                            txt = convert_label_shortcuts(txt)
                             push_state("rename-x")
                             try:
                                 # Freeze layout and preserve existing pad for one-shot restore
@@ -2693,8 +2753,9 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                             except Exception:
                                 pass
                     if sub in ('y','both'):
-                        txt = input("New Y-axis label (blank=cancel): ")
+                        txt = _safe_input("New Y-axis label (blank=cancel): ")
                         if txt:
+                            txt = convert_label_shortcuts(txt)
                             push_state("rename-y")
                             base_ylabel = txt
                             try:
@@ -2829,7 +2890,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     print(_colorize_inline_commands("  1=spine   2=ticks   3=minor ticks   4=tick labels   5=axis title"))
                     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)"))
-                    cmd = input(_colorize_prompt("t> ")).strip().lower()
+                    cmd = _safe_input(_colorize_prompt("t> ")).strip().lower()
                     if not cmd:
                         continue
                     if cmd == 'q':
@@ -2856,7 +2917,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                             # 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)
@@ -2944,7 +3005,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     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(len(all_cycles), is_dqdv); continue
                 if choice.lower() == 'o':
@@ -2955,7 +3016,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     if not os.path.exists(last_session_path):
                         print(f"Previous save file not found: {last_session_path}")
                         _print_menu(len(all_cycles), is_dqdv); 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(len(all_cycles), is_dqdv); continue
                     dump_ec_session(last_session_path, fig=fig, ax=ax, cycle_lines=cycle_lines, skip_confirm=True)
@@ -2965,7 +3026,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     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(len(all_cycles), is_dqdv); continue
                         target = os.path.join(folder, name)
@@ -2982,7 +3043,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         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(len(all_cycles), is_dqdv); continue
                 dump_ec_session(target, fig=fig, ax=ax, cycle_lines=cycle_lines, skip_confirm=True)
@@ -2992,6 +3053,8 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             _print_menu(len(all_cycles), is_dqdv)
             continue
         elif key == 'c':
+            # Show current palette if one is applied (this is informational only)
+            # Note: Individual cycles may use different colors, so we can't show a single "current" palette
             print(f"Total cycles: {len(all_cycles)}")
             print("Enter one of:")
             print(_colorize_inline_commands("  - numbers: e.g. 1 5 10"))
@@ -3018,7 +3081,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 for idx, color in enumerate(user_colors, 1):
                     print(f"  {idx}: {color_block(color)} {color}")
                 print("Type 'u' to edit saved colors before assigning.")
-            line = input("Selection: ").strip()
+            line = _safe_input("Selection: ").strip()
             if not line:
                 continue
             if line.lower() == 'u':
@@ -3163,14 +3226,14 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             # X-axis submenu: number-of-ions vs capacity
             while True:
                 print("X-axis menu: n=number of ions, c=capacity, q=back")
-                sub = input("X> ").strip().lower()
+                sub = _safe_input("X> ").strip().lower()
                 if not sub:
                     continue
                 if sub == 'q':
                     break
                 if sub == 'n':
                     print("Input the theoretical capacity per 1 active ion (mAh g^-1), e.g., 125")
-                    val = input("C_theoretical_per_ion: ").strip()
+                    val = _safe_input("C_theoretical_per_ion: ").strip()
                     try:
                         c_th = float(val)
                         if c_th <= 0:
@@ -3307,7 +3370,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             cur_size = plt.rcParams.get('font.size', None)
             while True:
                 print(f"\nFont menu (current: family='{cur_family}', size={cur_size}): f=font family, s=size, q=back")
-                sub = input("Font> ").strip().lower()
+                sub = _safe_input("Font> ").strip().lower()
                 if not sub:
                     continue
                 if sub == 'q':
@@ -3320,7 +3383,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     for i, font in enumerate(fonts, 1):
                         print(f"  {i}: {font}")
                     print("Or enter custom font name directly.")
-                    choice = input(f"Font family (current: '{cur_family}', number or name): ").strip()
+                    choice = _safe_input(f"Font family (current: '{cur_family}', number or name): ").strip()
                     if not choice:
                         continue
                     # Check if it's a number
@@ -3352,7 +3415,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     # Show current size and accept direct input
                     import matplotlib as mpl
                     cur_size = mpl.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
                     try:
@@ -3377,7 +3440,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             while True:
                 current_xlim = ax.get_xlim()
                 print(f"Current X range: {current_xlim[0]:.6g} to {current_xlim[1]:.6g}")
-                lim = input("Set X limits (min max), w=upper only, s=lower only, a=auto (restore original), q=back: ").strip()
+                lim = _safe_input("Set X limits (min max), w=upper only, s=lower only, a=auto (restore original), q=back: ").strip()
                 if not lim or lim.lower() == 'q':
                     break
                 if lim.lower() == 'a':
@@ -3399,7 +3462,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     while True:
                         current_xlim = ax.get_xlim()
                         print(f"Current X range: {current_xlim[0]:.6g} to {current_xlim[1]:.6g}")
-                        val = input(f"Enter new upper X limit (current lower: {current_xlim[0]:.6g}, q=back): ").strip()
+                        val = _safe_input(f"Enter new upper X limit (current lower: {current_xlim[0]:.6g}, q=back): ").strip()
                         if not val or val.lower() == 'q':
                             break
                         try:
@@ -3425,7 +3488,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     while True:
                         current_xlim = ax.get_xlim()
                         print(f"Current X range: {current_xlim[0]:.6g} to {current_xlim[1]:.6g}")
-                        val = input(f"Enter new lower X limit (current upper: {current_xlim[1]:.6g}, q=back): ").strip()
+                        val = _safe_input(f"Enter new lower X limit (current upper: {current_xlim[1]:.6g}, q=back): ").strip()
                         if not val or val.lower() == 'q':
                             break
                         try:
@@ -3461,7 +3524,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             while True:
                 current_ylim = ax.get_ylim()
                 print(f"Current Y range: {current_ylim[0]:.6g} to {current_ylim[1]:.6g}")
-                lim = input("Set Y limits (min max), w=upper only, s=lower only, a=auto (restore original), q=back: ").strip()
+                lim = _safe_input("Set Y limits (min max), w=upper only, s=lower only, a=auto (restore original), q=back: ").strip()
                 if not lim or lim.lower() == 'q':
                     break
                 if lim.lower() == 'a':
@@ -3483,7 +3546,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     while True:
                         current_ylim = ax.get_ylim()
                         print(f"Current Y range: {current_ylim[0]:.6g} to {current_ylim[1]:.6g}")
-                        val = input(f"Enter new upper Y limit (current lower: {current_ylim[0]:.6g}, q=back): ").strip()
+                        val = _safe_input(f"Enter new upper Y limit (current lower: {current_ylim[0]:.6g}, q=back): ").strip()
                         if not val or val.lower() == 'q':
                             break
                         try:
@@ -3509,7 +3572,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     while True:
                         current_ylim = ax.get_ylim()
                         print(f"Current Y range: {current_ylim[0]:.6g} to {current_ylim[1]:.6g}")
-                        val = input(f"Enter new lower Y limit (current upper: {current_ylim[1]:.6g}, q=back): ").strip()
+                        val = _safe_input(f"Enter new lower Y limit (current upper: {current_ylim[1]:.6g}, q=back): ").strip()
                         if not val or val.lower() == 'q':
                             break
                         try:
@@ -3544,7 +3607,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             # Geometry submenu: plot frame vs canvas (scales moved to separate keys)
             while True:
                 print("Geometry menu: p=plot frame size, c=canvas size, q=back")
-                sub = input("Geom> ").strip().lower()
+                sub = _safe_input("Geom> ").strip().lower()
                 if not sub:
                     continue
                 if sub == 'q':
@@ -3583,7 +3646,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 print("  o: remove outliers (removes abrupt dQ/dV spikes)")
                 print("  r: reset to original data")
                 print("  q: back to main menu")
-                sub = input("sm> ").strip().lower()
+                sub = _safe_input("sm> ").strip().lower()
                 if not sub:
                     continue
                 if sub == 'q':
@@ -3618,7 +3681,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 if sub == 'a':
                     try:
                         while True:
-                            threshold_input = input("Enter minimum voltage step in mV (default 0.5 mV, 'q'=quit, 'e'=explain): ").strip()
+                            threshold_input = _safe_input("Enter minimum voltage step in mV (default 0.5 mV, 'q'=quit, 'e'=explain): ").strip()
                             if threshold_input.lower() == 'q':
                                 break
                             if threshold_input.lower() == 'e':
@@ -3692,7 +3755,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     try:
                         print("DiffCap smoothing per Thompson et al. (2020): clean ΔV < threshold and apply Savitzky–Golay (order 3).")
                         while True:
-                            delta_input = input("Minimum ΔV between points (mV, default 1.0, 'q'=quit, 'e'=explain): ").strip()
+                            delta_input = _safe_input("Minimum ΔV between points (mV, default 1.0, 'q'=quit, 'e'=explain): ").strip()
                             if delta_input.lower() == 'q':
                                 break
                             if delta_input.lower() == 'e':
@@ -3715,7 +3778,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         if delta_input and delta_input.lower() == 'q':  # User quit at previous step
                             continue
                         while True:
-                            window_input = input("Savitzky–Golay window (odd, default 9, 'q'=quit, 'e'=explain): ").strip()
+                            window_input = _safe_input("Savitzky–Golay window (odd, default 9, 'q'=quit, 'e'=explain): ").strip()
                             if window_input.lower() == 'q':
                                 break
                             if window_input.lower() == 'e':
@@ -3734,7 +3797,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         if window_input and window_input.lower() == 'q':  # User quit at previous step
                             continue
                         while True:
-                            poly_input = input("Polynomial order (default 3, 'q'=quit, 'e'=explain): ").strip()
+                            poly_input = _safe_input("Polynomial order (default 3, 'q'=quit, 'e'=explain): ").strip()
                             if poly_input.lower() == 'q':
                                 break
                             if poly_input.lower() == 'e':
@@ -3806,7 +3869,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     print("  1: Z-score (enter standard deviation threshold, default 5.0)")
                     print("  2: MAD (median absolute deviation, default factor 6.0)")
                     while True:
-                        method = input("Method (1/2, blank=cancel, 'q'=quit, 'e'=explain): ").strip()
+                        method = _safe_input("Method (1/2, blank=cancel, 'q'=quit, 'e'=explain): ").strip()
                         if not method or method.lower() == 'q':
                             break
                         if method.lower() == 'e':
@@ -3832,7 +3895,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         continue
                     try:
                         while True:
-                            thresh_input = input("Enter threshold (blank=default, 'q'=quit, 'e'=explain): ").strip()
+                            thresh_input = _safe_input("Enter threshold (blank=default, 'q'=quit, 'e'=explain): ").strip()
                             if thresh_input.lower() == 'q':
                                 break
                             if thresh_input.lower() == 'e':
@@ -4364,7 +4427,7 @@ def _export_style_dialog(cfg: Dict, default_ext: str = '.bpcfg', base_path: Opti
             for i, f in enumerate(bpcfg_files, 1):
                 print(f"  {i}: {f}")
         
-        choice = input(f"Export to file? Enter filename or number to overwrite (q=cancel): ").strip()
+        choice = _safe_input(f"Export to file? Enter filename or number to overwrite (q=cancel): ").strip()
         if not choice or choice.lower() == 'q':
             return