batplot 1.8.53__tar.gz → 1.8.55__tar.gz

{batplot-1.8.53 → batplot-1.8.55}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.8.53
+Version: 1.8.55
 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
@@ -86,7 +86,7 @@ pip install batplot
 
 - User manual: https://chem-plot.github.io/batplot/
 - Tutorial: https://drive.google.com/file/d/1NTFJWNBbWW4mgz0H5ZelGjuOBWxoFgkr/view
-- Tutorial files: https://github.com/chem-plot/batplot/blob/main/batplot_tutorial.zip
+- Demo files: https://github.com/chem-plot/batplot/blob/main/batplot_demo_files.zip
 
 ---
 

{batplot-1.8.53 → batplot-1.8.55}/README.md

@@ -30,7 +30,7 @@ pip install batplot
 
 - User manual: https://chem-plot.github.io/batplot/
 - Tutorial: https://drive.google.com/file/d/1NTFJWNBbWW4mgz0H5ZelGjuOBWxoFgkr/view
-- Tutorial files: https://github.com/chem-plot/batplot/blob/main/batplot_tutorial.zip
+- Demo files: https://github.com/chem-plot/batplot/blob/main/batplot_demo_files.zip
 
 ---
 

{batplot-1.8.53 → batplot-1.8.55}/batplot/__init__.py

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

{batplot-1.8.53 → batplot-1.8.55}/batplot/args.py

@@ -173,7 +173,7 @@ def _print_general_help() -> None:
         "Features:\n"
         "  • Interactive (--i): styling, ranges, fonts, export, sessions\n"
         "  • XRD wavelength: --wl 1.54 or file.xye:1.5406 for Q conversion\n"
-        "  • XRD axis units (interactive): Options u converts 2θ ↔ Q ↔ d (XY + operando; needs λ for 2θ)\n"
+        "  • XRD axis units (interactive): Options u converts 2θ ↔ Q (XY; needs λ for 2θ); operando also offers d\n"
         "  • CIF phase ticks: add .cif (or file.cif:wl); ticks follow the current axis (2θ / Q / d)\n"
         "  • X-axis range: --xrange min max\n"
         "  • Save figure: --out filename (default .svg)\n"
@@ -218,8 +218,9 @@ def _print_xy_help() -> None:
         "A wavelength can be converted into a different wave length by file.xye:1.54:0.709.\n"
         "For electrochemistry CSV/MPT time-potential plots, use --xaxis time.\n\n"
         "Interactive XRD axis units (Options u):\n"
-        "  In --i, press u to convert the plotted XRD axis among 2θ ↔ Q ↔ d (XRD data only).\n"
+        "  In --i, press u to convert the plotted XRD axis between 2θ ↔ Q (XRD data only).\n"
         "  Conversions involving 2θ need λ (--wl, file:wl, or prompt). CIF ticks stay Bragg-aligned.\n"
+        "  d-spacing is not offered as a plot domain in 1D Options u.\n"
         "  Not for PDF (.gr), XAS (.nor/.chik/.chir), or other non-diffraction axes.\n"
         "  Example: batplot data.xye:0.709 --xaxis 2theta --i   then u → q  (uses λ=0.709 Å).\n\n"
         "CIF phase ticks:\n"
@@ -773,20 +774,66 @@ def parse_args(argv=None):
     # Keys use the exact file token (e.g. "file.xy:1.54") for wavelength match.
     # Style files (.bps, .bpsg, .bpcfg) are NOT treated as file tokens so that
     # "batplot --all style.bps --readcol 2 3" uses global readcol, not per-file.
+    #
+    # Values of known options (--wl 0.259, --xaxis q, --out out.svg, …) must
+    # NOT update last_file_token. Otherwise
+    #   batplot TD_R02.dat --wl 0.259 --readcol 1 3
+    # binds readcol to "0.259" and the plot silently falls back to cols 1,2.
     # ====================================================================
     readcol_by_file = {}
     global_readcol_expanded = None
     filtered_argv = []
     last_file_token = None
     _STYLE_EXTENSIONS = ('.bps', '.bpsg', '.bpcfg')
+    # Exact value counts for options that take fixed nargs (after short→long).
+    # store_true / flag-only options are omitted (0 values).
+    _OPTION_VALUE_COUNTS = {
+        '--wl': 1,
+        '--xaxis': 1,
+        '--out': 1,
+        '--savefig': 1,
+        '--delta': 1,
+        '--format': 1,
+        '--mass': 1,
+        '--cd': 1,
+        '--average': 1,
+        '--sum': 1,
+        '--histocol': 1,
+        '--binwidth': 1,
+        '--bins': 1,
+        '--ext': 1,
+        '--convert-ext': 1,
+        '--xrange': 2,
+        '--convert': 2,
+        '--pw': 2,
+        '--b': 2,
+        '--readcolxy': 2,
+        '--readcolxye': 2,
+        '--readcolqye': 2,
+        '--readcolnor': 2,
+        '--readcoldat': 2,
+        '--readcolcsv': 2,
+        '--readcolc': 2,
+        '--readcols': 2,
+    }
+    for _ext in custom_readcol_exts:
+        _OPTION_VALUE_COUNTS[f'--readcol{_ext}'] = 2
+    # Optional single value (nargs='?'): consume at most one non-option token.
+    _OPTIONAL_ONE_VALUE = {'--all', '--help', '--extract-brml-scans'}
+
+    def _option_value_count(flag: str) -> int:
+        if flag in _OPTION_VALUE_COUNTS:
+            return _OPTION_VALUE_COUNTS[flag]
+        if flag in _OPTIONAL_ONE_VALUE:
+            return 1
+        if flag == '--fullprof':
+            # nargs='+': consume following non-option tokens
+            return 10**9
+        return 0
+
     i = 0
     while i < len(argv):
         arg = argv[i]
-        # Track non-option tokens as potential file specs (exclude style files)
-        if not arg.startswith('-'):
-            arg_lower = arg.lower()
-            if not arg_lower.endswith(_STYLE_EXTENSIONS):
-                last_file_token = arg
         if arg == '--readcol' and i + 1 < len(argv):
             tokens = []
             j = i + 1
@@ -824,9 +871,23 @@ def parse_args(argv=None):
                     global_readcol_expanded = pairs[0] if len(pairs) == 1 else pairs
                 i = j
                 continue
+        if arg.startswith('-'):
+            filtered_argv.append(arg)
+            n_vals = _option_value_count(arg)
+            i += 1
+            taken = 0
+            while taken < n_vals and i < len(argv) and not argv[i].startswith('-'):
+                filtered_argv.append(argv[i])
+                i += 1
+                taken += 1
+            continue
+        # Non-option: potential file spec (exclude style files)
+        arg_lower = arg.lower()
+        if not arg_lower.endswith(_STYLE_EXTENSIONS):
+            last_file_token = arg
         filtered_argv.append(arg)
         i += 1
-    
+
     argv = filtered_argv
     
     # ====================================================================

{batplot-1.8.53 → batplot-1.8.55}/batplot/data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [1.8.55] - 2026-09-15
+- Bug fixes
+
+
+## [1.8.54] - 2026-09-14
+- Fix --readcol after --wl / other option values (cols no longer stuck on 1–2)
+- Quit prompt: e=export and s=save work in every interactive / batch menu
+- Color menus (c/k): WASD side rectangle like spines t, for all modes
+- User manual homepage: GitHub repo + tutorial zip links
+
+
 ## [1.8.53] - 2026-09-09
 - Bug fixes
 

{batplot-1.8.53 → batplot-1.8.55}/batplot/data/latest_release_notes.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.53",
+  "version": "1.8.55",
   "custom_message": "- Bug fixes",
   "update_notes": [
     "- Bug fixes"

{batplot-1.8.53 → batplot-1.8.55}/batplot/plot_modes/batch_session/batch_commands.py

@@ -26,20 +26,24 @@ def append_batch_io_shortcuts(options: List[str], panels: Sequence[Any]) -> None
 
 
 def batch_quit_confirm(*, allow_export: bool = True) -> str | None:
-    """Return ``y`` to quit, ``s`` to save all sessions first, or ``None`` to stay."""
-    try:
-        if allow_export:
-            prompt = "Quit batch interactive? (s=save all sessions, y/n): "
-        else:
-            prompt = "Quit batch interactive? Quit now? (y/n): "
-        confirm = safe_input(colorize_prompt(prompt), cancel_on_interrupt=True).strip().lower()
-    except (KeyboardInterrupt, EOFError):
-        return "y"
-    if confirm == "y":
-        return "y"
-    if allow_export and confirm == "s":
-        return "s"
-    return None
+    """Return ``y`` to quit, ``e``/``s`` to run export/save next, or ``None`` to stay."""
+    from ..common.terminal import confirm_quit_interactive
+
+    if not allow_export:
+        try:
+            confirm = safe_input(
+                colorize_prompt("Quit batch interactive? Quit now? (y/n): "),
+                cancel_on_interrupt=True,
+            ).strip().lower()
+        except (KeyboardInterrupt, EOFError):
+            return "y"
+        return "y" if confirm == "y" else None
+
+    return confirm_quit_interactive(
+        label="Quit batch interactive?",
+        safe_input_fn=lambda prompt: safe_input(prompt, cancel_on_interrupt=True),
+        colorize_fn=colorize_prompt,
+    )
 
 
 def run_batch_save_all(panels: Sequence[Any], save_panel: Callable[[Any, str], None]) -> None:

{batplot-1.8.53 → batplot-1.8.55}/batplot/plot_modes/batch_session/batch_menu_io.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from typing import Any, Callable, Sequence
 
-from .batch_commands import batch_quit_confirm, run_batch_overwrite_sessions, run_batch_save_all
+from .batch_commands import batch_quit_confirm, run_batch_overwrite_sessions
 from .batch_figure_io import run_batch_export_figures, run_batch_overwrite_figures
 from .batch_io import run_batch_export_style, run_batch_import_style, run_batch_save_sessions
 
@@ -12,13 +12,20 @@ from .batch_io import run_batch_export_style, run_batch_import_style, run_batch_
 def batch_quit_or_save_all(
     panels: Sequence[Any],
     save_panel: Callable[[Any, str], None],
-) -> bool:
-    """Handle ``q`` quit prompt. Returns True when the menu loop should exit."""
+) -> bool | str:
+    """Handle ``q`` quit prompt.
+
+    Returns:
+        ``True`` when the menu loop should exit,
+        ``"e"`` / ``"s"`` to dispatch export/save on the next loop iteration,
+        ``False`` to stay in the menu.
+    """
+    _ = (panels, save_panel)  # call-site signature unchanged; e/s use pending keys
     action = batch_quit_confirm(allow_export=True)
     if action == "y":
         return True
-    if action == "s":
-        run_batch_save_all(panels, save_panel)
+    if action in ("e", "s"):
+        return action
     return False
 
 

{batplot-1.8.53 → batplot-1.8.55}/batplot/plot_modes/batch_session/menu_cpc.py

@@ -385,8 +385,11 @@ def run_cpc_batch_menu(panels: List[CpcPanel]) -> None:
             continue
 
         if cmd == "q":
-            if batch_quit_or_save_all(panels, _save_cpc_panel):
+            result = batch_quit_or_save_all(panels, _save_cpc_panel)
+            if result is True:
                 break
+            if result in ("e", "s"):
+                pending = result
             continue
 
         if cmd == "b":

{batplot-1.8.53 → batplot-1.8.55}/batplot/plot_modes/batch_session/menu_dqdv_2d.py

@@ -185,8 +185,11 @@ def run_dqdv_2d_batch_menu(panels: List[OperandoPanel]) -> None:
             continue
 
         if cmd == "q":
-            if batch_quit_or_save_all(panels, save_dqdv_2d_panel):
+            result = batch_quit_or_save_all(panels, save_dqdv_2d_panel)
+            if result is True:
                 break
+            if result in ("e", "s"):
+                pending = result
             continue
 
         if cmd == "b":

{batplot-1.8.53 → batplot-1.8.55}/batplot/plot_modes/batch_session/menu_ec.py

@@ -279,8 +279,11 @@ def run_ec_batch_menu(panels: List[EcPanel]) -> None:
             continue
 
         if cmd == "q":
-            if batch_quit_or_save_all(panels, _save_ec_panel):
+            result = batch_quit_or_save_all(panels, _save_ec_panel)
+            if result is True:
                 break
+            if result in ("e", "s"):
+                pending = result
             continue
 
         if cmd == "b":

{batplot-1.8.53 → batplot-1.8.55}/batplot/plot_modes/batch_session/menu_histo.py

@@ -162,8 +162,11 @@ def run_histo_batch_menu(panels: List[HistoPanel]) -> None:
             continue
 
         if cmd == "q":
-            if batch_quit_or_save_all(panels, _save_histo_panel):
+            result = batch_quit_or_save_all(panels, _save_histo_panel)
+            if result is True:
                 break
+            if result in ("e", "s"):
+                pending = result
             continue
 
         if cmd == "b":

{batplot-1.8.53 → batplot-1.8.55}/batplot/plot_modes/batch_session/menu_operando.py

@@ -352,8 +352,11 @@ def run_operando_batch_menu(panels: List[OperandoPanel]) -> None:
             continue
 
         if cmd == "q":
-            if batch_quit_or_save_all(panels, _save_operando_panel):
+            result = batch_quit_or_save_all(panels, _save_operando_panel)
+            if result is True:
                 break
+            if result in ("e", "s"):
+                pending = result
             continue
 
         if cmd == "b":

{batplot-1.8.53 → batplot-1.8.55}/batplot/plot_modes/batch_session/menu_xy.py

@@ -17,11 +17,9 @@ from ..xy.style import apply_style_config, export_style_config
 from ...plotting import apply_curve_color, update_labels
 from ...color_utils import (
     format_color_listing,
-    get_user_color_list,
     manage_user_colors,
     prompt_screen_color,
     blank_means_back,
-    last_screen_pick_count,
     resolve_color_token,
 )
 
@@ -357,8 +355,11 @@ def run_xy_batch_menu(panels: List[XyPanel]) -> None:
             continue
 
         if cmd == "q":
-            if batch_quit_or_save_all(panels, dump_xy_panel):
+            result = batch_quit_or_save_all(panels, dump_xy_panel)
+            if result is True:
                 break
+            if result in ("e", "s"):
+                pending = result
             continue
 
         if cmd == "b":
@@ -430,20 +431,34 @@ def run_xy_batch_menu(panels: List[XyPanel]) -> None:
 
             _spine_keys = {"w": "top", "a": "left", "s": "bottom", "d": "right"}
             while True:
+                from ..common.color_menu_help import (
+                    join_cyan_samples,
+                    join_cyan_samples_spaced,
+                    print_color_action_keys,
+                    print_how_to_set_color_methods,
+                    print_saved_colors_block,
+                    print_spine_tick_keys_note,
+                )
+
                 fig_ref = getattr(ref, "fig", None)
-                user_colors = get_user_color_list(fig_ref)
-                if user_colors:
-                    print("Saved colors (refer as number or u#):")
-                    for idx, col in enumerate(user_colors, 1):
-                        print(f"  {idx}: {format_color_listing(col)}")
-                print("  " + _colorize_menu("Spine colors: w:red a:#4561F7 (syncs to all plots)"))
-                print("  " + _colorize_menu("v: show current colors"))
-                print("  " + _colorize_menu("u: edit saved colors"))
-                print("  " + _colorize_menu("e: pick color from screen"))
+                print_how_to_set_color_methods(
+                    [
+                        (
+                            "Same color for all curves (name / #hex / saved index)",
+                            join_cyan_samples_spaced("red", "#00FF00", "u3"),
+                        ),
+                        (
+                            "Spine color (w/a/s/d) — syncs to all plots",
+                            join_cyan_samples("w:red", "a:#4561F7"),
+                        ),
+                    ]
+                )
+                print_spine_tick_keys_note()
+                print("  (applies to ALL plots in this batch)")
+                print_saved_colors_block(fig_ref)
+                print_color_action_keys()
                 color = safe_input(
-                    colorize_prompt(
-                        "Curve or spine color for ALL plots (name/#hex, w:red…, v/e/u, q=back): "
-                    ),
+                    colorize_prompt("Selection: "),
                     cancel_on_interrupt=True,
                 ).strip()
                 if color.lower() == "q" or blank_means_back(color):
@@ -454,6 +469,9 @@ def run_xy_batch_menu(panels: List[XyPanel]) -> None:
                 if color.lower() == "u":
                     manage_user_colors(fig_ref)
                     continue
+                if color.lower() == "e":
+                    prompt_screen_color(fig_ref)
+                    continue
                 tokens = color.split()
                 is_spine = bool(tokens) and all(
                     ":" in t and t.split(":", 1)[0].lower() in _spine_keys for t in tokens
@@ -477,28 +495,18 @@ def run_xy_batch_menu(panels: List[XyPanel]) -> None:
                         print(f"Set {spine_name} spine to {format_color_listing(resolved)} on all plots.")
                     draw_panels(panels)
                     continue
-                if color.lower() == "e":
-                    picked = prompt_screen_color(fig_ref)
-                    if not picked:
-                        continue
-                    if last_screen_pick_count() > 1:
-                        # Palette grab — saved as u#; do not recolor all curves
-                        # with only the last pick.
-                        continue
-                    color = picked
-                else:
-                    try:
-                        color = resolve_color_token(color, fig_ref)
-                    except Exception:
-                        print(f"Invalid color: {color!r}")
-                        continue
-                    try:
-                        from matplotlib.colors import to_rgba
+                try:
+                    color = resolve_color_token(color, fig_ref)
+                except Exception:
+                    print(f"Invalid color: {color!r}")
+                    continue
+                try:
+                    from matplotlib.colors import to_rgba
 
-                        to_rgba(color)
-                    except Exception:
-                        print(f"Invalid color: {color!r}")
-                        continue
+                    to_rgba(color)
+                except Exception:
+                    print(f"Invalid color: {color!r}")
+                    continue
                 undo.push_all([_capture_panel(p) for p in panels])
                 for p in panels:
                     for ln in _iter_panel_curve_lines(p):
@@ -854,6 +862,37 @@ def run_xy_batch_menu(panels: List[XyPanel]) -> None:
             # Minimal CIF submenu: add-only (full CIF editor stays single-session).
             while True:
                 print("\nCIF (batch — add only):")
+                # Show numbered CIF sets already on panels (same indices as single-session).
+                try:
+                    any_listed = False
+                    for pi, p in enumerate(panels):
+                        kw = normalize_xy_menu_kwargs(p.menu_kwargs)
+                        cg = kw.get("cif_globals") or {}
+                        cts = list(cg.get("cif_tick_series") or [])
+                        if not cts:
+                            cts = list(getattr(p.fig, "_batplot_cif_tick_series", None) or [])
+                        if not cts:
+                            continue
+                        any_listed = True
+                        if len(panels) > 1:
+                            print(f"  Panel {pi + 1}:")
+                        for i, ent in enumerate(cts):
+                            try:
+                                lab = ent[0]
+                                fname = ent[1] if len(ent) > 1 else ""
+                            except Exception:
+                                lab, fname = f"set {i+1}", ""
+                            base = os.path.basename(str(fname)) if fname else ""
+                            prefix = "    " if len(panels) > 1 else "  "
+                            if base:
+                                print(f"{prefix}{i+1}: {lab} ({base})")
+                            else:
+                                print(f"{prefix}{i+1}: {lab}")
+                    if not any_listed:
+                        print("  (no CIF sets yet — use a to add)")
+                except Exception:
+                    pass
+                print("------------------------------------------------------------")
                 print("  " + _colorize_menu("a: add CIF file(s) to all plots"))
                 print("  " + _colorize_menu("q: back"))
                 sub = safe_input(

{batplot-1.8.53 → batplot-1.8.55}/batplot/plot_modes/batch_session/xy_batch_helpers.py

@@ -184,6 +184,10 @@ def sync_ref_wasd_to_panels(ref: XyPanel, panels: List[XyPanel]) -> None:
     tick_lengths = getattr(ref_fig, "_tick_lengths", None)
     tick_direction = getattr(ref_fig, "_tick_direction", None)
     tick_spacing = capture_axes_tick_locators(ref_ax, ("x", "y"))
+    ref_ax2 = getattr(ref_fig, "_xy_ax2", None)
+    tick_spacing_ax2 = (
+        capture_axes_tick_locators(ref_ax2, ("x", "y")) if ref_ax2 is not None else None
+    )
     ref_offsets = capture_title_offsets(ref_ax)
     try:
         ref_xpad = float(ref_ax.xaxis.labelpad)
@@ -226,7 +230,6 @@ def sync_ref_wasd_to_panels(ref: XyPanel, panels: List[XyPanel]) -> None:
             fig._tick_direction = tick_direction  # type: ignore[attr-defined]
             for target in length_targets:
                 target.tick_params(axis="both", which="both", direction=tick_direction)
-        restore_axes_tick_locators(ax, tick_spacing, ("x", "y"))
         restore_title_offsets(ax, ref_offsets)
         try:
             if ref_xpad is not None:
@@ -235,8 +238,17 @@ def sync_ref_wasd_to_panels(ref: XyPanel, panels: List[XyPanel]) -> None:
                 ax.yaxis.labelpad = ref_ypad
         except Exception:
             pass
-        # Full WASD body (spine visibility / titles / twin) — not artist-copy.
+        # WASD chrome first (may NullLocator when minors off), then restore
+        # spacing so t→n / t→m survives batch sync (session load order parity).
         _apply_xy_batch_wasd_chrome(fig, ax, wasd, tick_state)
+        restore_axes_tick_locators(ax, tick_spacing, ("x", "y"))
+        if ax2 is not None and tick_spacing_ax2:
+            restore_axes_tick_locators(ax2, tick_spacing_ax2, ("x", "y"))
+            # Re-assert twin WASD minor visibility without wiping restored locators.
+            try:
+                sync_xy_twin_wasd(ax, fig, wasd)
+            except Exception:
+                pass
 
 
 def run_xy_batch_spine_menu(