batplot 1.8.0__py3-none-any.whl → 1.8.2__py3-none-any.whl

batplot/__init__.py

@@ -1,5 +1,5 @@
 """batplot: Interactive plotting for battery data visualization."""
 
-__version__ = "1.8.0"
+__version__ = "1.8.2"
 
 __all__ = ["__version__"]

batplot/args.py

@@ -152,6 +152,8 @@ def _print_general_help() -> None:
         "    batplot --all style.bps                # Batch with style: apply style.bps to all files\n"
         "    batplot --all ./Style/style.bps        # Batch with style: use relative path to style file\n"
         "    batplot --all config.bpsg              # Batch with style+geom: apply to all XY files\n"
+        "    batplot file1.xy:1.54 file2.qye --stack  # Stack mode: stack all files vertically\n"
+        "    batplot file1.xy:1.54 file2.qye structure.cif --stack --i # Stack mode: stack all files vertically with cif ticks\n"
         "    batplot file1.qye file2.qye style.bps  # Apply style to multiple files and export\n"
         "    batplot file1.xy file2.xye ./Style/style.bps  # Apply style from relative path\n\n"
         "  [Electrochemistry]\n"
@@ -169,7 +171,7 @@ def _print_general_help() -> None:
         "    batplot --cv FILE.txt                  # EC CV (cyclic voltammetry) from .txt\n"
         "    batplot --cv --all                     # Batch: all .mpt/.txt in directory (CV mode)\n\n"
         "  [Operando]\n"
-        "    batplot --operando --i [FOLDER]        # Operando contour (with or without .mpt file) with interactive menu\n\n"
+        "    batplot --operando --i [FOLDER]        # Operando contour (with or without .mpt file)\n\n"
             "Features:\n"
         "  • Quick plotting with sensible defaults, no config files needed\n"
         "  • Supports many common file formats (see -h xy/ec/op)\n"
@@ -183,9 +185,9 @@ def _print_general_help() -> None:
         "  batplot -h xy   # XY file plotting guide\n"
         "  batplot -h ec   # Electrochemistry (GC/dQdV/CV/CPC) guide\n"
         "  batplot -h op   # Operando guide\n"
-        "  batplot -m      # Open the illustrated txt manual with highlights\n"
+        "  batplot -m      # Open the illustrated txt manual with highlights\n\n"
 
-        "Contact & Updates:\n\n"
+        "Contact & Updates:\n"
         "  Subscribe to batplot-lab@kjemi.uio.no for updates\n"
         "  (If you are not from UiO, send an email to sympa@kjemi.uio.no with the subject line \"subscribe batplot-lab@kjemi.uio.no your-name\")\n"
         "  Kindly cite the pypi package page (https://pypi.org/project/batplot/) if the plot is used for publication\n"

batplot/batplot.py

@@ -1890,10 +1890,31 @@ def batplot_main() -> int:
         x_full_list = []
         raw_y_full_list = []
         offsets_list = []
-        tick_state = {
-            'bx': True,'tx': False,'ly': True,'ry': False,
-            'mbx': False,'mtx': False,'mly': False,'mry': False
-        }
+        # Load tick_state from wasd_state if available (version 2+), otherwise use defaults
+        wasd_loaded = sess.get('wasd_state')
+        if wasd_loaded and isinstance(wasd_loaded, dict):
+            # Convert wasd_state to tick_state format
+            tick_state = {}
+            for side_key, prefix in [('top', 't'), ('bottom', 'b'), ('left', 'l'), ('right', 'r')]:
+                s = wasd_loaded.get(side_key, {})
+                tick_state[f'{prefix}_ticks'] = bool(s.get('ticks', side_key in ('bottom', 'left')))
+                tick_state[f'{prefix}_labels'] = bool(s.get('labels', side_key in ('bottom', 'left')))
+                tick_state[f'm{prefix}x' if prefix in 'tb' else f'm{prefix}y'] = bool(s.get('minor', False))
+            # Legacy keys for backward compatibility
+            tick_state['bx'] = tick_state.get('b_ticks', True)
+            tick_state['tx'] = tick_state.get('t_ticks', False)
+            tick_state['ly'] = tick_state.get('l_ticks', True)
+            tick_state['ry'] = tick_state.get('r_ticks', False)
+            tick_state['mbx'] = tick_state.get('mbx', False)
+            tick_state['mtx'] = tick_state.get('mtx', False)
+            tick_state['mly'] = tick_state.get('mly', False)
+            tick_state['mry'] = tick_state.get('mry', False)
+        else:
+            # Fallback to legacy tick_state or defaults
+            tick_state = sess.get('tick_state', {
+                'bx': True,'tx': False,'ly': True,'ry': False,
+                'mbx': False,'mtx': False,'mly': False,'mry': False
+            })
         saved_stack = bool(sess.get('args_subset', {}).get('stack', False))
         # Pull data
         # --- Robust reconstruction of stored curves ---
@@ -1954,8 +1975,27 @@ def batplot_main() -> int:
             pass
         labels_list[:] = sess.get('labels', [f"Curve {i+1}" for i in range(len(y_data_list))])
         delta = sess.get('delta', 0.0)
+        # Apply tick state (labels visibility) BEFORE setting axis labels
+        try:
+            ax.tick_params(axis='x',
+                          bottom=tick_state.get('b_ticks', tick_state.get('bx', True)),
+                          labelbottom=tick_state.get('b_labels', tick_state.get('bx', True)),
+                          top=tick_state.get('t_ticks', tick_state.get('tx', False)),
+                          labeltop=tick_state.get('t_labels', tick_state.get('tx', False)))
+            ax.tick_params(axis='y',
+                          left=tick_state.get('l_ticks', tick_state.get('ly', True)),
+                          labelleft=tick_state.get('l_labels', tick_state.get('ly', True)),
+                          right=tick_state.get('r_ticks', tick_state.get('ry', False)),
+                          labelright=tick_state.get('r_labels', tick_state.get('ry', False)))
+        except Exception:
+            pass
         ax.set_xlabel(sess.get('axis', {}).get('xlabel', 'X'))
         ax.set_ylabel(sess.get('axis', {}).get('ylabel', 'Intensity'))
+        # Store tick_state on axes for interactive menu
+        try:
+            ax._saved_tick_state = dict(tick_state)
+        except Exception:
+            pass
         
         # Restore normalization ranges (if saved)
         axis_cfg = sess.get('axis', {})

batplot/cpc_interactive.py

@@ -86,6 +86,7 @@ from .ui import (
 from .utils import (
     _confirm_overwrite,
     choose_save_path,
+    convert_label_shortcuts,
     choose_style_file,
     list_files_in_subdirectory,
     get_organized_path,
@@ -335,13 +336,36 @@ def _rebuild_legend(ax, ax2, file_data, preserve_position=True):
     """
     try:
         fig = ax.figure
-        # Get stored position before rebuilding
+        # Get stored position before rebuilding. If none is stored yet, try to
+        # capture the current on-canvas position once so subsequent rebuilds
+        # (e.g., after renaming) do not jump to a new "best" location.
         xy_in = None
         if preserve_position:
             try:
                 xy_in = getattr(fig, '_cpc_legend_xy_in', None)
             except Exception:
-                pass
+                xy_in = None
+            if xy_in is None:
+                try:
+                    leg0 = ax.get_legend()
+                    if leg0 is not None and leg0.get_visible():
+                        try:
+                            renderer = fig.canvas.get_renderer()
+                        except Exception:
+                            fig.canvas.draw()
+                            renderer = fig.canvas.get_renderer()
+                        bb = leg0.get_window_extent(renderer=renderer)
+                        cx = 0.5 * (bb.x0 + bb.x1)
+                        cy = 0.5 * (bb.y0 + bb.y1)
+                        fx, fy = fig.transFigure.inverted().transform((cx, cy))
+                        fw, fh = fig.get_size_inches()
+                        offset = ((fx - 0.5) * fw, (fy - 0.5) * fh)
+                        offset = _sanitize_legend_offset(offset)
+                        if offset is not None:
+                            fig._cpc_legend_xy_in = offset
+                            xy_in = offset
+                except Exception:
+                    pass
         
         h1, l1 = ax.get_legend_handles_labels()
         h2, l2 = ax2.get_legend_handles_labels()
@@ -1643,6 +1667,31 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                 else:
                     # Single file mode: toggle efficiency
                     push_state("visibility-eff")
+                    # Capture current legend position BEFORE toggling visibility
+                    try:
+                        if not hasattr(fig, '_cpc_legend_xy_in') or getattr(fig, '_cpc_legend_xy_in') is None:
+                            leg0 = ax.get_legend()
+                            if leg0 is not None and leg0.get_visible():
+                                try:
+                                    # Ensure renderer exists
+                                    try:
+                                        renderer = fig.canvas.get_renderer()
+                                    except Exception:
+                                        fig.canvas.draw()
+                                        renderer = fig.canvas.get_renderer()
+                                    bb = leg0.get_window_extent(renderer=renderer)
+                                    cx = 0.5 * (bb.x0 + bb.x1)
+                                    cy = 0.5 * (bb.y0 + bb.y1)
+                                    fx, fy = fig.transFigure.inverted().transform((cx, cy))
+                                    fw, fh = fig.get_size_inches()
+                                    offset = ((fx - 0.5) * fw, (fy - 0.5) * fh)
+                                    offset = _sanitize_legend_offset(offset)
+                                    if offset is not None:
+                                        fig._cpc_legend_xy_in = offset
+                                except Exception:
+                                    pass
+                    except Exception:
+                        pass
                     vis = sc_eff.get_visible()
                     sc_eff.set_visible(not vis)
                     try:
@@ -1650,7 +1699,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                     except Exception:
                         pass
                 
-                _rebuild_legend(ax, ax2, file_data)
+                _rebuild_legend(ax, ax2, file_data, preserve_position=True)
                 fig.canvas.draw_idle()
             except ValueError:
                 print("Invalid input.")
@@ -1676,6 +1725,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
         elif key == 'c':
             # Colors submenu: ly (left Y series) and ry (right Y efficiency), with user colors and palettes
             try:
+                # Note: Individual series may use different colors, so we can't show a single "current" palette
                 # Use same palettes as EC interactive
                 palette_opts = ['tab10', 'Set2', 'Dark2', 'viridis', 'plasma']
                 def _palette_color(name, idx=0, total=1, default_val=0.4):
@@ -2668,6 +2718,33 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
             try:
                 push_state("toggle-eff")
                 
+                # Capture current legend position BEFORE toggling visibility
+                # This ensures the position is preserved when legend is rebuilt
+                try:
+                    if not hasattr(fig, '_cpc_legend_xy_in') or getattr(fig, '_cpc_legend_xy_in') is None:
+                        leg0 = ax.get_legend()
+                        if leg0 is not None and leg0.get_visible():
+                            try:
+                                # Ensure renderer exists
+                                try:
+                                    renderer = fig.canvas.get_renderer()
+                                except Exception:
+                                    fig.canvas.draw()
+                                    renderer = fig.canvas.get_renderer()
+                                bb = leg0.get_window_extent(renderer=renderer)
+                                cx = 0.5 * (bb.x0 + bb.x1)
+                                cy = 0.5 * (bb.y0 + bb.y1)
+                                fx, fy = fig.transFigure.inverted().transform((cx, cy))
+                                fw, fh = fig.get_size_inches()
+                                offset = ((fx - 0.5) * fw, (fy - 0.5) * fh)
+                                offset = _sanitize_legend_offset(offset)
+                                if offset is not None:
+                                    fig._cpc_legend_xy_in = offset
+                            except Exception:
+                                pass
+                except Exception:
+                    pass
+                
                 # Determine current visibility state (check if any efficiency is visible)
                 if is_multi_file:
                     # In multi-file mode, check if any efficiency is visible
@@ -3381,6 +3458,11 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                     if not cmd:
                         continue
                     if cmd == 'q':
+                        # Update ax._saved_tick_state before exiting so changes are persisted
+                        try:
+                            ax._saved_tick_state = dict(tick_state)
+                        except Exception:
+                            pass
                         break
                     if cmd == 'i':
                         # Invert tick direction (toggle between 'out' and 'in')
@@ -3702,6 +3784,11 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                             tick_state['mry'] = bool(wasd['right']['minor'])
                     if changed:
                         push_state("wasd-toggle")
+                        # Update ax._saved_tick_state so dump_session can read it
+                        try:
+                            ax._saved_tick_state = dict(tick_state)
+                        except Exception:
+                            pass
                         _apply_wasd(changed_sides if changed_sides else None)
                         # Single draw at the end after all positioning is complete
                         try:
@@ -3738,6 +3825,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
             print("Tip: Use LaTeX/mathtext for special characters:")
             print("  Subscript: H$_2$O → H₂O  |  Superscript: m$^2$ → m²")
             print("  Bullet: $\\bullet$ → •   |  Greek: $\\alpha$, $\\beta$  |  Angstrom: $\\AA$ → Å")
+            print("  Shortcuts: g{super(-1)} → g$^{\\mathrm{-1}}$  |  Li{sub(2)}O → Li$_{\\mathrm{2}}$O")
             while True:
                 print("Rename: x=x-axis, ly=left y-axis, ry=right y-axis, l=legend labels, q=back")
                 sub = _safe_input("Rename> ").strip().lower()
@@ -3788,6 +3876,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                         print(f"Current file name in legend: '{base_name}'")
                         new_name = _safe_input("Enter new file name (q=cancel): ").strip()
                         if new_name and new_name.lower() != 'q':
+                            new_name = convert_label_shortcuts(new_name)
                             try:
                                 push_state("rename-legend")
                                 
@@ -3895,6 +3984,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                                     print(f"Current file name in legend: '{base_name}'")
                                     new_name = _safe_input("Enter new file name (q=cancel): ").strip()
                                     if new_name and new_name.lower() != 'q':
+                                        new_name = convert_label_shortcuts(new_name)
                                         try:
                                             push_state("rename-legend")
                                             
@@ -3966,6 +4056,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                     print(f"Current x-axis title: '{current}'")
                     new_title = _safe_input("Enter new x-axis title (q=cancel): ")
                     if new_title and new_title.lower() != 'q':
+                        new_title = convert_label_shortcuts(new_title)
                         try:
                             push_state("rename-x")
                             ax.set_xlabel(new_title)
@@ -3985,6 +4076,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                     print(f"Current left y-axis title: '{current}'")
                     new_title = _safe_input("Enter new left y-axis title (q=cancel): ")
                     if new_title and new_title.lower() != 'q':
+                        new_title = convert_label_shortcuts(new_title)
                         try:
                             push_state("rename-ly")
                             ax.set_ylabel(new_title)
@@ -3999,6 +4091,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                     print(f"Current right y-axis title: '{current}'")
                     new_title = _safe_input("Enter new right y-axis title (q=cancel): ")
                     if new_title and new_title.lower() != 'q':
+                        new_title = convert_label_shortcuts(new_title)
                         try:
                             push_state("rename-ry")
                             ax2.set_ylabel(new_title)

batplot/electrochem_interactive.py

@@ -31,6 +31,7 @@ from .utils import (
     choose_style_file,
     list_files_in_subdirectory,
     get_organized_path,
+    convert_label_shortcuts,
 )
 import time
 from .color_utils import (
@@ -502,6 +503,28 @@ def _rebuild_legend(ax):
     fig = ax.figure
     # Capture existing title before any rebuild so it isn't lost
     _store_legend_title(fig, ax)
+    # If no stored position yet, try to capture the current legend location once
+    # so rebuilds (e.g., after renaming) don't jump to a new "best" spot.
+    try:
+        if getattr(fig, '_ec_legend_xy_in', None) is None:
+            leg0 = ax.get_legend()
+            if leg0 is not None and leg0.get_visible():
+                try:
+                    renderer = fig.canvas.get_renderer()
+                except Exception:
+                    fig.canvas.draw()
+                    renderer = fig.canvas.get_renderer()
+                bb = leg0.get_window_extent(renderer=renderer)
+                cx = 0.5 * (bb.x0 + bb.x1)
+                cy = 0.5 * (bb.y0 + bb.y1)
+                fx, fy = fig.transFigure.inverted().transform((cx, cy))
+                fw, fh = fig.get_size_inches()
+                offset = ((fx - 0.5) * fw, (fy - 0.5) * fh)
+                offset = _sanitize_legend_offset(fig, offset)
+                if offset is not None:
+                    fig._ec_legend_xy_in = offset
+    except Exception:
+        pass
     if not _get_legend_user_pref(fig):
         leg = ax.get_legend()
         if leg is not None:
@@ -2697,6 +2720,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 print("Tip: Use LaTeX/mathtext for special characters:")
                 print("  Subscript: H$_2$O → H₂O  |  Superscript: m$^2$ → m²")
                 print("  Bullet: $\\bullet$ → •   |  Greek: $\\alpha$, $\\beta$  |  Angstrom: $\\AA$ → Å")
+                print("  Shortcuts: g{super(-1)} → g$^{\\mathrm{-1}}$  |  Li{sub(2)}O → Li$_{\\mathrm{2}}$O")
                 while True:
                     print("Rename axis: x, y, both, q=back")
                     sub = _safe_input("Rename> ").strip().lower()
@@ -2707,6 +2731,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     if sub in ('x','both'):
                         txt = _safe_input("New X-axis label (blank=cancel): ")
                         if txt:
+                            txt = convert_label_shortcuts(txt)
                             push_state("rename-x")
                             try:
                                 # Freeze layout and preserve existing pad for one-shot restore
@@ -2730,6 +2755,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     if sub in ('y','both'):
                         txt = _safe_input("New Y-axis label (blank=cancel): ")
                         if txt:
+                            txt = convert_label_shortcuts(txt)
                             push_state("rename-y")
                             base_ylabel = txt
                             try:
@@ -3027,6 +3053,8 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             _print_menu(len(all_cycles), is_dqdv)
             continue
         elif key == 'c':
+            # Show current palette if one is applied (this is informational only)
+            # Note: Individual cycles may use different colors, so we can't show a single "current" palette
             print(f"Total cycles: {len(all_cycles)}")
             print("Enter one of:")
             print(_colorize_inline_commands("  - numbers: e.g. 1 5 10"))

batplot/interactive.py

@@ -25,6 +25,7 @@ from .utils import (
     choose_save_path,
     choose_style_file,
     list_files_in_subdirectory,
+    convert_label_shortcuts,
     get_organized_path,
 )
 import time
@@ -1955,12 +1956,11 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                                 ax._cif_draw_func()
                         fig.canvas.draw()
                     elif sub == 'p':
+                        # Show current palette if one is applied
                         history = getattr(fig, '_curve_palette_history', [])
                         current_palette = history[-1]['palette'] if history else None
                         if current_palette:
                             print(f"Current palette: {current_palette}")
-                        else:
-                            print("Current palette: manual/custom")
                         base_palettes = ['viridis', 'cividis', 'plasma', 'inferno', 'magma', 'batlow']
                         extras = []
                         def _palette_available(name: str) -> bool:
@@ -2211,6 +2211,7 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                         print("Tip: Use LaTeX/mathtext for special characters:")
                         print("  Subscript: H$_2$O → H₂O  |  Superscript: m$^2$ → m²")
                         print("  Bullet: $\\bullet$ → •   |  Greek: $\\alpha$, $\\beta$  |  Angstrom: $\\AA$ → Å")
+                        print("  Shortcuts: g{super(-1)} → g$^{\\mathrm{-1}}$  |  Li{sub(2)}O → Li$_{\\mathrm{2}}$O")
                         idx_in = _safe_input("Curve number to rename (q=cancel): ").strip()
                         if not idx_in or idx_in.lower() == 'q':
                             print("Canceled.")
@@ -2227,6 +2228,7 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                         if not new_label or new_label.lower() == 'q':
                             print("Canceled.")
                             continue
+                        new_label = convert_label_shortcuts(new_label)
                         push_state("rename-curve")
                         labels[idx] = new_label
                         label_text_objects[idx].set_text(f"{idx+1}: {new_label}")
@@ -2250,9 +2252,11 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                         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("  Shortcuts: g{super(-1)} → g$^{\\mathrm{-1}}$  |  Li{sub(2)}O → Li$_{\\mathrm{2}}$O")
                         new_name = _safe_input("New CIF tick label (q=cancel): ")
                         if not new_name or new_name.lower()=='q':
                             print("Canceled."); continue
+                        new_name = convert_label_shortcuts(new_name)
                         lab,fname,peaksQ,wl,qmax_sim,color = cts[idx]
                         # Suspend extension while updating label
                         if _bp is not None:
@@ -2278,10 +2282,12 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                         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("  Shortcuts: g{super(-1)} → g$^{\\mathrm{-1}}$  |  Li{sub(2)}O → Li$_{\\mathrm{2}}$O")
                         new_axis = _safe_input("New axis label: ")
                         if not new_axis or new_axis.lower() == 'q':
                             print("Canceled.")
                             continue
+                        new_axis = convert_label_shortcuts(new_axis)
                         new_axis = normalize_label_text(new_axis)
                         push_state("rename-axis")
                         # Freeze layout and preserve current pad via one-shot pending to avoid drift
@@ -3307,6 +3313,11 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                     if not cmd:
                         continue
                     if cmd == 'q':
+                        # Update ax._saved_tick_state before exiting so changes are persisted
+                        try:
+                            ax._saved_tick_state = dict(tick_state)
+                        except Exception:
+                            pass
                         break
                     if cmd == 'i':
                         # Invert tick direction (toggle between 'out' and 'in')
@@ -3578,6 +3589,11 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                             continue
                         # Unknown code
                         print(f"Unknown code: {p}")
+                    # After tick toggles, update ax._saved_tick_state so dump_session can read it
+                    try:
+                        ax._saved_tick_state = dict(tick_state)
+                    except Exception:
+                        pass
                     # After tick toggles, update visibility and reposition ALL axis labels for independence
                     update_tick_visibility()
                     update_labels(ax, y_data_list, label_text_objects, args.stack, getattr(fig, '_stack_label_at_bottom', False))

batplot/modes.py

@@ -280,8 +280,8 @@ def handle_cv_mode(args) -> int:
             ax.set_xlabel('Current (mA)', labelpad=8.0)
             ax.set_ylabel('Voltage (V)', labelpad=8.0)
         else:
-            ax.set_xlabel('Voltage (V)', labelpad=8.0)
-            ax.set_ylabel('Current (mA)', labelpad=8.0)
+        ax.set_xlabel('Voltage (V)', labelpad=8.0)
+        ax.set_ylabel('Current (mA)', labelpad=8.0)
         legend = ax.legend(title='Cycle')
         legend.get_title().set_fontsize('medium')
         # Adjust margins to prevent label clipping
@@ -642,8 +642,8 @@ def handle_gc_mode(args) -> int:
                         ln_c, = ax.plot(y_b, x_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
                                         linewidth=2.0, label=str(cyc), alpha=0.8)
                     else:
-                        ln_c, = ax.plot(x_b, y_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
-                                        linewidth=2.0, label=str(cyc), alpha=0.8)
+                    ln_c, = ax.plot(x_b, y_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
+                                    linewidth=2.0, label=str(cyc), alpha=0.8)
                 else:
                     ln_c = None
                 mask_d = (cyc_int == cyc) & discharge_mask
@@ -656,8 +656,8 @@ def handle_gc_mode(args) -> int:
                         ln_d, = ax.plot(yd_b, xd_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
                                         linewidth=2.0, label=lbl, alpha=0.8)
                     else:
-                        ln_d, = ax.plot(xd_b, yd_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
-                                        linewidth=2.0, label=lbl, alpha=0.8)
+                    ln_d, = ax.plot(xd_b, yd_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
+                                    linewidth=2.0, label=lbl, alpha=0.8)
                 else:
                     ln_d = None
                 cycle_lines[cyc] = {"charge": ln_c, "discharge": ln_d}
@@ -677,8 +677,8 @@ def handle_gc_mode(args) -> int:
                         ln_c, = ax.plot(y_b, x_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
                                         linewidth=2.0, label=str(cyc), alpha=0.8)
                     else:
-                        ln_c, = ax.plot(x_b, y_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
-                                        linewidth=2.0, label=str(cyc), alpha=0.8)
+                    ln_c, = ax.plot(x_b, y_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
+                                    linewidth=2.0, label=str(cyc), alpha=0.8)
                 ln_d = None
                 if i < len(dch_blocks):
                     a, b = dch_blocks[i]
@@ -690,8 +690,8 @@ def handle_gc_mode(args) -> int:
                         ln_d, = ax.plot(yd_b, xd_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
                                         linewidth=2.0, label=lbl, alpha=0.8)
                     else:
-                        ln_d, = ax.plot(xd_b, yd_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
-                                        linewidth=2.0, label=lbl, alpha=0.8)
+                    ln_d, = ax.plot(xd_b, yd_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
+                                    linewidth=2.0, label=lbl, alpha=0.8)
                 cycle_lines[cyc] = {"charge": ln_c, "discharge": ln_d}
                 
         # Swap x and y if --ro flag is set
@@ -699,8 +699,8 @@ def handle_gc_mode(args) -> int:
             ax.set_xlabel('Voltage (V)', labelpad=8.0)
             ax.set_ylabel(x_label_gc, labelpad=8.0)
         else:
-            ax.set_xlabel(x_label_gc, labelpad=8.0)
-            ax.set_ylabel('Voltage (V)', labelpad=8.0)
+        ax.set_xlabel(x_label_gc, labelpad=8.0)
+        ax.set_ylabel('Voltage (V)', labelpad=8.0)
         legend = ax.legend(title='Cycle')
         legend.get_title().set_fontsize('medium')
         fig.subplots_adjust(left=0.12, right=0.95, top=0.88, bottom=0.15)

batplot/operando.py

@@ -315,6 +315,8 @@ def plot_operando_folder(folder: str, args) -> Tuple[plt.Figure, plt.Axes, Dict[
     extent = (grid_x.min(), grid_x.max(), 0, Zm.shape[0]-1)
     # Bottom-to-top visual order (scan 0 at bottom) to match EC time progression -> origin='lower'
     im = ax.imshow(Zm, aspect='auto', origin='lower', extent=extent, cmap='viridis', interpolation='nearest')
+    # Store the colormap name explicitly so it can be retrieved reliably when saving
+    setattr(im, '_operando_cmap_name', 'viridis')
     # Create custom colorbar axes on the left (will be positioned by layout function)
     # Create a dummy axes that will be replaced by the custom colorbar in interactive menu
     cbar_ax = fig.add_axes([0.0, 0.0, 0.01, 0.01])  # Temporary position, will be repositioned