batplot 1.8.33__tar.gz → 1.8.35__tar.gz

{batplot-1.8.33/batplot.egg-info → batplot-1.8.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.8.33
+Version: 1.8.35
 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: MIT License

{batplot-1.8.33 → batplot-1.8.35}/batplot/__init__.py

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

{batplot-1.8.33 → batplot-1.8.35}/batplot/data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.8.35] - 2026-03-26
+- Bug fixes
+
+
+## [1.8.34] - 2026-03-24
+- Bug fixes
+
+
 ## [1.8.32] - 2026-03-24
 - Improved multi-file support for EC mode
 

{batplot-1.8.33 → batplot-1.8.35}/batplot/electrochem_interactive.py

@@ -281,12 +281,24 @@ def _apply_stored_smooth_settings(cycle_lines: Dict[int, Dict[str, Optional[Any]
                     continue
                 xdata = np.asarray(ln.get_xdata(), float)
                 ydata = np.asarray(ln.get_ydata(), float)
+                if xdata.size != ydata.size:
+                    n = int(min(xdata.size, ydata.size))
+                    if n < 3:
+                        continue
+                    xdata = xdata[:n]
+                    ydata = ydata[:n]
                 if xdata.size < 3:
                     continue
                 # Get original data if available, otherwise use current data
                 if hasattr(ln, '_original_xdata'):
                     xdata = np.asarray(ln._original_xdata, float)
                     ydata = np.asarray(ln._original_ydata, float)
+                    if xdata.size != ydata.size:
+                        n = int(min(xdata.size, ydata.size))
+                        if n < 3:
+                            continue
+                        xdata = xdata[:n]
+                        ydata = ydata[:n]
                 else:
                     ln._original_xdata = np.array(xdata, copy=True)
                     ln._original_ydata = np.array(ydata, copy=True)
@@ -309,12 +321,24 @@ def _apply_stored_smooth_settings(cycle_lines: Dict[int, Dict[str, Optional[Any]
                     continue
                 xdata = np.asarray(ln.get_xdata(), float)
                 ydata = np.asarray(ln.get_ydata(), float)
+                if xdata.size != ydata.size:
+                    n = int(min(xdata.size, ydata.size))
+                    if n < 3:
+                        continue
+                    xdata = xdata[:n]
+                    ydata = ydata[:n]
                 if xdata.size < 3:
                     continue
                 # Get original data if available, otherwise use current data
                 if hasattr(ln, '_original_xdata'):
                     xdata = np.asarray(ln._original_xdata, float)
                     ydata = np.asarray(ln._original_ydata, float)
+                    if xdata.size != ydata.size:
+                        n = int(min(xdata.size, ydata.size))
+                        if n < 3:
+                            continue
+                        xdata = xdata[:n]
+                        ydata = ydata[:n]
                 else:
                     ln._original_xdata = np.array(xdata, copy=True)
                     ln._original_ydata = np.array(ydata, copy=True)
@@ -341,12 +365,24 @@ def _apply_stored_smooth_settings(cycle_lines: Dict[int, Dict[str, Optional[Any]
                     continue
                 xdata = np.asarray(ln.get_xdata(), float)
                 ydata = np.asarray(ln.get_ydata(), float)
+                if xdata.size != ydata.size:
+                    n = int(min(xdata.size, ydata.size))
+                    if n < 5:
+                        continue
+                    xdata = xdata[:n]
+                    ydata = ydata[:n]
                 if xdata.size < 5:
                     continue
                 # Get original data if available, otherwise use current data
                 if hasattr(ln, '_original_xdata'):
                     xdata = np.asarray(ln._original_xdata, float)
                     ydata = np.asarray(ln._original_ydata, float)
+                    if xdata.size != ydata.size:
+                        n = int(min(xdata.size, ydata.size))
+                        if n < 5:
+                            continue
+                        xdata = xdata[:n]
+                        ydata = ydata[:n]
                 else:
                     ln._original_xdata = np.array(xdata, copy=True)
                     ln._original_ydata = np.array(ydata, copy=True)
@@ -904,11 +940,6 @@ def _format_cycles_compact(cycles: List[int]) -> str:
     return ", ".join(parts)
 
 
-def _print_ec_main_menu_options_tip():
-    """Reminder shown in top-level EC submenus: main menu includes p/i/s/b."""
-    print("  " + _colorize_menu("Tip: q → main menu (p i s b: export/import style, save session, undo)"))
-
-
 def _parse_cycle_tokens(tokens: List[str], fig=None) -> Tuple[str, List[int], dict, Optional[str], bool]:
     """Classify and parse tokens for the cycle command.
 
@@ -2370,7 +2401,6 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Optional[Dict[int, Dict[s
                     print("  " + _colorize_menu("d: show only discharge curves (hide charge)"))
                     print("  " + _colorize_menu("b: show both charge and discharge"))
                     print("  " + _colorize_menu("Which cycles are shown & colors: main menu c (e.g. 2-30 1 = cycles 2–30, palette 1 / tab10)"))
-                    _print_ec_main_menu_options_tip()
                     print("  " + _colorize_menu("q: back"))
                     sub = _safe_input(_colorize_prompt("Display (c/d/b/q): ")).strip().lower()
                     if not sub or sub == 'q':
@@ -2602,7 +2632,6 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Optional[Dict[int, Dict[s
                     print("Legend:")
                     print("  " + _colorize_menu("t: toggle"))
                     print("  " + _colorize_menu("p: set position"))
-                    _print_ec_main_menu_options_tip()
                     print("  " + _colorize_menu("q: back"))
                     sub = _safe_input(_colorize_prompt("Legend (t/p/q): ")).strip().lower()
                     if not sub:
@@ -2805,7 +2834,6 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Optional[Dict[int, Dict[s
                     cfg = _get_style_snapshot(fig, ax, cycle_lines, tick_state, file_data=file_data if is_multi_file else None)
                     cfg['kind'] = 'ec_style'  # Default, will be updated if psg is chosen
                     _print_style_snapshot(cfg)
-                    _print_ec_main_menu_options_tip()
                     
                     # List available style files (.bps, .bpsg, .bpcfg) in Styles/ subdirectory
                     style_file_list = list_files_in_subdirectory(('.bps', '.bpsg', '.bpcfg'), 'style')
@@ -3545,7 +3573,6 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Optional[Dict[int, Dict[s
                     print(f"  {_colorize_menu('l  : show only lines (no markers) for all curves')}")
                     print(f"  {_colorize_menu('ld : show line and dots (markers) for all curves')}")
                     print(f"  {_colorize_menu('d  : show only dots (no connecting line) for all curves')}")
-                    _print_ec_main_menu_options_tip()
                     print(f"  {_colorize_menu('q  : return')}")
                     sub = _safe_input(_colorize_prompt("Choose (c/f/g/l/ld/d/q): ")).strip().lower()
                     if not sub:
@@ -3740,7 +3767,6 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Optional[Dict[int, Dict[s
                         for idx, color in enumerate(user_colors, 1):
                             print("  " + _colorize_menu(f"{idx}: {color_block(color)} {color}"))
                         print("  " + _colorize_menu("u: edit saved colors"))
-                    _print_ec_main_menu_options_tip()
                     print("  " + _colorize_menu("q: back to main menu"))
                     line = _safe_input(_colorize_prompt("Enter mappings (e.g., a:red d:blue, q=back): ")).strip()
                     if not line or line.lower() == 'q':
@@ -3831,7 +3857,6 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Optional[Dict[int, Dict[s
                     print("  " + _colorize_menu("y: y-axis"))
                     if file_data:
                         print("  " + _colorize_menu("f: file names (legend)"))
-                    _print_ec_main_menu_options_tip()
                     print("  " + _colorize_menu("q: back"))
                     opts = "x/y" + ("/tx" if (is_dual_xaxis and secax) else "") + ("/f" if file_data else "") + "/q"
                     sub = _safe_input(_colorize_prompt(f"Rename ({opts}): ")).strip().lower()
@@ -3962,7 +3987,6 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Optional[Dict[int, Dict[s
                     continue
                 while True:
                     _print_file_list(file_data)
-                    _print_ec_main_menu_options_tip()
                     print("Current legend order (top to bottom):")
                     order = getattr(fig, '_ec_legend_file_order', None) or list(range(len(file_data)))
                     for i, idx in enumerate(order):
@@ -4167,7 +4191,6 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Optional[Dict[int, Dict[s
                 print(f"  Minor count     : {_C}m{_R}=minor ticks per interval  e.g. {_C}x 4{_R}  {_C}y 1{_R}  {_C}all 0{_R}=off  {_C}x auto{_R}")
                 print(f"  Title offsets   : {_C}p{_R}=adjust  ({_C}w{_R}=top  {_C}s{_R}=bottom  {_C}a{_R}=left  {_C}d{_R}=right)")
                 print(f"  Other           : {_C}list{_R}=show state   {_C}q{_R}=back")
-                _print_ec_main_menu_options_tip()
                 while True:
                     cmd = _safe_input(_colorize_prompt("Enter code(s): ")).strip().lower()
                     if not cmd:
@@ -4521,7 +4544,6 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Optional[Dict[int, Dict[s
                     for idx, color in enumerate(user_colors, 1):
                         print("  " + _colorize_menu(f"{idx}: {color_block(color)} {color}"))
                     print("  " + _colorize_menu("u: edit saved colors before assigning"))
-                _print_ec_main_menu_options_tip()
                 print("  " + _colorize_menu("q: back"))
                 line = _safe_input(_colorize_prompt("Selection: ")).strip()
                 if not line or line.lower() == 'q':
@@ -4827,7 +4849,6 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Optional[Dict[int, Dict[s
                     print("  " + _colorize_menu("s : swap axes (switch top/bottom)"))
                 if c_th:
                     print("  " + _colorize_menu("u : update theoretical capacity"))
-                _print_ec_main_menu_options_tip()
                 print("  " + _colorize_menu("q : back to main menu"))
                 
                 sub = _safe_input("X> ").strip().lower()
@@ -5367,7 +5388,6 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Optional[Dict[int, Dict[s
                 print(f"\nFont (current: family='{cur_family}', size={cur_size})")
                 print("  " + _colorize_menu("f: family"))
                 print("  " + _colorize_menu("s: size"))
-                _print_ec_main_menu_options_tip()
                 print("  " + _colorize_menu("q: back"))
                 sub = _safe_input(_colorize_prompt("Font (f/s/q): ")).strip().lower()
                 if not sub:
@@ -5442,7 +5462,6 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Optional[Dict[int, Dict[s
                 print("  " + _colorize_menu("w: upper only"))
                 print("  " + _colorize_menu("s: lower only"))
                 print("  " + _colorize_menu("a: auto (restore original)"))
-                _print_ec_main_menu_options_tip()
                 print("  " + _colorize_menu("q: back"))
                 lim = _safe_input(_colorize_prompt("X (w/s/a/q): ")).strip()
                 if not lim or lim.lower() == 'q':
@@ -5532,7 +5551,6 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Optional[Dict[int, Dict[s
                 print("  " + _colorize_menu("w: upper only"))
                 print("  " + _colorize_menu("s: lower only"))
                 print("  " + _colorize_menu("a: auto (restore original)"))
-                _print_ec_main_menu_options_tip()
                 print("  " + _colorize_menu("q: back"))
                 lim = _safe_input(_colorize_prompt("Y (w/s/a/q): ")).strip()
                 if not lim or lim.lower() == 'q':
@@ -5623,7 +5641,6 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Optional[Dict[int, Dict[s
             while True:
                 print("  " + _colorize_menu("p: plot frame size"))
                 print("  " + _colorize_menu("c: canvas size"))
-                _print_ec_main_menu_options_tip()
                 print("  " + _colorize_menu("q: back"))
                 sub = _safe_input(_colorize_prompt("Geom (p/c/q): ")).strip().lower()
                 if not sub:
@@ -5685,7 +5702,6 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Optional[Dict[int, Dict[s
                 print("  " + _colorize_menu("d: DiffCap smooth (≥1 mV ΔV + Savitzky–Golay, order 3, window 9)"))
                 print("  " + _colorize_menu("o: remove outliers (removes abrupt dQ/dV spikes)"))
                 print("  " + _colorize_menu("r: reset to original data"))
-                _print_ec_main_menu_options_tip()
                 print("  " + _colorize_menu("q: back to main menu"))
                 sub = _safe_input(_colorize_prompt("dQ/dV (a/d/o/r/q): ")).strip().lower()
                 if not sub:
@@ -5761,27 +5777,33 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Optional[Dict[int, Dict[s
                                     if ln is None or not ln.get_visible():
                                         continue
                                     xdata = np.asarray(ln.get_xdata(), float)
-                                ydata = np.asarray(ln.get_ydata(), float)
-                                if xdata.size < 3:
-                                    continue
-                                if not hasattr(ln, '_original_xdata'):
-                                    ln._original_xdata = np.array(xdata, copy=True)
-                                    ln._original_ydata = np.array(ydata, copy=True)
-                                dv = np.abs(np.diff(xdata))
-                                mask = np.ones_like(xdata, dtype=bool)
-                                mask[1:] &= dv >= threshold_v
-                                mask[:-1] &= dv >= threshold_v
-                                filtered_x = xdata[mask]
-                                filtered_y = ydata[mask]
-                                before = len(xdata)
-                                after = len(filtered_x)
-                                if after < before:
-                                    ln.set_xdata(filtered_x)
-                                    ln.set_ydata(filtered_y)
-                                    ln._smooth_applied = True
-                                    filtered += 1
-                                    total_before += before
-                                    total_after += after
+                                    ydata = np.asarray(ln.get_ydata(), float)
+                                    if xdata.size != ydata.size:
+                                        n = int(min(xdata.size, ydata.size))
+                                        if n < 3:
+                                            continue
+                                        xdata = xdata[:n]
+                                        ydata = ydata[:n]
+                                    if xdata.size < 3:
+                                        continue
+                                    if not hasattr(ln, '_original_xdata'):
+                                        ln._original_xdata = np.array(xdata, copy=True)
+                                        ln._original_ydata = np.array(ydata, copy=True)
+                                    dv = np.abs(np.diff(xdata))
+                                    mask = np.ones_like(xdata, dtype=bool)
+                                    mask[1:] &= dv >= threshold_v
+                                    mask[:-1] &= dv >= threshold_v
+                                    filtered_x = xdata[mask]
+                                    filtered_y = ydata[mask]
+                                    before = len(xdata)
+                                    after = len(filtered_x)
+                                    if after < before:
+                                        ln.set_xdata(filtered_x)
+                                        ln.set_ydata(filtered_y)
+                                        ln._smooth_applied = True
+                                        filtered += 1
+                                        total_before += before
+                                        total_after += after
                         if filtered:
                             removed = total_before - total_after
                             pct = 100 * removed / total_before if total_before else 0
@@ -5887,6 +5909,12 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Optional[Dict[int, Dict[s
                                     continue
                                 xdata = np.asarray(ln.get_xdata(), float)
                                 ydata = np.asarray(ln.get_ydata(), float)
+                                if xdata.size != ydata.size:
+                                    n = int(min(xdata.size, ydata.size))
+                                    if n < 3:
+                                        continue
+                                    xdata = xdata[:n]
+                                    ydata = ydata[:n]
                                 if xdata.size < 3:
                                     continue
                                 if not hasattr(ln, '_original_xdata'):
@@ -5996,6 +6024,12 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Optional[Dict[int, Dict[s
                                         continue
                                     xdata = np.asarray(ln.get_xdata(), float)
                                     ydata = np.asarray(ln.get_ydata(), float)
+                                    if xdata.size != ydata.size:
+                                        n = int(min(xdata.size, ydata.size))
+                                        if n < 5:
+                                            continue
+                                        xdata = xdata[:n]
+                                        ydata = ydata[:n]
                                     if xdata.size < 5:
                                         continue
                                     if not hasattr(ln, '_original_xdata'):

{batplot-1.8.33 → batplot-1.8.35/batplot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.8.33
+Version: 1.8.35
 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: MIT License

{batplot-1.8.33 → batplot-1.8.35}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "batplot"
-version = "1.8.33"
+version = "1.8.35"
 description = "Interactive plotting tool for material science (1D plot) and electrochemistry (GC, CV, dQ/dV, CPC, operando) with batch processing"
 authors = [
     { name = "Tian Dai", email = "tianda@uio.no" }