batplot 1.7.22__tar.gz → 1.7.24__tar.gz

{batplot-1.7.22/batplot.egg-info → batplot-1.7.24}/PKG-INFO

@@ -1,9 +1,30 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.7.22
+Version: 1.7.24
 Summary: Interactive plotting tool for material science (1D plot) and electrochemistry (GC, CV, dQ/dV, CPC, operando) with batch processing
 Author-email: Tian Dai <tianda@uio.no>
-License-Expression: MIT
+License: MIT License
+        
+        Copyright (c) 2025 Tian Dai
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+        
 Project-URL: Homepage, https://github.com/TianDai1729/batplot
 Project-URL: Repository, https://github.com/TianDai1729/batplot
 Project-URL: Issues, https://github.com/TianDai1729/batplot/issues
@@ -171,7 +192,9 @@ See [LICENSE](LICENSE)
 
 ## Author & Contact
 
-Tian Dai (tianda@uio.no)  
+Tian Dai
+tianda@uio.no
 University of Oslo
+https://www.mn.uio.no/kjemi/english/people/aca/tianda/
 
 **Subscribe for Updates**: Join batplot-lab@kjemi.uio.no for updates, feature announcements, and community feedback. If you are not from UiO, send an email to sympa@kjemi.uio.no with the exact subject line with your name: "subscribe batplot-lab@kjemi.uio.no your-name"

{batplot-1.7.22 → batplot-1.7.24}/README.md

@@ -141,7 +141,9 @@ See [LICENSE](LICENSE)
 
 ## Author & Contact
 
-Tian Dai (tianda@uio.no)  
+Tian Dai
+tianda@uio.no
 University of Oslo
+https://www.mn.uio.no/kjemi/english/people/aca/tianda/
 
 **Subscribe for Updates**: Join batplot-lab@kjemi.uio.no for updates, feature announcements, and community feedback. If you are not from UiO, send an email to sympa@kjemi.uio.no with the exact subject line with your name: "subscribe batplot-lab@kjemi.uio.no your-name"

{batplot-1.7.22/batplot/data → batplot-1.7.24}/USER_MANUAL.md

@@ -456,8 +456,8 @@ If no `.mpt` file is present, operando mode displays only the contour plot. The
 
 For questions, bug reports, or feature requests:
 
-- **GitHub**: https://github.com/tiandai-chem/batplot
+Tian Dai
 - **Email**: tianda@uio.no
 - **Mailing List**: Subscribe to batplot-lab@kjemi.uio.no for updates, feature announcements, and community discussions
 
-Feel free to open an issue on GitHub or reach out via email!
+Feel free to reach out via email!

{batplot-1.7.22 → batplot-1.7.24}/batplot/__init__.py

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

{batplot-1.7.22 → batplot-1.7.24}/batplot/args.py

@@ -190,6 +190,7 @@ def _print_general_help() -> None:
         "  (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"
         "  Email: tianda@uio.no\n"
+        "  Personal page: https://www.mn.uio.no/kjemi/english/people/aca/tianda/\n"
         )
     _print_help(msg)
 

{batplot-1.7.22 → batplot-1.7.24}/batplot/cpc_interactive.py

@@ -79,6 +79,46 @@ def _colorize_menu(text):
     return f"\033[96m{cmd}\033[0m: {desc}"  # Cyan for command, default for description
 
 
+def _color_of(artist):
+    """Return a representative color for a Line2D/PathCollection."""
+    try:
+        if artist is None:
+            return None
+        if hasattr(artist, 'get_color'):
+            c = artist.get_color()
+            if isinstance(c, (list, tuple)) and c and not isinstance(c, str):
+                return c[0]
+            return c
+        if hasattr(artist, 'get_facecolors'):
+            arr = artist.get_facecolors()
+            if arr is not None and len(arr):
+                from matplotlib.colors import to_hex
+                return to_hex(arr[0])
+    except Exception:
+        return None
+    return None
+
+
+def _get_legend_title(fig, default: str = "Legend") -> str:
+    """Fetch stored legend title, falling back to current legend text or default."""
+    try:
+        title = getattr(fig, '_cpc_legend_title', None)
+        if isinstance(title, str) and title:
+            return title
+    except Exception:
+        pass
+    try:
+        for ax in getattr(fig, 'axes', []):
+            leg = ax.get_legend()
+            if leg is not None:
+                t = leg.get_title().get_text()
+                if t:
+                    return t
+    except Exception:
+        pass
+    return default
+
+
 def _colorize_prompt(text):
     """Colorize commands within input prompts. Handles formats like (s=size, f=family, q=return) or (y/n)."""
     import re
@@ -234,7 +274,7 @@ def _rebuild_legend(ax, ax2, file_data):
                 h_all.append(h)
                 l_all.append(l)
         if h_all:
-            _legend_no_frame(ax, h_all, l_all, loc='best', borderaxespad=1.0)
+            _legend_no_frame(ax, h_all, l_all, loc='best', borderaxespad=1.0, title=_get_legend_title(ax.figure))
         else:
             leg = ax.get_legend()
             if leg:
@@ -398,7 +438,8 @@ def _style_snapshot(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_data=Non
         'font': {'family': fam0, 'size': fsize},
         'legend': {
             'visible': legend_visible,
-            'position_inches': legend_xy_in  # [x, y] offset from canvas center in inches
+            'position_inches': legend_xy_in,  # [x, y] offset from canvas center in inches
+            'title': _get_legend_title(fig),
         },
         'ticks': {
             'widths': {
@@ -671,6 +712,8 @@ def _apply_style(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, cfg: Dict, file_
         if leg_cfg:
             leg_visible = leg_cfg.get('visible', True)
             leg_xy_in = leg_cfg.get('position_inches')
+            if 'title' in leg_cfg:
+                fig._cpc_legend_title = leg_cfg.get('title') or _get_legend_title(fig)
             if leg_xy_in is not None:
                 fig._cpc_legend_xy_in = _sanitize_legend_offset(tuple(leg_xy_in))
             leg = ax.get_legend()
@@ -1197,7 +1240,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
         try:
             xy_in = _sanitize_legend_offset(getattr(fig, '_cpc_legend_xy_in', None))
             leg = ax.get_legend()
-            if xy_in is None or leg is None:
+            if xy_in is None:
                 return
             # Compute figure-fraction anchor from inches
             fw, fh = fig.get_size_inches()
@@ -1209,7 +1252,16 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
             h1, l1 = ax.get_legend_handles_labels()
             h2, l2 = ax2.get_legend_handles_labels()
             if h1 or h2:
-                _legend_no_frame(ax, h1 + h2, l1 + l2, loc='center', bbox_to_anchor=(fx, fy), bbox_transform=fig.transFigure, borderaxespad=1.0)
+                _legend_no_frame(
+                    ax,
+                    h1 + h2,
+                    l1 + l2,
+                    loc='center',
+                    bbox_to_anchor=(fx, fy),
+                    bbox_transform=fig.transFigure,
+                    borderaxespad=1.0,
+                    title=_get_legend_title(fig),
+                )
         except Exception:
             pass
 
@@ -1680,12 +1732,28 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                         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
                 
+                # 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
                 # Check if user selected a number
-                if fname.isdigit() and files:
+                elif fname.isdigit() and files:
                     idx = int(fname)
                     if 1 <= idx <= len(files):
                         name = files[idx-1]
@@ -1734,6 +1802,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                     # Export the figure
                     fig.savefig(target, bbox_inches='tight')
                     print(f"Exported figure to {target}")
+                    fig._last_figure_export_path = target
                     
                     # Restore original labels
                     if is_multi_file and original_labels:
@@ -1767,10 +1836,28 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                             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_cpc_session(last_session_path, fig=fig, ax=ax, ax2=ax2, sc_charge=sc_charge, sc_discharge=sc_discharge, sc_eff=sc_eff, file_data=file_data, 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):
@@ -1779,10 +1866,13 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                         if yn != 'y':
                             _print_menu(); continue
                         target = os.path.join(folder, name)
+                        dump_cpc_session(target, fig=fig, ax=ax, ax2=ax2, sc_charge=sc_charge, sc_discharge=sc_discharge, sc_eff=sc_eff, file_data=file_data, 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 == '':
@@ -1792,7 +1882,8 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                         yn = input(f"'{os.path.basename(target)}' exists. Overwrite? (y/n): ").strip().lower()
                         if yn != 'y':
                             _print_menu(); continue
-                dump_cpc_session(target, fig=fig, ax=ax, ax2=ax2, sc_charge=sc_charge, sc_discharge=sc_discharge, sc_eff=sc_eff, file_data=file_data, skip_confirm=True)
+                    dump_cpc_session(target, fig=fig, ax=ax, ax2=ax2, sc_charge=sc_charge, sc_discharge=sc_discharge, sc_eff=sc_eff, file_data=file_data, skip_confirm=True)
+                    fig._last_session_save_path = target
             except Exception as e:
                 print(f"Save failed: {e}")
             _print_menu(); continue
@@ -1916,11 +2007,44 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                             else:
                                 print(f"  {_i}: {fname}")
                     
-                    sub = input(_colorize_prompt("Style submenu: (e=export, q=return, r=refresh): ")).strip().lower()
+                    last_style_path = getattr(fig, '_last_style_export_path', None)
+                    if last_style_path:
+                        sub = input(_colorize_prompt("Style submenu: (e=export, o=overwrite last, q=return, r=refresh): ")).strip().lower()
+                    else:
+                        sub = input(_colorize_prompt("Style submenu: (e=export, q=return, r=refresh): ")).strip().lower()
                     if sub == 'q':
                         break
                     if sub == 'r' or sub == '':
                         continue
+                    if sub == 'o':
+                        # Overwrite last exported style file
+                        if not last_style_path:
+                            print("No previous export found.")
+                            continue
+                        if not os.path.exists(last_style_path):
+                            print(f"Previous export file not found: {last_style_path}")
+                            continue
+                        yn = input(f"Overwrite '{os.path.basename(last_style_path)}'? (y/n): ").strip().lower()
+                        if yn != 'y':
+                            continue
+                        # Rebuild config based on current state
+                        snap = _style_snapshot(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_data)
+                        # Determine if last export was style-only or style+geometry
+                        try:
+                            with open(last_style_path, 'r', encoding='utf-8') as f:
+                                old_cfg = json.load(f)
+                            if old_cfg.get('kind') == 'cpc_style_geom':
+                                snap['kind'] = 'cpc_style_geom'
+                                snap['geometry'] = _get_geometry_snapshot(ax, ax2)
+                            else:
+                                snap['kind'] = 'cpc_style'
+                        except Exception:
+                            snap['kind'] = 'cpc_style'
+                        with open(last_style_path, 'w', encoding='utf-8') as f:
+                            json.dump(snap, f, indent=2)
+                        print(f"Overwritten style to {last_style_path}")
+                        style_menu_active = False
+                        break
                     if sub == 'e':
                         # Ask for ps or psg
                         print("Export options:")
@@ -1978,10 +2102,42 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                                     print(f"  {i}: {fname}  ({timestamp})")
                                 else:
                                     print(f"  {i}: {fname}")
-                        choice = input("Enter new filename or number to overwrite (q=cancel): ").strip()
+                        if last_style_path:
+                            choice = input("Enter new filename, number to overwrite, or o to overwrite last (q=cancel): ").strip()
+                        else:
+                            choice = input("Enter new filename or number to overwrite (q=cancel): ").strip()
                         if not choice or choice.lower() == 'q':
                             print("Style export canceled.")
                             continue
+                        if choice.lower() == '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
+                            # Rebuild config based on current state
+                            snap = _style_snapshot(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_data)
+                            # Determine if last export was style-only or style+geometry
+                            try:
+                                with open(last_style_path, 'r', encoding='utf-8') as f:
+                                    old_cfg = json.load(f)
+                                if old_cfg.get('kind') == 'cpc_style_geom':
+                                    snap['kind'] = 'cpc_style_geom'
+                                    snap['geometry'] = _get_geometry_snapshot(ax, ax2)
+                                else:
+                                    snap['kind'] = 'cpc_style'
+                            except Exception:
+                                snap['kind'] = 'cpc_style'
+                            with open(last_style_path, 'w', encoding='utf-8') as f:
+                                json.dump(snap, f, indent=2)
+                            print(f"Overwritten style to {last_style_path}")
+                            style_menu_active = False
+                            break
                         target = None
                         if choice.isdigit() and files:
                             idx = int(choice)
@@ -2011,6 +2167,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                             with open(target, 'w', encoding='utf-8') as f:
                                 json.dump(snap, f, indent=2)
                             print(f"Exported CPC style to {target}")
+                            fig._last_style_export_path = target
                         style_menu_active = False  # Exit style submenu and return to main menu
                         break
                     else: