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

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()
@@ -4314,7 +4465,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 print("Rename Operando Axes: x=rename X label, y=rename Y label, q=back")
                 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:
                     sub = input("or> ").strip().lower()
                     if not sub:

batplot/session.py

@@ -701,6 +701,16 @@ def dump_operando_session(
             ec_wasd_state = _capture_wasd_state(ec_ax)
             ec_spines, ec_ticks = _capture_spine_tick_widths(ec_ax)
             
+            # Capture EC title offsets
+            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),
+            }
+            
             ec_state = {
                 'time_h': time_h,
                 'volt_v': volt_v,
@@ -716,6 +726,7 @@ def dump_operando_session(
                 'wasd_state': ec_wasd_state,
                 'spines': ec_spines,
                 'ticks': {'widths': ec_ticks},
+                'title_offsets': ec_title_offsets,
                 'stored_ylabel': getattr(ec_ax, '_stored_ylabel', None),  # Save hidden ylabel text
                 'visible': bool(ec_ax.get_visible()),
             }
@@ -750,6 +761,7 @@ def dump_operando_session(
                 'wasd_state': op_wasd_state,
                 'spines': op_spines,
                 'ticks': {'widths': op_ticks},
+                'title_offsets': op_title_offsets,
                 'stored_ylabel': getattr(ax, '_stored_ylabel', None),  # Save hidden ylabel text
             },
             'colorbar': {
@@ -939,6 +951,19 @@ def load_operando_session(filename: str):
     stored_ylabel = op.get('stored_ylabel')
     if stored_ylabel is not None:
         setattr(ax, '_stored_ylabel', stored_ylabel)
+    
+    # Restore operando title offsets
+    try:
+        op_title_offsets = op.get('title_offsets', {})
+        if op_title_offsets:
+            ax._top_xlabel_manual_offset_y_pts = float(op_title_offsets.get('top_y', 0.0) or 0.0)
+            ax._top_xlabel_manual_offset_x_pts = float(op_title_offsets.get('top_x', 0.0) or 0.0)
+            ax._bottom_xlabel_manual_offset_y_pts = float(op_title_offsets.get('bottom_y', 0.0) or 0.0)
+            ax._left_ylabel_manual_offset_x_pts = float(op_title_offsets.get('left_x', 0.0) or 0.0)
+            ax._right_ylabel_manual_offset_x_pts = float(op_title_offsets.get('right_x', 0.0) or 0.0)
+            ax._right_ylabel_manual_offset_y_pts = float(op_title_offsets.get('right_y', 0.0) or 0.0)
+    except Exception:
+        pass
         
         # Apply operando spines
         op_spines = op.get('spines', {})
@@ -1189,6 +1214,19 @@ def load_operando_session(filename: str):
         if stored_ylabel is not None:
             setattr(ec_ax, '_stored_ylabel', stored_ylabel)
         
+        # Restore EC title offsets
+        try:
+            ec_title_offsets = ec.get('title_offsets', {})
+            if ec_title_offsets:
+                ec_ax._top_xlabel_manual_offset_y_pts = float(ec_title_offsets.get('top_y', 0.0) or 0.0)
+                ec_ax._top_xlabel_manual_offset_x_pts = float(ec_title_offsets.get('top_x', 0.0) or 0.0)
+                ec_ax._bottom_xlabel_manual_offset_y_pts = float(ec_title_offsets.get('bottom_y', 0.0) or 0.0)
+                ec_ax._left_ylabel_manual_offset_x_pts = float(ec_title_offsets.get('left_x', 0.0) or 0.0)
+                ec_ax._right_ylabel_manual_offset_x_pts = float(ec_title_offsets.get('right_x', 0.0) or 0.0)
+                ec_ax._right_ylabel_manual_offset_y_pts = float(ec_title_offsets.get('right_y', 0.0) or 0.0)
+        except Exception:
+            pass
+        
         # Apply EC spines (WASD state already applied above)
         if version >= 2:
             # Apply EC spines
@@ -1427,6 +1465,15 @@ def dump_ec_session(
             'top_x': bool(getattr(ax, '_top_xlabel_on', False)),
             'right_y': bool(getattr(ax, '_right_ylabel_on', False)),
         }
+        # Title offsets
+        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),
+        }
         # Subplot margins
         sp = fig.subplotpars
         subplot_margins = {
@@ -1545,6 +1592,7 @@ def dump_ec_session(
             'tick_direction': tick_direction,
             'spines': spines_state,
             'titles': titles,
+            'title_offsets': title_offsets,
             'mode': getattr(ax, '_is_dqdv_mode', None),  # Store dQdV mode flag
             'rotation_angle': getattr(fig, '_ec_rotation_angle', 0),  # Store rotation angle
             'source_paths': list(getattr(fig, '_bp_source_paths', []) or []),
@@ -1982,6 +2030,19 @@ def load_ec_session(filename: str):
         ax.set_ylabel('')
         ax.yaxis.label.set_visible(False)
 
+    # Restore title offsets BEFORE positioning titles
+    try:
+        title_offsets = sess.get('title_offsets', {})
+        if title_offsets:
+            ax._top_xlabel_manual_offset_y_pts = float(title_offsets.get('top_y', 0.0) or 0.0)
+            ax._top_xlabel_manual_offset_x_pts = float(title_offsets.get('top_x', 0.0) or 0.0)
+            ax._bottom_xlabel_manual_offset_y_pts = float(title_offsets.get('bottom_y', 0.0) or 0.0)
+            ax._left_ylabel_manual_offset_x_pts = float(title_offsets.get('left_x', 0.0) or 0.0)
+            ax._right_ylabel_manual_offset_x_pts = float(title_offsets.get('right_x', 0.0) or 0.0)
+            ax._right_ylabel_manual_offset_y_pts = float(title_offsets.get('right_y', 0.0) or 0.0)
+    except Exception:
+        pass
+    
     # Duplicate titles
     try:
         titles = sess.get('titles', {})
@@ -2262,6 +2323,15 @@ def dump_cpc_session(
             'top_xlabel': getattr(ax, '_stored_top_xlabel', ''),
             'right_ylabel': getattr(ax2, '_stored_ylabel', ax2.get_ylabel()),
         }
+        # Title offsets
+        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(ax2, '_right_ylabel_manual_offset_x_pts', 0.0) or 0.0),
+            'right_y': float(getattr(ax2, '_right_ylabel_manual_offset_y_pts', 0.0) or 0.0),
+        }
         
         meta = {
             'kind': 'cpc',
@@ -2324,6 +2394,7 @@ def dump_cpc_session(
             'wasd_state': wasd_state,
             'tick_widths': tick_widths,
             'stored_titles': stored_titles,
+            'title_offsets': title_offsets,
             'font': {
                 'size': plt.rcParams.get('font.size'),
                 'chain': list(plt.rcParams.get('font.sans-serif', [])),
@@ -2337,6 +2408,30 @@ def dump_cpc_session(
         if file_data and isinstance(file_data, list) and len(file_data) > 0:
             multi_files = []
             for f in file_data:
+                def _marker_of(sc, default_val):
+                    try:
+                        m = getattr(sc, 'get_marker', lambda: default_val)()
+                        if m is None:
+                            return default_val
+                        return m
+                    except Exception:
+                        return default_val
+                def _alpha_of(sc, default_val=None):
+                    try:
+                        a = sc.get_alpha()
+                        return float(a) if a is not None else default_val
+                    except Exception:
+                        return default_val
+                def _visible_of(sc, default_val=True):
+                    try:
+                        return bool(sc.get_visible())
+                    except Exception:
+                        return default_val
+                def _label_of(sc, default_val=""):
+                    try:
+                        return sc.get_label() or default_val
+                    except Exception:
+                        return default_val
                 file_info = {
                     'filename': f.get('filename', 'unknown'),
                     'visible': f.get('visible', True),
@@ -2344,16 +2439,31 @@ def dump_cpc_session(
                         'x': _np.array(_scatter_xy(f.get('sc_charge', sc_charge))[0]),
                         'y': _np.array(_scatter_xy(f.get('sc_charge', sc_charge))[1]),
                         'color': _color_of(f.get('sc_charge')),
+                        'size': _size_of(f.get('sc_charge'), 32.0),
+                        'alpha': _alpha_of(f.get('sc_charge')),
+                        'marker': _marker_of(f.get('sc_charge'), 'o'),
+                        'label': _label_of(f.get('sc_charge'), 'Charge capacity'),
+                        'visible': _visible_of(f.get('sc_charge')),
                     },
                     'discharge': {
                         'x': _np.array(_scatter_xy(f.get('sc_discharge', sc_discharge))[0]),
                         'y': _np.array(_scatter_xy(f.get('sc_discharge', sc_discharge))[1]),
                         'color': _color_of(f.get('sc_discharge')),
+                        'size': _size_of(f.get('sc_discharge'), 32.0),
+                        'alpha': _alpha_of(f.get('sc_discharge')),
+                        'marker': _marker_of(f.get('sc_discharge'), 's'),
+                        'label': _label_of(f.get('sc_discharge'), 'Discharge capacity'),
+                        'visible': _visible_of(f.get('sc_discharge')),
                     },
                     'efficiency': {
                         'x': _np.array(_scatter_xy(f.get('sc_eff', sc_eff))[0]),
                         'y': _np.array(_scatter_xy(f.get('sc_eff', sc_eff))[1]),
                         'color': _color_of(f.get('sc_eff')),
+                        'size': _size_of(f.get('sc_eff'), 40.0),
+                        'alpha': _alpha_of(f.get('sc_eff')),
+                        'marker': _marker_of(f.get('sc_eff'), '^'),
+                        'label': _label_of(f.get('sc_eff'), 'Coulombic efficiency'),
+                        'visible': _visible_of(f.get('sc_eff')),
                     }
                 }
                 multi_files.append(file_info)
@@ -2374,9 +2484,9 @@ def dump_cpc_session(
 
 
 def load_cpc_session(filename: str):
-    """Load a CPC session and reconstruct fig, axes, and scatter artists.
+    """Load a CPC session and reconstruct fig, axes, scatter artists, and file_data.
 
-    Returns: (fig, ax, ax2, sc_charge, sc_discharge, sc_eff)
+    Returns: (fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_data)
     """
     try:
         with open(filename, 'rb') as f:
@@ -2463,12 +2573,47 @@ def load_cpc_session(filename: str):
             except Exception:
                 pass
             return sc
-        sc_charge = _mk_sc(ax, ch, 'o')
-        sc_discharge = _mk_sc(ax, dh, 'o')
-        # efficiency on ax2 with triangles
-        if 'marker' not in ef:
-            ef['marker'] = '^'
-        sc_eff = _mk_sc(ax2, ef, '^')
+        # If multi_files exist, rebuild all files and pick the first as primary
+        multi_files = sess.get('multi_files')
+        file_data = []
+        if multi_files and isinstance(multi_files, list) and len(multi_files) > 0:
+            for idx, finfo in enumerate(multi_files):
+                ch_info = finfo.get('charge', {})
+                dh_info = finfo.get('discharge', {})
+                ef_info = finfo.get('efficiency', {})
+                sc_ch = _mk_sc(ax, ch_info, ch_info.get('marker', 'o') or 'o')
+                sc_dh = _mk_sc(ax, dh_info, dh_info.get('marker', 's') or 's')
+                eff_marker = ef_info.get('marker', '^') or '^'
+                sc_ef = _mk_sc(ax2, ef_info, eff_marker)
+                # Respect overall file visibility
+                try:
+                    vis_file = bool(finfo.get('visible', True))
+                except Exception:
+                    vis_file = True
+                for sc_tmp in (sc_ch, sc_dh, sc_ef):
+                    try:
+                        sc_tmp.set_visible(sc_tmp.get_visible() and vis_file)
+                    except Exception:
+                        pass
+                file_data.append({
+                    'filename': finfo.get('filename', f'File {idx+1}'),
+                    'visible': vis_file,
+                    'sc_charge': sc_ch,
+                    'sc_discharge': sc_dh,
+                    'sc_eff': sc_ef,
+                })
+            # Use the first file as primary artists for interactive menu
+            sc_charge = file_data[0]['sc_charge']
+            sc_discharge = file_data[0]['sc_discharge']
+            sc_eff = file_data[0]['sc_eff']
+        else:
+            # No multi-file info: fall back to single-file series
+            sc_charge = _mk_sc(ax, ch, 'o')
+            sc_discharge = _mk_sc(ax, dh, 's')
+            if 'marker' not in ef:
+                ef['marker'] = '^'
+            sc_eff = _mk_sc(ax2, ef, '^')
+            file_data = None
         
         # Restore spines state (version 2+)
         try:
@@ -2622,6 +2767,16 @@ def load_cpc_session(filename: str):
                     ax2.tick_params(axis='y',
                                     right=wasd_state['right'].get('ticks', True),
                                     labelright=wasd_state['right'].get('labels', True))
+                # Axis title visibility
+                try:
+                    if 'bottom' in wasd_state:
+                        ax.xaxis.label.set_visible(bool(wasd_state['bottom'].get('title', True)))
+                    if 'left' in wasd_state:
+                        ax.yaxis.label.set_visible(bool(wasd_state['left'].get('title', True)))
+                    if 'right' in wasd_state:
+                        ax2.yaxis.label.set_visible(bool(wasd_state['right'].get('title', True)))
+                except Exception:
+                    pass
                 
                 # Minor ticks
                 if wasd_state.get('top', {}).get('minor') or wasd_state.get('bottom', {}).get('minor'):
@@ -2660,6 +2815,19 @@ def load_cpc_session(filename: str):
         except Exception:
             pass
         
+        # Restore title offsets BEFORE restoring titles
+        try:
+            title_offsets = sess.get('title_offsets', {})
+            if title_offsets:
+                ax._top_xlabel_manual_offset_y_pts = float(title_offsets.get('top_y', 0.0) or 0.0)
+                ax._top_xlabel_manual_offset_x_pts = float(title_offsets.get('top_x', 0.0) or 0.0)
+                ax._bottom_xlabel_manual_offset_y_pts = float(title_offsets.get('bottom_y', 0.0) or 0.0)
+                ax._left_ylabel_manual_offset_x_pts = float(title_offsets.get('left_x', 0.0) or 0.0)
+                ax2._right_ylabel_manual_offset_x_pts = float(title_offsets.get('right_x', 0.0) or 0.0)
+                ax2._right_ylabel_manual_offset_y_pts = float(title_offsets.get('right_y', 0.0) or 0.0)
+        except Exception:
+            pass
+        
         # Restore stored title texts (version 2+)
         try:
             stored_titles = sess.get('stored_titles', {})
@@ -2683,26 +2851,46 @@ def load_cpc_session(filename: str):
         try:
             handles1, labels1 = ax.get_legend_handles_labels()
             handles2, labels2 = ax2.get_legend_handles_labels()
-            if handles1 or handles2:
-                leg_meta = sess.get('legend', {})
-                xy_in = leg_meta.get('xy_in')
+            # Filter visible handles only
+            H, L = [], []
+            for h, l in list(zip(handles1, labels1)) + list(zip(handles2, labels2)):
+                try:
+                    if hasattr(h, 'get_visible') and not h.get_visible():
+                        continue
+                except Exception:
+                    pass
+                H.append(h); L.append(l)
+            leg_meta = sess.get('legend', {})
+            xy_in = leg_meta.get('xy_in')
+            vis = bool(leg_meta.get('visible', True))
+            if H and vis:
                 if xy_in is not None:
                     fw, fh = fig.get_size_inches()
                     fx = 0.5 + float(xy_in[0]) / float(fw)
                     fy = 0.5 + float(xy_in[1]) / float(fh)
-                    ax.legend(handles1 + handles2, labels1 + labels2, loc='center', bbox_to_anchor=(fx, fy), bbox_transform=fig.transFigure, borderaxespad=1.0)
+                    leg = ax.legend(H, L, loc='center', bbox_to_anchor=(fx, fy), bbox_transform=fig.transFigure, borderaxespad=1.0)
                     # persist inches on fig for interactive menu
                     try:
                         fig._cpc_legend_xy_in = (float(xy_in[0]), float(xy_in[1]))
                     except Exception:
                         pass
                 else:
-                    ax.legend(handles1 + handles2, labels1 + labels2, loc='best', borderaxespad=1.0)
-                # Apply visibility
-                vis = bool(leg_meta.get('visible', True))
+                    leg = ax.legend(H, L, loc='best', borderaxespad=1.0)
+                # Always hide legend frame to match interactive export behavior
+                try:
+                    if leg is not None:
+                        leg.set_frame_on(False)
+                except Exception:
+                    pass
+            else:
+                try:
+                    fig._cpc_legend_xy_in = (float(xy_in[0]), float(xy_in[1])) if xy_in is not None else None
+                except Exception:
+                    pass
+                # ensure legend hidden
                 leg = ax.get_legend()
                 if leg is not None:
-                    leg.set_visible(vis)
+                    leg.set_visible(False)
         except Exception:
             pass
         try:
@@ -2712,7 +2900,7 @@ def load_cpc_session(filename: str):
                 fig.canvas.draw_idle()
             except Exception:
                 pass
-        return fig, ax, ax2, sc_charge, sc_discharge, sc_eff
+        return fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_data
     except Exception as e:
         import traceback
         print(f"Error loading CPC session: {e}")