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

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
@@ -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()

batplot/operando_ec_interactive.py

@@ -1716,13 +1716,31 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                         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(); 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(); continue
+                    if not os.path.exists(last_figure_path):
+                        print(f"Previous export file not found: {last_figure_path}")
+                        print_menu(); continue
+                    yn = input(f"Overwrite '{os.path.basename(last_figure_path)}'? (y/n): ").strip().lower()
+                    if yn != 'y':
+                        print_menu(); 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]
@@ -1782,6 +1800,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 else:
                     fig.savefig(target, dpi=300)
                 print(f"Exported figure to {target}")
+                fig._last_figure_export_path = target
             except Exception as e:
                 print(f"Export failed: {e}")
             print_menu(); continue
@@ -1985,10 +2004,28 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             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_menu(); continue
+                if choice.lower() == 'o':
+                    # Overwrite last saved session
+                    if not last_session_path:
+                        print("No previous save found.")
+                        print_menu(); continue
+                    if not os.path.exists(last_session_path):
+                        print(f"Previous save file not found: {last_session_path}")
+                        print_menu(); continue
+                    yn = input(f"Overwrite '{os.path.basename(last_session_path)}'? (y/n): ").strip().lower()
+                    if yn != 'y':
+                        print_menu(); continue
+                    dump_operando_session(last_session_path, fig=fig, ax=ax, im=im, cbar=cbar, ec_ax=ec_ax, skip_confirm=True)
+                    print(f"Overwritten session to {last_session_path}")
+                    print_menu(); continue
                 if choice.isdigit() and files:
                     idx = int(choice)
                     if 1 <= idx <= len(files):
@@ -1997,10 +2034,13 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                         if yn != 'y':
                             print_menu(); continue
                         target = os.path.join(folder, name)
+                        dump_operando_session(target, fig=fig, ax=ax, im=im, cbar=cbar, ec_ax=ec_ax, skip_confirm=True)
+                        fig._last_session_save_path = target
+                        print_menu(); continue
                     else:
                         print("Invalid number.")
                         print_menu(); continue
-                else:
+                if choice.lower() != 'o':
                     name = choice
                     root, ext = os.path.splitext(name)
                     if ext == '':
@@ -2010,7 +2050,8 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                         yn = input(f"'{os.path.basename(target)}' exists. Overwrite? (y/n): ").strip().lower()
                         if yn != 'y':
                             print_menu(); continue
-                dump_operando_session(target, fig=fig, ax=ax, im=im, cbar=cbar, ec_ax=ec_ax, skip_confirm=True)
+                    dump_operando_session(target, fig=fig, ax=ax, im=im, cbar=cbar, ec_ax=ec_ax, skip_confirm=True)
+                    fig._last_session_save_path = target
             except Exception as e:
                 print(f"Save failed: {e}")
             print_menu(); continue
@@ -3463,6 +3504,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             else:
                                 print(f"  {_i}: {fname}")
                     
+                    last_style_path = getattr(fig, '_last_style_export_path', None)
                     if ec_ax is None:
                         print("\nNote: Style export (.bps/.bpsg) is only available in dual-pane mode (with EC file).")
                         sub = input("Style submenu: (q=return, r=refresh): ").strip().lower()
@@ -3474,11 +3516,38 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             print("Unknown choice.")
                             continue
                     else:
-                        sub = input("Style submenu: (e=export, q=return, r=refresh): ").strip().lower()
+                        if last_style_path:
+                            sub = input("Style submenu: (e=export, o=overwrite last, q=return, r=refresh): ").strip().lower()
+                        else:
+                            sub = input("Style submenu: (e=export, q=return, r=refresh): ").strip().lower()
                         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
+                            # Determine export type from existing file and rebuild config
+                            try:
+                                with open(last_style_path, 'r', encoding='utf-8') as f:
+                                    old_cfg = json.load(f)
+                                old_kind = old_cfg.get('kind', '')
+                                # Need to rebuild the full config - this requires the same logic as 'e' command
+                                # For simplicity, redirect user to use 'e' for now, or we could duplicate the config building code
+                                print("To overwrite with current style, please use 'e' to export fresh.")
+                                print("The 'o' option will be enhanced in a future update to rebuild config automatically.")
+                                continue
+                            except Exception as e:
+                                print(f"Error reading previous export: {e}")
+                                continue
                         if sub == 'e':
                             # Ask for ps or psg
                             print("Export options:")
@@ -3598,6 +3667,23 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                                 'x': getattr(ec_ax.xaxis, 'labelpad', None),
                                 'y': getattr(ec_ax.yaxis, 'labelpad', None),
                             }
+                            # Capture title offsets
+                            op_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),
+                            }
+                            ec_title_offsets = {
+                                'top_y': float(getattr(ec_ax, '_top_xlabel_manual_offset_y_pts', 0.0) or 0.0),
+                                'top_x': float(getattr(ec_ax, '_top_xlabel_manual_offset_x_pts', 0.0) or 0.0),
+                                'bottom_y': float(getattr(ec_ax, '_bottom_xlabel_manual_offset_y_pts', 0.0) or 0.0),
+                                'left_x': float(getattr(ec_ax, '_left_ylabel_manual_offset_x_pts', 0.0) or 0.0),
+                                'right_x': float(getattr(ec_ax, '_right_ylabel_manual_offset_x_pts', 0.0) or 0.0),
+                                'right_y': float(getattr(ec_ax, '_right_ylabel_manual_offset_y_pts', 0.0) or 0.0),
+                            }
                             
                             if exp_choice == 'ps':
                                 cb_h_offset = getattr(cbar.ax, '_cb_h_offset_in', 0.0)
@@ -3607,8 +3693,8 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                                     'version': 2,
                                     'figure': {'canvas_size': [fig_w, fig_h], 'cb_visible': cb_visible, 'cb_label_mode': cb_label_mode},
                                     'geometry': {'op_w_in': ax_w_in, 'op_h_in': ax_h_in, 'ec_w_in': ec_w_in, 'cb_h_offset': float(cb_h_offset), 'ec_h_offset': float(ec_h_offset) if ec_h_offset is not None else None},
-                                    'operando': {'cmap': cmap_name, 'wasd_state': op_wasd_state, 'spines': op_spines, 'ticks': {'widths': op_ticks}, 'y_reversed': op_reversed, 'intensity_range': intensity_range, 'labelpads': op_labelpads},
-                                    'ec': {'wasd_state': ec_wasd_state, 'spines': ec_spines, 'ticks': {'widths': ec_ticks}, 'curve': ec_curve, 'y_reversed': ec_reversed, 'y_mode': ec_y_mode, 'ion_params': ion_params, 'visible': ec_visible, 'labelpads': ec_labelpads},
+                                    'operando': {'cmap': cmap_name, 'wasd_state': op_wasd_state, 'spines': op_spines, 'ticks': {'widths': op_ticks}, 'y_reversed': op_reversed, 'intensity_range': intensity_range, 'labelpads': op_labelpads, 'title_offsets': op_title_offsets},
+                                    'ec': {'wasd_state': ec_wasd_state, 'spines': ec_spines, 'ticks': {'widths': ec_ticks}, 'curve': ec_curve, 'y_reversed': ec_reversed, 'y_mode': ec_y_mode, 'ion_params': ion_params, 'visible': ec_visible, 'labelpads': ec_labelpads, 'title_offsets': ec_title_offsets},
                                     'font': {'family': fam, 'size': fsize},
                                     'colorbar': {'label': cb_label_text, 'mode': cb_label_mode, 'visible': cb_visible},
                                 }
@@ -3621,8 +3707,8 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                                     'version': 2,
                                     'figure': {'canvas_size': [fig_w, fig_h], 'cb_visible': cb_visible, 'cb_label_mode': cb_label_mode},
                                     'geometry': {'op_w_in': ax_w_in, 'op_h_in': ax_h_in, 'ec_w_in': ec_w_in, 'cb_h_offset': float(cb_h_offset), 'ec_h_offset': float(ec_h_offset) if ec_h_offset is not None else None},
-                                    'operando': {'cmap': cmap_name, 'wasd_state': op_wasd_state, 'spines': op_spines, 'ticks': {'widths': op_ticks}, 'y_reversed': op_reversed, 'intensity_range': intensity_range, 'labelpads': op_labelpads},
-                                    'ec': {'wasd_state': ec_wasd_state, 'spines': ec_spines, 'ticks': {'widths': ec_ticks}, 'curve': ec_curve, 'y_reversed': ec_reversed, 'y_mode': ec_y_mode, 'ion_params': ion_params, 'visible': ec_visible, 'labelpads': ec_labelpads},
+                                    'operando': {'cmap': cmap_name, 'wasd_state': op_wasd_state, 'spines': op_spines, 'ticks': {'widths': op_ticks}, 'y_reversed': op_reversed, 'intensity_range': intensity_range, 'labelpads': op_labelpads, 'title_offsets': op_title_offsets},
+                                    'ec': {'wasd_state': ec_wasd_state, 'spines': ec_spines, 'ticks': {'widths': ec_ticks}, 'curve': ec_curve, 'y_reversed': ec_reversed, 'y_mode': ec_y_mode, 'ion_params': ion_params, 'visible': ec_visible, 'labelpads': ec_labelpads, 'title_offsets': ec_title_offsets},
                                     'font': {'family': fam, 'size': fsize},
                                     'axes_geometry': _get_geometry_snapshot(ax, ec_ax),
                                     'colorbar': {'label': cb_label_text, 'mode': cb_label_mode, 'visible': cb_visible},
@@ -4223,6 +4309,33 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     except Exception:
                         pass
                 
+                # Restore title offsets BEFORE applying labelpads
+                if version >= 2:
+                    try:
+                        op_offsets = op.get('title_offsets', {})
+                        if op_offsets:
+                            ax._top_xlabel_manual_offset_y_pts = float(op_offsets.get('top_y', 0.0) or 0.0)
+                            ax._top_xlabel_manual_offset_x_pts = float(op_offsets.get('top_x', 0.0) or 0.0)
+                            ax._bottom_xlabel_manual_offset_y_pts = float(op_offsets.get('bottom_y', 0.0) or 0.0)
+                            ax._left_ylabel_manual_offset_x_pts = float(op_offsets.get('left_x', 0.0) or 0.0)
+                            ax._right_ylabel_manual_offset_x_pts = float(op_offsets.get('right_x', 0.0) or 0.0)
+                            ax._right_ylabel_manual_offset_y_pts = float(op_offsets.get('right_y', 0.0) or 0.0)
+                    except Exception as e:
+                        print(f"Warning: Could not apply operando title offsets: {e}")
+                    
+                    try:
+                        ec_cfg = cfg.get('ec', {})
+                        ec_offsets = ec_cfg.get('title_offsets', {})
+                        if ec_offsets and ec_ax is not None:
+                            ec_ax._top_xlabel_manual_offset_y_pts = float(ec_offsets.get('top_y', 0.0) or 0.0)
+                            ec_ax._top_xlabel_manual_offset_x_pts = float(ec_offsets.get('top_x', 0.0) or 0.0)
+                            ec_ax._bottom_xlabel_manual_offset_y_pts = float(ec_offsets.get('bottom_y', 0.0) or 0.0)
+                            ec_ax._left_ylabel_manual_offset_x_pts = float(ec_offsets.get('left_x', 0.0) or 0.0)
+                            ec_ax._right_ylabel_manual_offset_x_pts = float(ec_offsets.get('right_x', 0.0) or 0.0)
+                            ec_ax._right_ylabel_manual_offset_y_pts = float(ec_offsets.get('right_y', 0.0) or 0.0)
+                    except Exception as e:
+                        print(f"Warning: Could not apply EC title offsets: {e}")
+                
                 # Apply labelpads (title positioning) - preserve current if not in config
                 if version >= 2:
                     try:
@@ -4266,6 +4379,44 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     except Exception as e:
                         print(f"Warning: Could not apply EC labelpads: {e}")
                 
+                # Reposition titles to apply offsets (after labelpads are set)
+                try:
+                    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
+                    # Build tick_state for operando pane
+                    op_ts = getattr(ax, '_saved_tick_state', {})
+                    op_tick_state = {
+                        't_ticks': bool(op_ts.get('t_ticks', op_ts.get('tx', False))),
+                        't_labels': bool(op_ts.get('t_labels', op_ts.get('tx', False))),
+                        'b_ticks': bool(op_ts.get('b_ticks', op_ts.get('bx', True))),
+                        'b_labels': bool(op_ts.get('b_labels', op_ts.get('bx', True))),
+                        'l_ticks': bool(op_ts.get('l_ticks', op_ts.get('ly', True))),
+                        'l_labels': bool(op_ts.get('l_labels', op_ts.get('ly', True))),
+                        'r_ticks': bool(op_ts.get('r_ticks', op_ts.get('ry', False))),
+                        'r_labels': bool(op_ts.get('r_labels', op_ts.get('ry', False))),
+                    }
+                    _ui_position_top_xlabel(ax, fig, op_tick_state)
+                    _ui_position_bottom_xlabel(ax, fig, op_tick_state)
+                    _ui_position_left_ylabel(ax, fig, op_tick_state)
+                    _ui_position_right_ylabel(ax, fig, op_tick_state)
+                    if ec_ax is not None:
+                        ec_ts = getattr(ec_ax, '_saved_tick_state', {})
+                        ec_tick_state = {
+                            't_ticks': bool(ec_ts.get('t_ticks', ec_ts.get('tx', False))),
+                            't_labels': bool(ec_ts.get('t_labels', ec_ts.get('tx', False))),
+                            'b_ticks': bool(ec_ts.get('b_ticks', ec_ts.get('bx', True))),
+                            'b_labels': bool(ec_ts.get('b_labels', ec_ts.get('bx', True))),
+                            'l_ticks': bool(ec_ts.get('l_ticks', ec_ts.get('ly', True))),
+                            'l_labels': bool(ec_ts.get('l_labels', ec_ts.get('ly', True))),
+                            'r_ticks': bool(ec_ts.get('r_ticks', ec_ts.get('ry', False))),
+                            'r_labels': bool(ec_ts.get('r_labels', ec_ts.get('ry', False))),
+                        }
+                        _ui_position_top_xlabel(ec_ax, fig, ec_tick_state)
+                        _ui_position_bottom_xlabel(ec_ax, fig, ec_tick_state)
+                        _ui_position_left_ylabel(ec_ax, fig, ec_tick_state)
+                        _ui_position_right_ylabel(ec_ax, fig, ec_tick_state)
+                except Exception as e:
+                    print(f"Warning: Could not reposition titles: {e}")
+                
                 # Final redraw
                 try:
                     fig.canvas.draw()