batplot 1.8.5__py3-none-any.whl → 1.8.6__py3-none-any.whl

batplot/electrochem_interactive.py

@@ -374,7 +374,7 @@ def _apply_stored_smooth_settings(cycle_lines: Dict[int, Dict[str, Optional[obje
                     ln._smooth_applied = True
 
 
-def _print_menu(n_cycles: int, is_dqdv: bool = False):
+def _print_menu(n_cycles: int, is_dqdv: bool = False, fig=None):
     # Three-column menu similar to operando: Styles | Geometries | Options
     # Use dynamic column widths for clean alignment.
     col1 = [
@@ -405,6 +405,19 @@ def _print_menu(n_cycles: int, is_dqdv: bool = False):
         "b: undo",
         "q: quit",
     ]
+
+    # Conditional overwrite shortcuts under (Options)
+    if fig is not None:
+        last_session = getattr(fig, "_last_session_save_path", None)
+        last_style = getattr(fig, "_last_style_export_path", None)
+        last_figure = getattr(fig, "_last_figure_export_path", None)
+        if last_session:
+            col3.append("os: overwrite session")
+        if last_style:
+            col3.append("ops: overwrite style")
+            col3.append("opsg: overwrite style+geom")
+        if last_figure:
+            col3.append("oe: overwrite figure")
     # Compute widths (min width prevents overly narrow columns)
     w1 = max(len("(Styles)"), *(len(s) for s in col1), 18)
     w2 = max(len("(Geometries)"), *(len(s) for s in col2), 12)
@@ -1640,7 +1653,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             print("Undo: restored previous state.")
         except Exception as e:
             print(f"Undo failed: {e}")
-    _print_menu(len(all_cycles), is_dqdv)
+    _print_menu(len(all_cycles), is_dqdv, fig)
     while True:
         try:
             key = _safe_input("Press a key: ").strip().lower()
@@ -1657,18 +1670,18 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             if confirm == 'y':
                 break
             else:
-                _print_menu(len(all_cycles), is_dqdv)
+                _print_menu(len(all_cycles), is_dqdv, fig)
                 continue
         elif key == 'b':
             restore_state()
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'e':
             # Export current figure to a file; default extension .svg if missing
             try:
                 base_path = choose_save_path(source_paths, purpose="figure export")
                 if not base_path:
-                    _print_menu(len(all_cycles), is_dqdv)
+                    _print_menu(len(all_cycles), is_dqdv, fig)
                     continue
                 # List existing figure files in Figures/ subdirectory
                 fig_extensions = ('.svg', '.png', '.jpg', '.jpeg', '.pdf', '.eps', '.tif', '.tiff')
@@ -1690,7 +1703,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 else:
                     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)
+                    _print_menu(len(all_cycles), is_dqdv, fig)
                     continue
                 
                 already_confirmed = False  # Initialize for new filename case
@@ -1698,15 +1711,15 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 if fname.lower() == 'o':
                     if not last_figure_path:
                         print("No previous export found.")
-                        _print_menu(len(all_cycles), is_dqdv)
+                        _print_menu(len(all_cycles), is_dqdv, fig)
                         continue
                     if not os.path.exists(last_figure_path):
                         print(f"Previous export file not found: {last_figure_path}")
-                        _print_menu(len(all_cycles), is_dqdv)
+                        _print_menu(len(all_cycles), is_dqdv, fig)
                         continue
                     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)
+                        _print_menu(len(all_cycles), is_dqdv, fig)
                         continue
                     target = last_figure_path
                     already_confirmed = True
@@ -1718,13 +1731,13 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         name = files[idx-1]
                         yn = _safe_input(f"Overwrite '{name}'? (y/n): ").strip().lower()
                         if yn != 'y':
-                            _print_menu(len(all_cycles), is_dqdv)
+                            _print_menu(len(all_cycles), is_dqdv, fig)
                             continue
                         target = file_list[idx-1][1]  # Full path from list
                         already_confirmed = True
                     else:
                         print("Invalid number.")
-                        _print_menu(len(all_cycles), is_dqdv)
+                        _print_menu(len(all_cycles), is_dqdv, fig)
                         continue
                 else:
                     root, ext = os.path.splitext(fname)
@@ -1807,7 +1820,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     print(f"Export failed: {e}")
             except Exception as e:
                 print(f"Export failed: {e}")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'h':
             # Legend submenu: toggle visibility and move legend in inches relative to canvas center
@@ -1989,7 +2002,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         print("Unknown option.")
             except Exception:
                 pass
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'p':
             # Print/export style or style+geometry
@@ -2097,14 +2110,14 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         print("Unknown choice.")
             except Exception as e:
                 print(f"Error in style submenu: {e}")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'i':
             # Import style from .bps/.bpsg/.bpcfg
             try:
                 path = choose_style_file(source_paths, purpose="style import")
                 if not path:
-                    _print_menu(len(all_cycles), is_dqdv)
+                    _print_menu(len(all_cycles), is_dqdv, fig)
                     continue
                 push_state("import-style")
                 with open(path, 'r', encoding='utf-8') as f:
@@ -2114,7 +2127,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 kind = cfg.get('kind', '')
                 if kind not in ('ec_style', 'ec_style_geom'):
                     print("Not an EC style file.")
-                    _print_menu(len(all_cycles), is_dqdv)
+                    _print_menu(len(all_cycles), is_dqdv, fig)
                     continue
 
                 # Enforce compatibility between style/geom ro state and current figure ro state
@@ -2126,7 +2139,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     else:
                         print("Warning: EC style/geometry file was saved without --ro; current plot was created with --ro.")
                     print("Not applying EC style/geometry to avoid corrupting axis orientation.")
-                    _print_menu(len(all_cycles), is_dqdv)
+                    _print_menu(len(all_cycles), is_dqdv, fig)
                     continue
                 
                 has_geometry = (kind == 'ec_style_geom' and 'geometry' in cfg)
@@ -2463,7 +2476,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
 
             except Exception as e:
                 print(f"Error importing style: {e}")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'l':
             # Line widths submenu: curves vs frame/ticks
@@ -2691,7 +2704,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         print("Unknown option.")
             except Exception as e:
                 print(f"Error in line submenu: {e}")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'k':
             # Spine colors (w=top, a=left, s=bottom, d=right)
@@ -2749,7 +2762,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     fig.canvas.draw()
             except Exception as e:
                 print(f"Error in spine color menu: {e}")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'r':
             # Rename axis labels
@@ -2819,7 +2832,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         fig.canvas.draw_idle()
             except Exception as e:
                 print(f"Error renaming axes: {e}")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 't':
             # Unified WASD: w/a/s/d x 1..5 => spine, ticks, minor, labels, title
@@ -3015,7 +3028,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                             fig.canvas.draw_idle()
             except Exception as e:
                 print(f"Error in WASD tick visibility menu: {e}")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 's':
             try:
@@ -3023,7 +3036,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 last_session_path = getattr(fig, '_last_session_save_path', None)
                 folder = choose_save_path(source_paths, purpose="EC session save")
                 if not folder:
-                    _print_menu(len(all_cycles), is_dqdv); continue
+                    _print_menu(len(all_cycles), is_dqdv, fig); continue
                 print(f"\nChosen path: {folder}")
                 try:
                     files = sorted([f for f in os.listdir(folder) if f.lower().endswith('.pkl')])
@@ -3044,35 +3057,35 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     prompt = "Enter new filename (no ext needed) or number to overwrite (q=cancel): "
                 choice = _safe_input(prompt).strip()
                 if not choice or choice.lower() == 'q':
-                    _print_menu(len(all_cycles), is_dqdv); continue
+                    _print_menu(len(all_cycles), is_dqdv, fig); continue
                 if choice.lower() == 'o':
                     # Overwrite last saved session
                     if not last_session_path:
                         print("No previous save found.")
-                        _print_menu(len(all_cycles), is_dqdv); continue
+                        _print_menu(len(all_cycles), is_dqdv, fig); continue
                     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
+                        _print_menu(len(all_cycles), is_dqdv, fig); continue
                     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
+                        _print_menu(len(all_cycles), is_dqdv, fig); continue
                     dump_ec_session(last_session_path, fig=fig, ax=ax, cycle_lines=cycle_lines, skip_confirm=True)
                     print(f"Overwritten session to {last_session_path}")
-                    _print_menu(len(all_cycles), is_dqdv); continue
+                    _print_menu(len(all_cycles), is_dqdv, fig); continue
                 if choice.isdigit() and files:
                     idx = int(choice)
                     if 1 <= idx <= len(files):
                         name = files[idx-1]
                         yn = _safe_input(f"Overwrite '{name}'? (y/n): ").strip().lower()
                         if yn != 'y':
-                            _print_menu(len(all_cycles), is_dqdv); continue
+                            _print_menu(len(all_cycles), is_dqdv, fig); continue
                         target = os.path.join(folder, name)
                         dump_ec_session(target, fig=fig, ax=ax, cycle_lines=cycle_lines, skip_confirm=True)
                         fig._last_session_save_path = target
-                        _print_menu(len(all_cycles), is_dqdv); continue
+                        _print_menu(len(all_cycles), is_dqdv, fig); continue
                     else:
                         print("Invalid number.")
-                        _print_menu(len(all_cycles), is_dqdv); continue
+                        _print_menu(len(all_cycles), is_dqdv, fig); continue
                 if choice.lower() != 'o':
                     name = choice
                     root, ext = os.path.splitext(name)
@@ -3082,12 +3095,12 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     if os.path.exists(target):
                         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
+                            _print_menu(len(all_cycles), is_dqdv, fig); continue
                 dump_ec_session(target, fig=fig, ax=ax, cycle_lines=cycle_lines, skip_confirm=True)
                 fig._last_session_save_path = target
             except Exception as e:
                 print(f"Save failed: {e}")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'c':
             # Show current palette if one is applied (this is informational only)
@@ -3123,7 +3136,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 continue
             if line.lower() == 'u':
                 manage_user_colors(fig)
-                _print_menu(len(all_cycles), is_dqdv)
+                _print_menu(len(all_cycles), is_dqdv, fig)
                 continue
             tokens = line.replace(',', ' ').split()
             mode, cycles, mapping, palette, use_all = _parse_cycle_tokens(tokens, fig)
@@ -3252,13 +3265,13 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             if ignored:
                 print("Ignored cycles:", ", ".join(str(c) for c in ignored))
             # Show the menu again after completing the command
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'a':
             # X-axis submenu: number-of-ions vs capacity (not available in dQdV mode)
             if is_dqdv:
                 print("Capacity/ion conversion is not available in dQ/dV mode.")
-                _print_menu(len(all_cycles), is_dqdv)
+                _print_menu(len(all_cycles), is_dqdv, fig)
                 continue
             # X-axis submenu: number-of-ions vs capacity
             while True:
@@ -3399,7 +3412,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                             fig.canvas.draw()
                         except Exception:
                             fig.canvas.draw_idle()
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'f':
             # Font submenu with numbered options
@@ -3470,7 +3483,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                             print("Size must be positive.")
                     except Exception:
                         print("Invalid size.")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'x':
             # X-axis: set limits only
@@ -3554,7 +3567,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     fig.canvas.draw()
                 except Exception:
                     print("Invalid limits, ignored.")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'y':
             # Y-axis: set limits only
@@ -3638,7 +3651,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     fig.canvas.draw()
                 except Exception:
                     print("Invalid limits, ignored.")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'g':
             # Geometry submenu: plot frame vs canvas (scales moved to separate keys)
@@ -3667,13 +3680,13 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     fig.canvas.draw()
                 except Exception:
                     fig.canvas.draw_idle()
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'sm':
             # dQ/dV smoothing utilities (only available in dQdV mode)
             if not is_dqdv:
                 print("Smoothing is only available in dQ/dV mode.")
-                _print_menu(len(all_cycles), is_dqdv)
+                _print_menu(len(all_cycles), is_dqdv, fig)
                 continue
             while True:
                 print("\n\033[1mdQ/dV Data Filtering (Neware method)\033[0m")
@@ -4033,11 +4046,11 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         print("Invalid number.")
                     continue
                 print("Unknown command. Use a/o/r/q.")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         else:
             print("Unknown command.")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
 
 
 def _get_geometry_snapshot(fig, ax) -> Dict:

batplot/interactive.py

@@ -260,6 +260,18 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
             col1.append("j: CIF titles")
         col2 = ["a: rearrange", "o: offset", "r: rename", "x: change X", "y: change Y", "d: derivative"]
         col3 = ["v: find peaks", "n: crosshair", "p: print(export) style/geom", "i: import style/geom", "e: export figure", "s: save project", "b: undo", "q: quit"]
+
+        # Conditional overwrite shortcuts under (Options)
+        last_session = getattr(fig, "_last_session_save_path", None)
+        last_style = getattr(fig, "_last_style_export_path", None)
+        last_figure = getattr(fig, "_last_figure_export_path", None)
+        if last_session:
+            col3.append("os: overwrite session")
+        if last_style:
+            col3.append("ops: overwrite style")
+            col3.append("opsg: overwrite style+geom")
+        if last_figure:
+            col3.append("oe: overwrite figure")
         
         # Hide offset/y-range in stack mode
         if args.stack:
@@ -909,7 +921,7 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
         )
 
     # NEW: export current style to .bpcfg
-    def export_style_config(filename, base_path=None, overwrite_path=None):
+    def export_style_config(filename, base_path=None, overwrite_path=None, force_kind=None):
         cts = getattr(_bp, 'cif_tick_series', None) if _bp is not None else None
         show_titles = bool(getattr(_bp, 'show_cif_titles', True)) if _bp is not None else True
         from .style import export_style_config as _export_style_config
@@ -928,6 +940,7 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
             base_path,
             show_cif_titles=show_titles,
             overwrite_path=overwrite_path,
+            force_kind=force_kind,
         )
 
     # NEW: apply imported style config (restricted application)
@@ -2079,6 +2092,141 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
             except Exception as e:
                 print(f"Error toggling crosshair: {e}")
             continue
+        elif key == 'os':
+            # Quick overwrite of last saved session (.pkl)
+            try:
+                last_session_path = getattr(fig, '_last_session_save_path', None)
+                if not last_session_path:
+                    print("No previous session save found.")
+                    continue
+                if not os.path.exists(last_session_path):
+                    print(f"Previous save file not found: {last_session_path}")
+                    continue
+                yn = _safe_input(f"Overwrite session '{os.path.basename(last_session_path)}'? (y/n): ").strip().lower()
+                if yn != 'y':
+                    print("Canceled.")
+                    continue
+                _bp_dump_session(
+                    last_session_path,
+                    fig=fig,
+                    ax=ax,
+                    x_data_list=x_data_list,
+                    y_data_list=y_data_list,
+                    orig_y=orig_y,
+                    offsets_list=offsets_list,
+                    labels=labels,
+                    delta=delta,
+                    args=args,
+                    tick_state=tick_state,
+                    cif_tick_series=(getattr(_bp, 'cif_tick_series', None) if _bp is not None else None),
+                    cif_hkl_map=(getattr(_bp, 'cif_hkl_map', None) if _bp is not None else None),
+                    cif_hkl_label_map=(getattr(_bp, 'cif_hkl_label_map', None) if _bp is not None else None),
+                    show_cif_hkl=(bool(getattr(_bp, 'show_cif_hkl', False)) if _bp is not None else False),
+                    show_cif_titles=(bool(getattr(_bp, 'show_cif_titles', True)) if _bp is not None else True),
+                    skip_confirm=True,
+                )
+                fig._last_session_save_path = last_session_path
+                print(f"Overwritten session to {last_session_path}")
+            except Exception as e:
+                print(f"Error overwriting session: {e}")
+            continue
+        elif key in ('ops', 'opsg'):
+            # Quick overwrite of last exported style file (.bps / .bpsg)
+            try:
+                last_style_path = getattr(fig, '_last_style_export_path', None)
+                if not last_style_path:
+                    print("No previous style export found.")
+                    continue
+                if not os.path.exists(last_style_path):
+                    print(f"Previous style file not found: {last_style_path}")
+                    continue
+                if key == 'ops':
+                    mode = 'ps'
+                    label = "style-only"
+                else:
+                    mode = 'psg'
+                    label = "style+geometry"
+                yn = _safe_input(
+                    f"Overwrite {label} file '{os.path.basename(last_style_path)}'? (y/n): "
+                ).strip().lower()
+                if yn != 'y':
+                    print("Canceled.")
+                    continue
+                exported = export_style_config(
+                    None,
+                    base_path=None,
+                    overwrite_path=last_style_path,
+                    force_kind=mode,
+                )
+                if exported:
+                    fig._last_style_export_path = exported
+                    print(f"Overwritten {label} style to {exported}")
+            except Exception as e:
+                print(f"Error overwriting style: {e}")
+            continue
+        elif key == 'oe':
+            # Quick overwrite of last exported figure
+            try:
+                last_figure_path = getattr(fig, '_last_figure_export_path', None)
+                if not last_figure_path:
+                    print("No previous figure export found.")
+                    continue
+                if not os.path.exists(last_figure_path):
+                    print(f"Previous export file not found: {last_figure_path}")
+                    continue
+                yn = _safe_input(
+                    f"Overwrite figure '{os.path.basename(last_figure_path)}'? (y/n): "
+                ).strip().lower()
+                if yn != 'y':
+                    print("Canceled.")
+                    continue
+                export_target = last_figure_path
+                from .utils import ensure_exact_case_filename
+                export_target = ensure_exact_case_filename(export_target)
+                # Temporarily remove numbering for export
+                for i, txt in enumerate(label_text_objects):
+                    txt.set_text(labels[i])
+                _, _ext = os.path.splitext(export_target)
+                if _ext.lower() == '.svg':
+                    try:
+                        _fig_fc = fig.get_facecolor()
+                    except Exception:
+                        _fig_fc = None
+                    try:
+                        _ax_fc = ax.get_facecolor()
+                    except Exception:
+                        _ax_fc = None
+                    try:
+                        if getattr(fig, 'patch', None) is not None:
+                            fig.patch.set_alpha(0.0); fig.patch.set_facecolor('none')
+                        if getattr(ax, 'patch', None) is not None:
+                            ax.patch.set_alpha(0.0); ax.patch.set_facecolor('none')
+                    except Exception:
+                        pass
+                    try:
+                        fig.savefig(export_target, dpi=300, transparent=True, facecolor='none', edgecolor='none')
+                    finally:
+                        try:
+                            if _fig_fc is not None and getattr(fig, 'patch', None) is not None:
+                                fig.patch.set_alpha(1.0); fig.patch.set_facecolor(_fig_fc)
+                        except Exception:
+                            pass
+                        try:
+                            if _ax_fc is not None and getattr(ax, 'patch', None) is not None:
+                                ax.patch.set_alpha(1.0); ax.patch.set_facecolor(_ax_fc)
+                        except Exception:
+                            pass
+                else:
+                    fig.savefig(export_target, dpi=300)
+                print(f"Figure saved to {export_target}")
+                fig._last_figure_export_path = export_target
+                # Restore numbering
+                for i, txt in enumerate(label_text_objects):
+                    txt.set_text(f"{i+1}: {labels[i]}")
+                fig.canvas.draw()
+            except Exception as e:
+                print(f"Error overwriting figure: {e}")
+            continue
         elif key == 's':
             # Save current interactive session with numbered overwrite picker
             try:
@@ -4434,8 +4582,13 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                             else:
                                 print(f"  {_i}: {fname}")
                     last_style_path = getattr(fig, '_last_style_export_path', None)
-                    if last_style_path:
+                    n_style = len(style_file_list) if style_file_list else 0
+                    if last_style_path and n_style:
+                        sub = _safe_input(colorize_prompt("Style submenu: (e=export, o=overwrite last, q=return, r=refresh). Press number to overwrite: ")).strip().lower()
+                    elif last_style_path:
                         sub = _safe_input(colorize_prompt("Style submenu: (e=export, o=overwrite last, q=return, r=refresh): ")).strip().lower()
+                    elif n_style:
+                        sub = _safe_input(colorize_prompt("Style submenu: (e=export, q=return, r=refresh). Press number to overwrite: ")).strip().lower()
                     else:
                         sub = _safe_input(colorize_prompt("Style submenu: (e=export, q=return, r=refresh): ")).strip().lower()
                     if sub == 'q':
@@ -4459,6 +4612,19 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                             fig._last_style_export_path = exported_path
                         style_menu_active = False
                         break
+                    if sub.isdigit() and n_style and 1 <= int(sub) <= n_style:
+                        # Overwrite listed style file by number (same as e → export → number)
+                        idx = int(sub) - 1
+                        target_path = style_file_list[idx][1]
+                        fname = style_file_list[idx][0]
+                        yn = _safe_input(f"Overwrite '{fname}'? (y/n): ").strip().lower()
+                        if yn != 'y':
+                            continue
+                        exported_path = export_style_config(None, base_path=None, overwrite_path=target_path)
+                        if exported_path:
+                            fig._last_style_export_path = exported_path
+                        style_menu_active = False
+                        break
                     if sub == 'e':
                         save_base = choose_save_path(source_file_paths, purpose="style export")
                         if not save_base:
@@ -4481,6 +4647,12 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                 if not fname:
                     print("Style import canceled.")
                     continue
+                import os
+                bname = os.path.basename(fname)
+                yn = _safe_input(colorize_prompt(f"Apply style '{bname}'? (y/n): ")).strip().lower()
+                if yn != 'y':
+                    print("Style import canceled.")
+                    continue
                 push_state("style-import")
                 apply_style_config(fname)
             except Exception as e:
@@ -5310,6 +5482,7 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
 
                     print("\n--- Peak Report ---")
                     print(f"X range used: {x_min} .. {x_max}  (relative height threshold={min_frac})")
+                    all_peak_results = []  # list of (curve_index, label, [(x, y), ...])
                     for i, (x_arr, y_off) in enumerate(zip(x_data_list, y_data_list)):
                         # Recover original curve (remove vertical offset)
                         if i < len(offsets_list):
@@ -5363,9 +5536,50 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                             last_idx = pi
 
                         print("  Peaks (x, y):")
+                        peak_xy_list = []
                         for pi in peaks:
+                            px, py = float(x_sel[pi]), float(y_sel[pi])
+                            peak_xy_list.append((px, py))
                             print(f"    x={x_sel[pi]:.6g}, y={y_sel[pi]:.6g}")
+                        if peak_xy_list:
+                            all_peak_results.append((i + 1, label, peak_xy_list))
                     print("\n--- End Peak Report ---\n")
+
+                    # Export peaks to file
+                    if all_peak_results:
+                        export_yn = _safe_input("Export peaks to file? (y/n): ").strip().lower()
+                        if export_yn == 'y':
+                            folder = choose_save_path(source_file_paths, purpose="peak export")
+                            if folder:
+                                print(f"\nChosen path: {folder}")
+                                fname = _safe_input("Export filename (default: peaks.txt): ").strip()
+                                if not fname:
+                                    fname = "peaks.txt"
+                                if not fname.endswith('.txt'):
+                                    fname += '.txt'
+                                import os
+                                target = fname if os.path.isabs(fname) else os.path.join(folder, fname)
+                                do_write = not os.path.exists(target)
+                                if os.path.exists(target):
+                                    ow = _safe_input(f"'{os.path.basename(target)}' exists. Overwrite? (y/n): ").strip().lower()
+                                    if ow == 'y':
+                                        do_write = True
+                                    else:
+                                        print("Export canceled.")
+                                if do_write:
+                                    try:
+                                        with open(target, 'w') as f:
+                                            f.write("# Curve\tLabel\tPeak x\tPeak y\n")
+                                            for curve_idx, label, peak_xy_list in all_peak_results:
+                                                for px, py in peak_xy_list:
+                                                    f.write(f"{curve_idx}\t{label}\t{px:.6g}\t{py:.6g}\n")
+                                        total_peaks = sum(len(pairs) for _, _, pairs in all_peak_results)
+                                        print(f"Peak positions exported to {target}")
+                                        print(f"Found {total_peaks} peaks across {len(all_peak_results)} curves.")
+                                    except Exception as e:
+                                        print(f"Error saving file: {e}")
+                            else:
+                                print("Export canceled.")
                 except Exception as e:
                     print(f"Error finding peaks: {e}")