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

batplot/operando_ec_interactive.py

@@ -1050,6 +1050,15 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
             # Horizontal offsets (relative to canvas center, in inches)
             cb_h_offset = getattr(cbar.ax, '_cb_h_offset_in', 0.0)
             ec_h_offset = getattr(ec_ax, '_ec_h_offset_in', 0.0) if ec_ax is not None else None
+            # Colorbar tick/label positions (left/right)
+            cb_ticks_left = True
+            cb_label_left = True
+            try:
+                cb_ticks_left = any(getattr(tick, 'tick1line', None) and tick.tick1line.get_visible() for tick in cbar.ax.yaxis.get_major_ticks())
+                # label position is stored on axis; capture current setting
+                cb_label_left = (cbar.ax.yaxis.get_label_position() == 'left')
+            except Exception:
+                pass
             # Label pads (save current labelpad values to restore later)
             op_labelpads = {
                 'x': getattr(ax.xaxis, 'labelpad', None),
@@ -1084,6 +1093,8 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 'ec_visible': ec_visible,
                 'cb_h_offset': float(cb_h_offset),
                 'ec_h_offset': float(ec_h_offset) if ec_h_offset is not None else None,
+                'cb_ticks_left': cb_ticks_left,
+                'cb_label_left': cb_label_left,
                 'op_labelpads': dict(op_labelpads),
                 'ec_labelpads': dict(ec_labelpads) if ec_labelpads is not None else None,
                 'op_title_offsets': {
@@ -1138,6 +1149,14 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 _apply_group_layout_inches(fig, ax, cbar.ax, ec_ax, ax_w_i, ax_h_i, cb_w_i, cb_gap_i, ec_gap_i, ec_w_i)
             except Exception:
                 pass
+            # Colorbar tick/label side
+            try:
+                cb_ticks_left = snap.get('cb_ticks_left', True)
+                cb_label_left = snap.get('cb_label_left', True)
+                cbar.ax.yaxis.set_ticks_position('left' if cb_ticks_left else 'right')
+                cbar.ax.yaxis.set_label_position('left' if cb_label_left else 'right')
+            except Exception:
+                pass
             # Labels
             try:
                 op_l = snap.get('op_labels', {})
@@ -1170,6 +1189,14 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 pass
             try:
                 if snap.get('clim') is not None:
+                    # Detach built-in colorbar update to avoid artist removal errors; we redraw custom below.
+                    try:
+                        if hasattr(cbar, 'mappable'):
+                            cbar.mappable = None
+                        if hasattr(cbar, 'solids'):
+                            cbar.solids = None
+                    except Exception:
+                        pass
                     lo, hi = snap['clim']; im.set_clim(float(lo), float(hi))
             except Exception:
                 pass
@@ -1180,6 +1207,15 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                         cbar.update_normal(im)
             except Exception:
                 pass
+            # Restore colorbar side (ticks/label) and redraw custom colorbar to keep position
+            try:
+                cb_ticks_left = snap.get('cb_ticks_left', True)
+                cb_label_left = snap.get('cb_label_left', True)
+                cbar.ax.yaxis.set_ticks_position('left' if cb_ticks_left else 'right')
+                cbar.ax.yaxis.set_label_position('left' if cb_label_left else 'right')
+                _update_custom_colorbar(cbar.ax, im)
+            except Exception:
+                pass
             # EC axes
             try:
                 if ec_ax is not None:
@@ -1680,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]
@@ -1746,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
@@ -1949,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):
@@ -1961,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 == '':
@@ -1974,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
@@ -2840,7 +2917,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             continue
                         _snapshot("operando-xrange")
                         ax.set_xlim(cur[0], new_upper)
-                        _renormalize_to_visible()
                         fig.canvas.draw_idle()
                         print(f"Operando X range updated: {ax.get_xlim()[0]:.4g} {ax.get_xlim()[1]:.4g}")
                 if line.lower() == 'w':
@@ -2860,7 +2936,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             continue
                         _snapshot("operando-xrange")
                         ax.set_xlim(new_lower, cur[1])
-                        _renormalize_to_visible()
                         fig.canvas.draw_idle()
                         print(f"Operando X range updated: {ax.get_xlim()[0]:.4g} {ax.get_xlim()[1]:.4g}")
                 if line.lower() == 's':
@@ -2877,7 +2952,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                                 orig_min = min(extent[0], extent[1])
                                 orig_max = max(extent[0], extent[1])
                                 ax.set_xlim(orig_min, orig_max)
-                                _renormalize_to_visible()
                                 fig.canvas.draw_idle()
                                 print(f"Operando X range restored to original: {ax.get_xlim()[0]:.4g} {ax.get_xlim()[1]:.4g}")
                             else:
@@ -2891,8 +2965,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 try:
                     lo, hi = map(float, line.split())
                     ax.set_xlim(lo, hi)
-                    # Re-normalize intensity to visible region
-                    _renormalize_to_visible()
                     fig.canvas.draw_idle()
                 except Exception as e:
                     print(f"Invalid range: {e}")
@@ -2918,7 +2990,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             continue
                         _snapshot("operando-yrange")
                         ax.set_ylim(cur[0], new_upper)
-                        _renormalize_to_visible()
                         fig.canvas.draw_idle()
                         print(f"Operando Y range updated: {ax.get_ylim()[0]:.4g} {ax.get_ylim()[1]:.4g}")
                 if line.lower() == 'w':
@@ -2938,7 +3009,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             continue
                         _snapshot("operando-yrange")
                         ax.set_ylim(new_lower, cur[1])
-                        _renormalize_to_visible()
                         fig.canvas.draw_idle()
                         print(f"Operando Y range updated: {ax.get_ylim()[0]:.4g} {ax.get_ylim()[1]:.4g}")
                 if line.lower() == 's':
@@ -2955,7 +3025,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                                 orig_min = min(extent[2], extent[3])
                                 orig_max = max(extent[2], extent[3])
                                 ax.set_ylim(orig_min, orig_max)
-                                _renormalize_to_visible()
                                 fig.canvas.draw_idle()
                                 print(f"Operando Y range restored to original: {ax.get_ylim()[0]:.4g} {ax.get_ylim()[1]:.4g}")
                             else:
@@ -2969,8 +3038,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 try:
                     lo, hi = map(float, line.split())
                     ax.set_ylim(lo, hi)
-                    # Re-normalize intensity to visible region
-                    _renormalize_to_visible()
                     fig.canvas.draw_idle()
                 except Exception as e:
                     print(f"Invalid range: {e}")
@@ -3437,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()
@@ -3448,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:")
@@ -3572,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)
@@ -3581,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},
                                 }
@@ -3595,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},
@@ -4197,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:
@@ -4240,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()

batplot/session.py

@@ -38,6 +38,7 @@ import matplotlib.pyplot as plt
 import numpy as np
 
 from .utils import _confirm_overwrite
+from .color_utils import ensure_colormap
 
 
 def _current_tick_width(axis_obj, which: str):
@@ -700,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,
@@ -715,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()),
             }
@@ -749,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': {
@@ -831,8 +844,14 @@ def load_operando_session(filename: str):
     op = sess['operando']
     arr = _ma.masked_invalid(op['array'])
     extent = tuple(op['extent']) if op['extent'] is not None else None
+    cmap_name = op.get('cmap') or 'viridis'
+    try:
+        if not ensure_colormap(cmap_name):
+            cmap_name = 'viridis'
+    except Exception:
+        cmap_name = 'viridis'
     im = ax.imshow(arr, aspect='auto', origin=op.get('origin', 'upper'), extent=extent,
-                   cmap=op.get('cmap') or 'viridis', interpolation=op.get('interpolation', 'nearest'))
+                   cmap=cmap_name, interpolation=op.get('interpolation', 'nearest'))
     if op.get('clim'):
         try:
             im.set_clim(*op['clim'])
@@ -932,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', {})
@@ -1182,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
@@ -1420,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 = {
@@ -1538,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 []),
@@ -1975,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', {})
@@ -2255,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',
@@ -2317,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', [])),
@@ -2653,6 +2731,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', {})