batplot 1.7.28__py3-none-any.whl → 1.8.1__py3-none-any.whl

batplot/__init__.py

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

batplot/args.py

@@ -169,7 +169,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 +183,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/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
@@ -3141,6 +3218,9 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
             _print_menu(); continue
         elif key == 't':
             # Unified WASD toggles for spines/ticks/minor/labels/title per side
+            # Import UI positioning functions locally to ensure they're accessible in nested functions
+            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
+            
             try:
                 # Local WASD state stored on figure to persist across openings
                 wasd = getattr(fig, '_cpc_wasd_state', None)
@@ -3735,6 +3815,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()
@@ -3785,6 +3866,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")
                                 
@@ -3892,6 +3974,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")
                                             
@@ -3963,6 +4046,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)
@@ -3982,6 +4066,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)
@@ -3996,6 +4081,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)