batplot 1.8.51__tar.gz → 1.8.52__tar.gz

{batplot-1.8.51 → batplot-1.8.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.8.51
+Version: 1.8.52
 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.51 → batplot-1.8.52}/batplot/__init__.py

@@ -7,7 +7,7 @@ import importlib.abc
 import importlib.machinery
 import sys
 
-__version__ = "1.8.51"
+__version__ = "1.8.52"
 
 
 _LEGACY_MODULE_ALIASES = {

{batplot-1.8.51 → batplot-1.8.52}/batplot/cli_save.py

@@ -186,7 +186,7 @@ def save_xy_session(
     from .session import dump_session
 
     tick_state = default_flat_tick_state()
-    dump_session(
+    ok = dump_session(
         target,
         fig=fig,
         ax=ax,
@@ -207,7 +207,8 @@ def save_xy_session(
         show_cif_titles=show_cif_titles,
         skip_confirm=True,
     )
-    fig._last_session_save_path = os.path.abspath(target)
+    if not ok:
+        raise RuntimeError(f"Failed to save XY session to {target}")
 
 
 @contextmanager

{batplot-1.8.51 → batplot-1.8.52}/batplot/data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.8.52] - 2026-08-08
+- Bug fixes
+
+
 ## [1.8.51] - 2026-08-06
 - Bug fixes
 

{batplot-1.8.51 → batplot-1.8.52}/batplot/data/latest_release_notes.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.51",
+  "version": "1.8.52",
   "custom_message": "- Bug fixes",
   "update_notes": [
     "- Bug fixes"

{batplot-1.8.51 → batplot-1.8.52}/batplot/plot_modes/batch_session/batch_io.py

@@ -149,7 +149,7 @@ def _prompt_one_session_path(
             print("Invalid number.")
             return None
     else:
-        fname = choice
+        fname = os.path.expanduser(choice)
         if not os.path.splitext(fname)[1]:
             fname += ".pkl"
         if os.path.isabs(fname):
@@ -235,8 +235,14 @@ def _save_sessions_as_new(
             continue
         try:
             save_panel(panels[i], target)
+            abspath = os.path.abspath(target)
             fig = _panel_fig(panels[i])
-            fig._last_session_save_path = os.path.abspath(target)  # type: ignore[attr-defined]
+            fig._last_session_save_path = abspath  # type: ignore[attr-defined]
+            # Keep panel.path aligned so next "save to original" uses the new file.
+            try:
+                panels[i].path = abspath
+            except Exception:
+                pass
             print(f"Saved [{i + 1}] to {target}")
             saved += 1
         except Exception as exc:
@@ -296,13 +302,17 @@ def run_batch_import_style(
     if indices is None:
         print("Import canceled.")
         return None
-    path = safe_input(colorize_prompt(path_prompt), cancel_on_interrupt=True).strip()
+    path = os.path.expanduser(
+        safe_input(colorize_prompt(path_prompt), cancel_on_interrupt=True).strip()
+    )
     if not path or path.lower() == "q":
         print("Import canceled.")
         return None
     payload = load_style(path)
     if payload is None:
         return None
+    # Capture pre-import snaps for selected panels, then drop frames for any
+    # panel that rejects/fails so ``b`` never restores unchanged peers.
     if prepare:
         prepare(indices)
     succeeded: list[int] = []
@@ -316,9 +326,19 @@ def run_batch_import_style(
                 succeeded.append(i)
         except Exception as exc:
             print(f"Import failed for [{i + 1}]: {exc}")
-            return None
+            # This index + any not-yet-processed peers need prepare frames dropped.
+            skipped.append(i)
+            skipped.extend(j for j in indices if j not in succeeded and j not in skipped)
+            break
+    if skipped and prepare is not None:
+        pop_skipped = getattr(prepare, "pop_skipped", None)
+        if callable(pop_skipped):
+            try:
+                pop_skipped(skipped)
+            except Exception:
+                pass
     if skipped:
-        names = ", ".join(str(i + 1) for i in skipped)
+        names = ", ".join(str(i + 1) for i in sorted(set(skipped)))
         print(f"Skipped plot(s) {names} (incompatible or rejected).")
     if not succeeded:
         print("Style import did not apply to any panels.")
@@ -351,7 +371,9 @@ def run_batch_export_style(
 
     if len(indices) == 1:
         i = indices[0]
-        out = safe_input(colorize_prompt(path_prompt_single), cancel_on_interrupt=True).strip()
+        out = os.path.expanduser(
+            safe_input(colorize_prompt(path_prompt_single), cancel_on_interrupt=True).strip()
+        )
         if not out or out.lower() == "q":
             print("Export canceled.")
             return

{batplot-1.8.51 → batplot-1.8.52}/batplot/plot_modes/batch_session/batch_panel_state.py

@@ -107,11 +107,23 @@ def _apply_ec_import(panel, cfg: dict) -> bool | None:
     return menu_ec._apply_cfg(panel, cfg)
 
 
+def _strip_figure_geometry_keys(cfg: dict) -> None:
+    """Remove canvas/frame hitchhikers from a style-only (``ps``) payload."""
+    fig_block = cfg.get("figure")
+    if isinstance(fig_block, dict):
+        for key in ("canvas_size", "frame_size", "axes_fraction", "size"):
+            fig_block.pop(key, None)
+        if not fig_block:
+            cfg.pop("figure", None)
+
+
 def _export_ec_style(panel, path: str, sub: str) -> None:
     cfg = _capture_ec(panel)
     cfg["kind"] = "ec_style_geom" if sub == "psg" else "ec_style"
     if sub == "ps":
         cfg.pop("geometry", None)
+        cfg.pop("xaxis_dual", None)
+        _strip_figure_geometry_keys(cfg)
     with open(path, "w", encoding="utf-8") as fh:
         json.dump(cfg, fh, indent=2)
 
@@ -139,6 +151,7 @@ def _export_cpc_style(panel, path: str, sub: str) -> None:
     cfg["kind"] = "cpc_style_geom" if sub == "psg" else "cpc_style"
     if sub == "ps":
         cfg.pop("geometry", None)
+        _strip_figure_geometry_keys(cfg)
     with open(path, "w", encoding="utf-8") as fh:
         json.dump(cfg, fh, indent=2)
 

{batplot-1.8.51 → batplot-1.8.52}/batplot/plot_modes/batch_session/batch_scoped_sync.py

@@ -62,7 +62,7 @@ def merge_spines_props(
     *,
     mode: str,
 ) -> dict:
-    """mode: ``linewidth`` | ``color`` | ``all``."""
+    """mode: ``linewidth`` | ``color`` | ``visible`` | ``all``."""
     out = copy.deepcopy(peer) if isinstance(peer, dict) else {}
     if not isinstance(ref, dict):
         return out
@@ -73,8 +73,9 @@ def merge_spines_props(
         if mode in ("linewidth", "all"):
             if "linewidth" in props:
                 dest["linewidth"] = props["linewidth"]
-            if "visible" in props:
-                dest["visible"] = props["visible"]
+        # Visibility is owned by WASD (``t``).
+        if mode in ("visible", "all") and "visible" in props:
+            dest["visible"] = props["visible"]
         if mode in ("color", "all"):
             if "color" in props:
                 dest["color"] = props["color"]

{batplot-1.8.51 → batplot-1.8.52}/batplot/plot_modes/batch_session/common.py

@@ -30,6 +30,12 @@ class SyncUndoStacks:
                 if len(self._stacks[i]) > 40:
                     self._stacks[i].pop(0)
 
+    def pop_indices(self, indices: List[int]) -> None:
+        """Drop the latest frame for each index (failed import cleanup)."""
+        for i in indices:
+            if 0 <= i < len(self._stacks) and len(self._stacks[i]) > 1:
+                self._stacks[i].pop()
+
     def can_undo(self) -> bool:
         """True when at least one panel has more than the baseline snapshot (index 0)."""
         return any(len(s) > 1 for s in self._stacks)
@@ -47,6 +53,9 @@ class SyncUndoStacks:
                 restore_fn(i, snap)
                 restored += 1
             except Exception as exc:
+                # Keep panel stacks aligned: a failed restore must not drop the
+                # only copy of that undo level (otherwise later ``b`` desyncs).
+                stack.append(snap)
                 print(f"Undo failed for panel {i + 1}: {exc}")
         if restored:
             print(f"Undo: restored {restored} panel(s).")
@@ -55,6 +64,42 @@ class SyncUndoStacks:
         return False
 
 
+def make_style_import_prepare(
+    undo: SyncUndoStacks,
+    panels: Sequence[Any],
+    capture_panel: Callable[[Any], Any],
+    restore_panel: Callable[[Any, Any], None] | None = None,
+) -> Callable[[List[int]], None]:
+    """Build a ``prepare`` callback that can roll back skipped import frames.
+
+    When ``restore_panel`` is provided, skipped/failed panels are fully restored
+    from the pre-import tip before the tip is dropped (discard-only would leave
+    a half-applied panel with no ``b`` recovery).
+    """
+
+    def prepare(indices: List[int]) -> None:
+        undo.push_indices(indices, [capture_panel(panels[i]) for i in indices])
+
+    def pop_skipped(skipped: List[int]) -> None:
+        for i in skipped:
+            if not (0 <= i < len(undo._stacks)):
+                continue
+            stack = undo._stacks[i]
+            if len(stack) <= 1:
+                continue
+            snap = stack.pop()
+            if restore_panel is None:
+                continue
+            try:
+                restore_panel(panels[i], snap)
+            except Exception as exc:
+                stack.append(snap)
+                print(f"Import rollback failed for panel {i + 1}: {exc}")
+
+    prepare.pop_skipped = pop_skipped  # type: ignore[attr-defined]
+    return prepare
+
+
 def set_all_panel_figure_titles(panels: Sequence[Any]) -> None:
     for panel in panels:
         set_panel_figure_title(panel)

{batplot-1.8.51 → batplot-1.8.52}/batplot/plot_modes/batch_session/cpc_batch_helpers.py

@@ -23,6 +23,7 @@ from ..common.spines import (
     apply_wasd_tick_params,
     build_wasd_state,
     run_spine_tick_menu,
+    set_primary_axis_title,
     sync_tick_state_from_wasd,
 )
 from ..common.terminal import colorize_inline_commands, colorize_prompt, safe_input
@@ -67,6 +68,9 @@ _CPC_COLOR_MULTI_FIELDS = (
     "efficiency_hollow",
 )
 
+# Series color sync fields (batch ``c``) — include alpha for p/i/s/b parity.
+_CPC_SERIES_COLOR_FIELDS = ("color", "hollow", "alpha")
+
 
 def _peer_cpc_style(panel: CpcPanel) -> dict:
     return _style_snapshot(
@@ -191,12 +195,18 @@ def apply_cpc_labels_only(panel: CpcPanel, cfg: dict, *, silent: bool = True) ->
 
 
 def apply_cpc_wasd_chrome_only(panel: CpcPanel, cfg: dict, *, silent: bool = True) -> bool:
-    """Batch ``t``: WASD / ticks / spine widths (not series colors)."""
+    """Batch ``t``: WASD / ticks / title offsets (not ``l`` widths or series colors)."""
+    cfg = dict(cfg) if isinstance(cfg, dict) else {}
+    ticks = cfg.get("ticks")
+    if isinstance(ticks, dict):
+        ticks = dict(ticks)
+        ticks.pop("widths", None)
+        cfg["ticks"] = ticks
     return apply_cpc_scoped_sync(
         panel,
         cfg,
         top_keys=frozenset({"wasd_state", "ticks", "spines", "title_offsets", "labelpads"}),
-        spine_mode="linewidth",
+        spine_mode="visible",
         silent=silent,
     )
 
@@ -240,7 +250,7 @@ def apply_cpc_colors_only(panel: CpcPanel, cfg: dict, *, silent: bool = True) ->
         top_keys=frozenset({"spine_colors", "spine_colors_auto", "spines"}),
         spine_mode="color",
         multi_file_fields=_CPC_COLOR_MULTI_FIELDS,
-        series_color_fields=("color", "hollow"),
+        series_color_fields=_CPC_SERIES_COLOR_FIELDS,
         silent=silent,
     )
 
@@ -366,15 +376,10 @@ def cpc_run_file_visibility_menu(
         push_state("visibility")
         for idx in indices_to_toggle:
             f = file_data[idx]
-            new_vis = not f.get("visible", True)
-            f["visible"] = new_vis
-            for key in ("sc_charge", "sc_discharge", "sc_eff"):
-                sc = f.get(key)
-                if sc is not None:
-                    try:
-                        sc.set_visible(new_vis)
-                    except Exception:
-                        pass
+            f["visible"] = not f.get("visible", True)
+        from ..cpc.panel_menus import apply_cpc_file_artist_visibility
+
+        apply_cpc_file_artist_visibility(fig, file_data)
         try:
             rebuild_legend(ax, ax2, file_data, preserve_position=True)
             fig.canvas.draw_idle()
@@ -384,7 +389,14 @@ def cpc_run_file_visibility_menu(
         print(f"Toggled: {', '.join(names)}")
 
 
-def cpc_set_spine_color(fig: Any, ax: Any, ax2: Any, spine_name: str, color) -> None:
+def cpc_set_spine_color(
+    fig: Any,
+    ax: Any,
+    ax2: Any,
+    spine_name: str,
+    color,
+    tick_state=None,
+) -> None:
     """Set one spine's color (with matching ticks/labels), mirroring the
     ``_set_spine_color`` closure ``_apply_style`` builds for normal mode."""
     if not hasattr(fig, "_cpc_spine_colors") or not isinstance(getattr(fig, "_cpc_spine_colors", None), dict):
@@ -399,11 +411,16 @@ def cpc_set_spine_color(fig: Any, ax: Any, ax2: Any, spine_name: str, color) ->
         "left": [ax],
         "right": [ax2],
     }
+    ts = tick_state
+    if ts is None:
+        ts = getattr(ax, "_saved_tick_state", None)
     for curr_ax in axes_map.get(spine_name, [ax, ax2]):
         if curr_ax is None or spine_name not in curr_ax.spines:
             continue
         try:
-            _ui_set_spine_side_color(curr_ax, spine_name, color, fig=fig)
+            _ui_set_spine_side_color(
+                curr_ax, spine_name, color, fig=fig, tick_state=ts
+            )
         except Exception:
             pass
 
@@ -444,21 +461,24 @@ def run_cpc_batch_spine_menu(
                 "ticks": bool(tick_state.get("b_ticks", tick_state.get("bx", True))),
                 "minor": bool(tick_state.get("mbx", False)),
                 "labels": bool(tick_state.get("b_labels", tick_state.get("bx", True))),
-                "title": bool(ax.get_xlabel()),
+                "title": bool(ax.xaxis.label.get_visible()),
             },
             "left": {
                 "spine": _spine_visible("left", ax),
                 "ticks": bool(tick_state.get("l_ticks", tick_state.get("ly", True))),
                 "minor": bool(tick_state.get("mly", False)),
                 "labels": bool(tick_state.get("l_labels", tick_state.get("ly", True))),
-                "title": bool(ax.get_ylabel()),
+                "title": bool(ax.yaxis.label.get_visible()),
             },
             "right": {
                 "spine": _spine_visible("right", ax2),
                 "ticks": bool(tick_state.get("r_ticks", tick_state.get("ry", True))),
                 "minor": bool(tick_state.get("mry", False)),
                 "labels": bool(tick_state.get("r_labels", tick_state.get("ry", True))),
-                "title": bool(ax2.yaxis.get_label().get_text()) and bool(sc_eff.get_visible() if sc_eff is not None else False),
+                "title": (
+                    bool(ax2.yaxis.label.get_visible())
+                    and bool(sc_eff.get_visible() if sc_eff is not None else False)
+                ),
             },
         }
         fig._cpc_wasd_state = wasd
@@ -473,30 +493,24 @@ def run_cpc_batch_spine_menu(
         apply_wasd_tick_params(ax2, wasd, x_sides=(), y_sides=("right",), y_mode="right")
 
         try:
-            if bool(wasd["bottom"]["title"]):
-                if hasattr(ax, "_stored_xlabel") and isinstance(ax._stored_xlabel, str) and ax._stored_xlabel:
-                    ax.set_xlabel(ax._stored_xlabel)
-            else:
-                if not hasattr(ax, "_stored_xlabel"):
-                    try:
-                        ax._stored_xlabel = ax.get_xlabel()
-                    except Exception:
-                        ax._stored_xlabel = ""
-                ax.set_xlabel("")
+            set_primary_axis_title(
+                ax, "x", on=bool(wasd["bottom"]["title"]), stored_attr="_stored_xlabel"
+            )
         except Exception:
             pass
 
         try:
-            if not hasattr(ax, "_stored_top_xlabel") or not ax._stored_top_xlabel:
+            if not hasattr(ax, "_stored_top_xlabel") or not isinstance(ax._stored_top_xlabel, str):
                 current_xlabel = ax.get_xlabel()
                 if current_xlabel:
                     ax._stored_top_xlabel = current_xlabel
-                elif hasattr(ax, "_stored_xlabel") and ax._stored_xlabel:
+                elif hasattr(ax, "_stored_xlabel") and isinstance(ax._stored_xlabel, str) and ax._stored_xlabel:
                     ax._stored_top_xlabel = ax._stored_xlabel
                 else:
                     ax._stored_top_xlabel = ""
 
-            if bool(wasd["top"]["title"]) and ax._stored_top_xlabel:
+            ax._top_xlabel_on = bool(wasd["top"]["title"])
+            if bool(wasd["top"]["title"]) and isinstance(getattr(ax, "_stored_top_xlabel", None), str):
                 if not hasattr(ax, "_top_xlabel_text") or ax._top_xlabel_text is None:
                     ax._top_xlabel_text = ax.text(
                         0.5, 1.0, "", transform=ax.transAxes,
@@ -544,31 +558,20 @@ def run_cpc_batch_spine_menu(
             pass
 
         try:
-            if bool(wasd["left"]["title"]):
-                if hasattr(ax, "_stored_ylabel") and isinstance(ax._stored_ylabel, str) and ax._stored_ylabel:
-                    ax.set_ylabel(ax._stored_ylabel)
-            else:
-                if not hasattr(ax, "_stored_ylabel"):
-                    try:
-                        ax._stored_ylabel = ax.get_ylabel()
-                    except Exception:
-                        ax._stored_ylabel = ""
-                ax.set_ylabel("")
+            set_primary_axis_title(
+                ax, "y", on=bool(wasd["left"]["title"]), stored_attr="_stored_ylabel"
+            )
         except Exception:
             pass
 
         try:
             eff_visible = bool(sc_eff.get_visible()) if sc_eff is not None else False
-            if bool(wasd["right"]["title"]) and eff_visible:
-                if hasattr(ax2, "_stored_ylabel") and isinstance(ax2._stored_ylabel, str) and ax2._stored_ylabel:
-                    ax2.set_ylabel(ax2._stored_ylabel)
-            else:
-                if not hasattr(ax2, "_stored_ylabel"):
-                    try:
-                        ax2._stored_ylabel = ax2.get_ylabel()
-                    except Exception:
-                        ax2._stored_ylabel = ""
-                ax2.set_ylabel("")
+            set_primary_axis_title(
+                ax2,
+                "y",
+                on=bool(wasd["right"]["title"]) and eff_visible,
+                stored_attr="_stored_ylabel",
+            )
         except Exception:
             pass
 
@@ -612,6 +615,20 @@ def run_cpc_batch_spine_menu(
         )
         draw_all()
 
+    def _title_offsets() -> None:
+        from ..common.title_offsets import run_title_offset_nudge_menu
+
+        # Right efficiency title lives on twin ``ax2``, not the left axes.
+        run_title_offset_nudge_menu(
+            fig=fig,
+            ax=ax,
+            push_state=lambda: None,
+            safe_input=safe_input,
+            colorize_prompt=colorize_prompt,
+            draw=_draw_spine_menu,
+            axis_by_side={"d": ax2},
+        )
+
     def _edit() -> None:
         run_spine_tick_menu(
             fig=fig,
@@ -628,6 +645,7 @@ def run_cpc_batch_spine_menu(
             axis_map={"x": ax.xaxis, "y": ax.yaxis, "r": ax2.yaxis},
             direction_axes=[ax, ax2],
             length_axes=[ax, ax2],
+            title_offset_handler=_title_offsets,
             on_quit=lambda: setattr(ax, "_saved_tick_state", dict(tick_state)),
         )