batplot 1.7.23__py3-none-any.whl → 1.7.25__py3-none-any.whl

batplot/electrochem_interactive.py

@@ -468,6 +468,8 @@ def _get_legend_title(fig, default: str = "Cycle") -> str:
 def _rebuild_legend(ax):
     """Rebuild legend using only visible lines, anchoring to absolute inches from canvas center if available."""
     fig = ax.figure
+    # Capture existing title before any rebuild so it isn't lost
+    _store_legend_title(fig, ax)
     if not _get_legend_user_pref(fig):
         leg = ax.get_legend()
         if leg is not None:
@@ -1271,6 +1273,10 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 snap['legend']['visible'] = bool(leg_obj.get_visible()) if leg_obj is not None else False
             except Exception:
                 pass
+            try:
+                snap['legend']['title'] = _get_legend_title(fig)
+            except Exception:
+                snap['legend']['title'] = None
             try:
                 legend_xy = getattr(fig, '_ec_legend_xy_in', None)
                 if legend_xy is not None:
@@ -1299,7 +1305,33 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             if len(state_history) > 40:
                 state_history.pop(0)
         except Exception:
-            pass
+            # Minimal fallback so undo still works if full snapshot fails
+            try:
+                fallback = {
+                    'note': f"{note}-fallback",
+                    'xlim': ax.get_xlim(),
+                    'ylim': ax.get_ylim(),
+                    'legend': {
+                        'visible': bool(ax.get_legend().get_visible()) if ax.get_legend() else False,
+                        'position_inches': getattr(fig, '_ec_legend_xy_in', None),
+                        'title': _get_legend_title(fig),
+                    },
+                    'lines': []
+                }
+                for i, ln in enumerate(ax.lines):
+                    try:
+                        fallback['lines'].append({
+                            'index': i,
+                            'color': ln.get_color(),
+                            'visible': ln.get_visible(),
+                        })
+                    except Exception:
+                        fallback['lines'].append({'index': i})
+                state_history.append(fallback)
+                if len(state_history) > 40:
+                    state_history.pop(0)
+            except Exception:
+                pass
 
     def restore_state():
         if not state_history:
@@ -1529,6 +1561,8 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             legend_snap = snap.get('legend', {})
             if legend_snap:
                 try:
+                    if 'title' in legend_snap:
+                        fig._ec_legend_title = legend_snap.get('title') or _get_legend_title(fig)
                     xy = legend_snap.get('position_inches')
                     fig._ec_legend_xy_in = _sanitize_legend_offset(fig, xy) if xy is not None else None
                 except Exception:
@@ -1594,14 +1628,35 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         else:
                             print(f"  {i}: {fname}")
                 
-                fname = input("Export filename (default .svg if no extension) or number to overwrite (q=cancel): ").strip()
+                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()
+                else:
+                    fname = 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
                 
+                already_confirmed = False  # Initialize for new filename case
+                # Check for 'o' option
+                if fname.lower() == 'o':
+                    if not last_figure_path:
+                        print("No previous export found.")
+                        _print_menu(len(all_cycles), is_dqdv)
+                        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)
+                        continue
+                    yn = input(f"Overwrite '{os.path.basename(last_figure_path)}'? (y/n): ").strip().lower()
+                    if yn != 'y':
+                        _print_menu(len(all_cycles), is_dqdv)
+                        continue
+                    target = last_figure_path
+                    already_confirmed = True
                 # Check if user selected a number
-                already_confirmed = False
-                if fname.isdigit() and files:
+                elif fname.isdigit() and files:
+                    already_confirmed = False
                     idx = int(fname)
                     if 1 <= idx <= len(files):
                         name = files[idx-1]
@@ -1671,6 +1726,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         else:
                             fig.savefig(target, bbox_inches='tight')
                         print(f"Exported figure to {target}")
+                        fig._last_figure_export_path = target
                 except Exception as e:
                     print(f"Export failed: {e}")
             except Exception as e:
@@ -1854,11 +1910,45 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                             else:
                                 print(f"  {_i}: {fname}")
                     
-                    sub = input(_colorize_prompt("Style submenu: (e=export, q=return, r=refresh): ")).strip().lower()
+                    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()
+                    else:
+                        sub = input(_colorize_prompt("Style submenu: (e=export, q=return, r=refresh): ")).strip().lower()
                     if sub == 'q':
                         break
                     if sub == 'r' or sub == '':
                         continue
+                    if sub == 'o':
+                        # Overwrite last exported style file
+                        if not last_style_path:
+                            print("No previous export found.")
+                            continue
+                        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()
+                        if yn != 'y':
+                            continue
+                        # Rebuild config based on current state
+                        cfg = _get_style_snapshot(fig, ax, cycle_lines, tick_state)
+                        # Determine if last export was style-only or style+geometry
+                        try:
+                            with open(last_style_path, 'r', encoding='utf-8') as f:
+                                old_cfg = json.load(f)
+                            if old_cfg.get('kind') == 'ec_style_geom':
+                                geom = _get_geometry_snapshot(fig, ax)
+                                cfg['kind'] = 'ec_style_geom'
+                                cfg['geometry'] = geom
+                            else:
+                                cfg['kind'] = 'ec_style'
+                        except Exception:
+                            cfg['kind'] = 'ec_style'
+                        with open(last_style_path, 'w', encoding='utf-8') as f:
+                            json.dump(cfg, f, indent=2)
+                        print(f"Overwritten style to {last_style_path}")
+                        style_menu_active = False
+                        break
                     if sub == 'e':
                         # Ask for ps or psg
                         print("Export options:")
@@ -1895,7 +1985,9 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                             print("Style export canceled.")
                             continue
                         print(f"\nChosen path: {save_base}")
-                        _export_style_dialog(cfg, default_ext=default_ext, base_path=save_base)
+                        exported_path = _export_style_dialog(cfg, default_ext=default_ext, base_path=save_base)
+                        if exported_path:
+                            fig._last_style_export_path = exported_path
                         style_menu_active = False  # Exit style submenu and return to main menu
                         break
                     else:
@@ -2197,6 +2289,19 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     except Exception as e:
                         print(f"Warning: Could not apply geometry: {e}")
                 
+                # Restore title offsets
+                try:
+                    offsets = cfg.get('title_offsets', {})
+                    if offsets:
+                        ax._top_xlabel_manual_offset_y_pts = float(offsets.get('top_y', 0.0) or 0.0)
+                        ax._top_xlabel_manual_offset_x_pts = float(offsets.get('top_x', 0.0) or 0.0)
+                        ax._bottom_xlabel_manual_offset_y_pts = float(offsets.get('bottom_y', 0.0) or 0.0)
+                        ax._left_ylabel_manual_offset_x_pts = float(offsets.get('left_x', 0.0) or 0.0)
+                        ax._right_ylabel_manual_offset_x_pts = float(offsets.get('right_x', 0.0) or 0.0)
+                        ax._right_ylabel_manual_offset_y_pts = float(offsets.get('right_y', 0.0) or 0.0)
+                except Exception:
+                    pass
+                
                 # Final label positioning - do this AFTER all style changes to prevent drift
                 # Set pending labelpad before repositioning to preserve original values
                 try:
@@ -2210,12 +2315,11 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     font_cfg = cfg.get('font', {})
                     font_changed = (font_cfg.get('family') is not None or font_cfg.get('size') is not None)
                     
-                    if axes_position_changed or font_changed:
-                        # Reposition titles (will use _pending_xlabelpad if set, preserving original labelpad)
-                        _ui_position_top_xlabel(ax, fig, tick_state)
-                        _ui_position_bottom_xlabel(ax, fig, tick_state)
-                        _ui_position_left_ylabel(ax, fig, tick_state)
-                        _ui_position_right_ylabel(ax, fig, tick_state)
+                    # Always reposition titles to apply offsets (even if nothing else changed)
+                    _ui_position_top_xlabel(ax, fig, tick_state)
+                    _ui_position_bottom_xlabel(ax, fig, tick_state)
+                    _ui_position_left_ylabel(ax, fig, tick_state)
+                    _ui_position_right_ylabel(ax, fig, tick_state)
                     
                     # Always ensure labelpad is exactly as it was before style import
                     # This is a final safeguard against any drift
@@ -2537,7 +2641,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             try:
                 print("Tip: Use LaTeX/mathtext for special characters:")
                 print("  Subscript: H$_2$O → H₂O  |  Superscript: m$^2$ → m²")
-                print("  Greek: $\\alpha$, $\\beta$  |  Angstrom: $\\AA$ → Å")
+                print("  Bullet: $\\bullet$ → •   |  Greek: $\\alpha$, $\\beta$  |  Angstrom: $\\AA$ → Å")
                 while True:
                     print("Rename axis: x, y, both, q=back")
                     sub = input("Rename> ").strip().lower()
@@ -2798,6 +2902,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
         elif key == 's':
             try:
                 from .session import dump_ec_session
+                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
@@ -2815,10 +2920,27 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                             print(f"  {i}: {f}  ({timestamp})")
                         else:
                             print(f"  {i}: {f}")
-                prompt = "Enter new filename (no ext needed) or number to overwrite (q=cancel): "
+                if last_session_path:
+                    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()
                 if not choice or choice.lower() == 'q':
                     _print_menu(len(all_cycles), is_dqdv); 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
+                    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()
+                    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)
+                    print(f"Overwritten session to {last_session_path}")
+                    _print_menu(len(all_cycles), is_dqdv); continue
                 if choice.isdigit() and files:
                     idx = int(choice)
                     if 1 <= idx <= len(files):
@@ -2827,10 +2949,13 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         if yn != 'y':
                             _print_menu(len(all_cycles), is_dqdv); 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
                     else:
                         print("Invalid number.")
                         _print_menu(len(all_cycles), is_dqdv); continue
-                else:
+                if choice.lower() != 'o':
                     name = choice
                     root, ext = os.path.splitext(name)
                     if ext == '':
@@ -2841,6 +2966,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         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)
+                fig._last_session_save_path = target
             except Exception as e:
                 print(f"Save failed: {e}")
             _print_menu(len(all_cycles), is_dqdv)
@@ -4008,6 +4134,14 @@ def _get_style_snapshot(fig, ax, cycle_lines: Dict, tick_state: Dict) -> Dict:
         'ticks': {'widths': tick_widths, 'direction': tick_direction},
         'grid': grid_enabled,
         'wasd_state': wasd_state,
+        'title_offsets': {
+            'top_y': float(getattr(ax, '_top_xlabel_manual_offset_y_pts', 0.0) or 0.0),
+            'top_x': float(getattr(ax, '_top_xlabel_manual_offset_x_pts', 0.0) or 0.0),
+            'bottom_y': float(getattr(ax, '_bottom_xlabel_manual_offset_y_pts', 0.0) or 0.0),
+            'left_x': float(getattr(ax, '_left_ylabel_manual_offset_x_pts', 0.0) or 0.0),
+            'right_x': float(getattr(ax, '_right_ylabel_manual_offset_x_pts', 0.0) or 0.0),
+            'right_y': float(getattr(ax, '_right_ylabel_manual_offset_y_pts', 0.0) or 0.0),
+        },
         'curve_linewidth': curve_linewidth,
         'curve_markers': curve_marker_props,
         'rotation_angle': getattr(fig, '_ec_rotation_angle', 0),
@@ -4236,9 +4370,11 @@ def _export_style_dialog(cfg: Dict, default_ext: str = '.bpcfg', base_path: Opti
         with open(target_path, 'w', encoding='utf-8') as f:
             json.dump(cfg, f, indent=2)
         print(f"Style exported to {target_path}")
+        return target_path
 
     except Exception as e:
         print(f"Export failed: {e}")
+        return None
 def _legend_no_frame(ax, *args, title: Optional[str] = None, **kwargs):
     leg = ax.legend(*args, **kwargs)
     if leg is not None:
@@ -4258,6 +4394,8 @@ def _apply_legend_position(fig, ax):
     xy_in = _sanitize_legend_offset(fig, getattr(fig, '_ec_legend_xy_in', None))
     if xy_in is None:
         return False
+    # Preserve current title before rebuilding the legend
+    _store_legend_title(fig, ax)
     handles, labels = _visible_legend_entries(ax)
     if not handles:
         return False

batplot/interactive.py

@@ -866,10 +866,11 @@ 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):
+    def export_style_config(filename, base_path=None, overwrite_path=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
-        return _bp_export_style_config(
+        from .style import export_style_config as _export_style_config
+        return _export_style_config(
             filename,
             fig,
             ax,
@@ -883,6 +884,7 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
             label_text_objects,
             base_path,
             show_cif_titles=show_titles,
+            overwrite_path=overwrite_path,
         )
 
     # NEW: apply imported style config (restricted application)
@@ -1467,6 +1469,17 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
             else:
                 continue
         elif key == 'z':  # toggle hkl labels on CIF ticks (non-blocking)
+            # Check if CIF files exist before allowing this command
+            has_cif = False
+            try:
+                has_cif = any(f.split(':')[0].lower().endswith('.cif') for f in args.files)
+                if not has_cif and _bp is not None:
+                    has_cif = bool(getattr(_bp, 'cif_tick_series', None))
+            except Exception:
+                pass
+            if not has_cif:
+                print("Unknown option.")
+                continue
             try:
                 # Flip visibility flag in batplot module
                 cur = bool(getattr(_bp, 'show_cif_hkl', False)) if _bp is not None else False
@@ -1546,6 +1559,17 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                 print(f"Error in legend submenu: {e}")
             continue
         elif key == 'j':  # toggle CIF title labels (filename labels)
+            # Check if CIF files exist before allowing this command
+            has_cif = False
+            try:
+                has_cif = any(f.split(':')[0].lower().endswith('.cif') for f in args.files)
+                if not has_cif and _bp is not None:
+                    has_cif = bool(getattr(_bp, 'cif_tick_series', None))
+            except Exception:
+                pass
+            if not has_cif:
+                print("Unknown option.")
+                continue
             try:
                 # Preserve both x and y-axis limits to prevent movement
                 prev_xlim = ax.get_xlim()
@@ -1609,11 +1633,47 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                             print(f"  {i}: {f}  ({timestamp})")
                         else:
                             print(f"  {i}: {f}")
-                prompt = "Enter new filename (no ext needed) or number to overwrite (q=cancel): "
+                last_session_path = getattr(fig, '_last_session_save_path', None)
+                if last_session_path:
+                    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()
                 if not choice or choice.lower() == 'q':
                     print("Canceled.")
                     continue
+                if choice.lower() == 'o':
+                    # Overwrite last saved session
+                    if not last_session_path:
+                        print("No previous save found.")
+                        continue
+                    if not os.path.exists(last_session_path):
+                        print(f"Previous save file not found: {last_session_path}")
+                        continue
+                    yn = input(f"Overwrite '{os.path.basename(last_session_path)}'? (y/n): ").strip().lower()
+                    if yn != 'y':
+                        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,
+                    )
+                    print(f"Overwritten session to {last_session_path}")
+                    continue
                 target_path = None
                 # Overwrite by number
                 if choice.isdigit() and files:
@@ -1626,10 +1686,32 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                             continue
                         target_path = os.path.join(folder, name)
                         skip_confirm = True  # Already confirmed above
+                        _bp_dump_session(
+                            target_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=skip_confirm,
+                        )
+                        print(f"Saved session to {target_path}")
+                        fig._last_session_save_path = target_path
+                        continue
                     else:
                         print("Invalid number.")
                         continue
-                else:
+                if choice.lower() != 'o':
                     # New name, allow relative or absolute
                     name = choice
                     root, ext = os.path.splitext(name)
@@ -1643,27 +1725,28 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                             print("Canceled.")
                             continue
                         skip_confirm = True  # Already confirmed
-                # Delegate to session dumper
-                _bp_dump_session(
-                    target_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=skip_confirm,
-                )
-                print(f"Saved session to {target_path}")
+                    # Delegate to session dumper
+                    _bp_dump_session(
+                        target_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=skip_confirm,
+                    )
+                    print(f"Saved session to {target_path}")
+                    fig._last_session_save_path = target_path
             except Exception as e:
                 print(f"Error saving session: {e}")
             continue
@@ -2096,7 +2179,7 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                     if mode == 'c':
                         print("Tip: Use LaTeX/mathtext for special characters:")
                         print("  Subscript: H$_2$O → H₂O  |  Superscript: m$^2$ → m²")
-                        print("  Greek: $\\alpha$, $\\beta$  |  Angstrom: $\\AA$ → Å")
+                        print("  Bullet: $\\bullet$ → •   |  Greek: $\\alpha$, $\\beta$  |  Angstrom: $\\AA$ → Å")
                         idx_in = input("Curve number to rename (q=cancel): ").strip()
                         if not idx_in or idx_in.lower() == 'q':
                             print("Canceled.")
@@ -3493,11 +3576,32 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                                 print(f"  {_i}: {fname}  ({timestamp})")
                             else:
                                 print(f"  {_i}: {fname}")
-                    sub = input(colorize_prompt("Style submenu: (e=export, q=return, r=refresh): ")).strip().lower()
+                    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()
+                    else:
+                        sub = input(colorize_prompt("Style submenu: (e=export, q=return, r=refresh): ")).strip().lower()
                     if sub == 'q':
                         break
                     if sub == 'r' or sub == '':
                         continue
+                    if sub == 'o':
+                        # Overwrite last exported style file
+                        if not last_style_path:
+                            print("No previous export found.")
+                            continue
+                        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()
+                        if yn != 'y':
+                            continue
+                        # Call export_style_config with overwrite_path to skip dialog
+                        exported_path = export_style_config(None, base_path=None, overwrite_path=last_style_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:
@@ -3505,7 +3609,9 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                             continue
                         print(f"\nChosen path: {save_base}")
                         # Call export_style_config which handles the entire export dialog
-                        export_style_config(None, base_path=save_base)  # filename parameter ignored
+                        exported_path = export_style_config(None, base_path=save_base)  # filename parameter ignored
+                        if exported_path:
+                            fig._last_style_export_path = exported_path
                         style_menu_active = False  # Exit style submenu and return to main menu
                         break
                     else:
@@ -3543,14 +3649,33 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                         else:
                             print(f"  {i}: {fname}")
                 
-                filename = input("Enter filename (default SVG if no extension) or number to overwrite (q=cancel): ").strip()
+                last_figure_path = getattr(fig, '_last_figure_export_path', None)
+                if last_figure_path:
+                    filename = input("Enter filename (default SVG if no extension), number to overwrite, or o to overwrite last (q=cancel): ").strip()
+                else:
+                    filename = input("Enter filename (default SVG if no extension) or number to overwrite (q=cancel): ").strip()
                 if not filename or filename.lower() == 'q':
                     print("Canceled.")
                     continue
                 
+                already_confirmed = False  # Initialize for new filename case
+                # Check for 'o' option
+                if filename.lower() == 'o':
+                    if not last_figure_path:
+                        print("No previous export found.")
+                        continue
+                    if not os.path.exists(last_figure_path):
+                        print(f"Previous export file not found: {last_figure_path}")
+                        continue
+                    yn = input(f"Overwrite '{os.path.basename(last_figure_path)}'? (y/n): ").strip().lower()
+                    if yn != 'y':
+                        print("Canceled.")
+                        continue
+                    export_target = last_figure_path
+                    already_confirmed = True
                 # Check if user selected a number
-                already_confirmed = False
-                if filename.isdigit() and files:
+                elif filename.isdigit() and files:
+                    already_confirmed = False
                     idx = int(filename)
                     if 1 <= idx <= len(files):
                         name = files[idx-1]
@@ -3617,6 +3742,7 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                         else:
                             fig.savefig(export_target, dpi=300)
                         print(f"Figure saved to {export_target}")
+                        fig._last_figure_export_path = export_target
                         for i, txt in enumerate(label_text_objects):
                             txt.set_text(f"{i+1}: {labels[i]}")
                         fig.canvas.draw()