batplot 1.8.53__tar.gz → 1.8.57__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.8.53
+Version: 1.8.57
 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
@@ -85,8 +85,8 @@ pip install batplot
 ## Quick Start
 
 - 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
+- Tutorial videos: https://www.youtube.com/watch?v=gnX1ytqlV4k&list=PLaJaXAfs1irk
+- Demo files: https://github.com/chem-plot/batplot/blob/main/batplot_demo_files.zip
 
 ---
 
@@ -491,7 +491,8 @@ With `--interactive`:
 
 ## Help & Documentation
 
-Illustrated user manual (GitHub Pages): https://chem-plot.github.io/batplot/
+- Illustrated user manual: https://chem-plot.github.io/batplot/
+- Tutorial videos: https://www.youtube.com/watch?v=gnX1ytqlV4k&list=PLaJaXAfs1irk
 
 ```bash
 batplot --h              # General help

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

@@ -29,8 +29,8 @@ pip install batplot
 ## Quick Start
 
 - 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
+- Tutorial videos: https://www.youtube.com/watch?v=gnX1ytqlV4k&list=PLaJaXAfs1irk
+- Demo files: https://github.com/chem-plot/batplot/blob/main/batplot_demo_files.zip
 
 ---
 
@@ -435,7 +435,8 @@ With `--interactive`:
 
 ## Help & Documentation
 
-Illustrated user manual (GitHub Pages): https://chem-plot.github.io/batplot/
+- Illustrated user manual: https://chem-plot.github.io/batplot/
+- Tutorial videos: https://www.youtube.com/watch?v=gnX1ytqlV4k&list=PLaJaXAfs1irk
 
 ```bash
 batplot --h              # General help

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

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

{batplot-1.8.53 → batplot-1.8.57}/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"
@@ -201,6 +201,7 @@ def _print_general_help() -> None:
         "  Personal page: https://www.mn.uio.no/kjemi/english/people/aca/tianda/\n"
         "  GitHub: https://github.com/chem-plot/batplot\n"
         "  User manual: https://chem-plot.github.io/batplot/\n"
+        "  Tutorial videos: https://www.youtube.com/watch?v=gnX1ytqlV4k&list=PLaJaXAfs1irk\n"
         "  Kindly cite Tian's github page if the plot is used for publication\n"
         )
     _print_help(msg)
@@ -218,8 +219,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 +775,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 +872,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.57}/batplot/data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## [1.8.56] - 2026-09-25
+- Add normalization suppor for dQdV mode
+
+
+## [1.8.57] - 2026-09-25
+- Bug fixes
+
+
+## [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.57}/batplot/data/latest_release_notes.json

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

{batplot-1.8.53 → batplot-1.8.57}/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.57}/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.57}/batplot/plot_modes/batch_session/ec_batch_helpers.py

@@ -55,6 +55,7 @@ __all__ = [
     "apply_ec_line_chrome_only",
     "apply_ec_scoped_sync",
     "apply_ec_smooth_only",
+    "apply_ec_norm_only",
     "apply_ec_spine_colors_only",
     "apply_ec_wasd_chrome_only",
     "default_ec_tick_state",
@@ -526,6 +527,39 @@ def apply_ec_smooth_only(panel: EcPanel, cfg: dict, *, silent: bool = True) -> b
     return True
 
 
+def apply_ec_norm_only(panel: EcPanel, cfg: dict, *, silent: bool = True) -> bool:
+    """Batch ``nm`` (dQdV): sync normalize settings and re-apply (not colors / WASD)."""
+    from ..electrochem.dqdv_norm import apply_dqdv_norm, reset_dqdv_norm
+
+    cfg = dict(cfg) if isinstance(cfg, dict) else {}
+    norm = cfg.get("_dqdv_norm_settings")
+    if not isinstance(norm, dict):
+        return False
+    file_data, cycle_lines, is_multi = ec_normalize_file_data(panel)
+    try:
+        if bool(norm.get("enabled")):
+            apply_dqdv_norm(
+                panel.fig,
+                file_data=file_data if is_multi else None,
+                cycle_lines=cycle_lines,
+                method=norm.get("method"),
+                visible_only=False,
+                ax=panel.ax,
+            )
+        else:
+            reset_dqdv_norm(
+                panel.fig,
+                file_data=file_data if is_multi else None,
+                cycle_lines=cycle_lines,
+                ax=panel.ax,
+            )
+    except Exception as exc:
+        if not silent:
+            print(f"dQ/dV normalize sync failed for {getattr(panel, 'path', '?')}: {exc}")
+        return False
+    return True
+
+
 def ec_panel_is_dqdv(panel: EcPanel) -> bool:
     """True when this EC panel is a dQ/dV (differential capacity) session."""
     ax = getattr(panel, "ax", None)

{batplot-1.8.53 → batplot-1.8.57}/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.57}/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.57}/batplot/plot_modes/batch_session/menu_ec.py

@@ -82,6 +82,7 @@ from .ec_batch_helpers import (
     apply_ec_legend_only,
     apply_ec_line_chrome_only,
     apply_ec_smooth_only,
+    apply_ec_norm_only,
     apply_ec_spine_colors_only,
     apply_ec_wasd_chrome_only,
     default_ec_tick_state,
@@ -103,6 +104,7 @@ from .ec_batch_helpers import (
 from ..electrochem.interactive import _apply_stored_smooth_settings
 from ..electrochem.legend_order import run_ec_legend_order_menu
 from ..electrochem.smoothing_menu import run_dqdv_smoothing_menu
+from ..electrochem.dqdv_norm import run_dqdv_norm_menu
 from .load import EcPanel
 
 
@@ -140,6 +142,8 @@ def _print_ec_batch_menu(panels: List[EcPanel]) -> None:
     ]
     if is_dqdv:
         col1.insert(2, "sm: smooth")
+        # Batch: normalize each panel (multi-file overlay or peer single-file panels).
+        col1.insert(3, "nm: normalize")
     if _ec_batch_has_multi_file(panels):
         # Match interactive: only list file visibility when multi-file
         col1.insert(-1, "v: show/hide files")
@@ -279,8 +283,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":
@@ -386,10 +393,76 @@ def run_ec_batch_menu(panels: List[EcPanel]) -> None:
                     safe_input=safe_input,
                     colorize_menu=_colorize_menu,
                     colorize_prompt=colorize_prompt,
+                    ax=ref.ax,
                 ),
             )
             continue
 
+        if cmd == "nm":
+            if not is_dqdv:
+                print("'nm' is only available in batch dQ/dV mode.")
+                continue
+            file_data, cycle_lines, is_multi_file, print_file_list = _ref_menu_context(ref)
+            # Interactive nm requires multi-file on the ref panel; for single-file
+            # batch peers, apply normalize directly then sync settings.
+            def _edit_nm() -> None:
+                if is_multi_file and file_data and len(file_data) >= 2:
+                    run_dqdv_norm_menu(
+                        fig=ref.fig,
+                        ax=ref.ax,
+                        cycle_lines=cycle_lines,
+                        file_data=file_data,
+                        current_file_idx=0,
+                        all_cycles=ec_all_cycles(cycle_lines, file_data),
+                        is_dqdv=True,
+                        is_multi_file=True,
+                        menu_title="",
+                        canvas_mode=False,
+                        print_menu=lambda *_a, **_k: None,
+                        print_file_list=print_file_list,
+                        push_state=noop_snapshot,
+                        safe_input=safe_input,
+                        colorize_menu=_colorize_menu,
+                        colorize_prompt=colorize_prompt,
+                    )
+                else:
+                    from ..electrochem.dqdv_norm import (
+                        apply_dqdv_norm,
+                        format_dqdv_norm_status,
+                        reset_dqdv_norm,
+                    )
+
+                    print("\n" + format_dqdv_norm_status(ref.fig))
+                    print("  a: normalize this panel  |  r: reset  |  q: back")
+                    sub = safe_input(colorize_prompt("Normalize (a/r/q): ")).strip().lower()
+                    if sub in ("a", "all"):
+                        apply_dqdv_norm(
+                            ref.fig,
+                            file_data=None,
+                            cycle_lines=cycle_lines,
+                            ax=ref.ax,
+                        )
+                        print("Normalized.")
+                    elif sub == "r":
+                        reset_dqdv_norm(
+                            ref.fig,
+                            file_data=None,
+                            cycle_lines=cycle_lines,
+                            ax=ref.ax,
+                        )
+                        print("Normalize reset.")
+
+            edit_ref_then_sync(
+                ref,
+                panels,
+                undo=undo,
+                capture_panel=_capture_panel,
+                apply_cfg=apply_ec_norm_only,
+                draw_all=lambda: draw_panels(panels),
+                edit_fn=_edit_nm,
+            )
+            continue
+
         if cmd == "t":
             run_ec_batch_spine_menu(
                 ref,

{batplot-1.8.53 → batplot-1.8.57}/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.57}/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":