batplot 1.8.47__tar.gz → 1.8.50__tar.gz

{batplot-1.8.47 → batplot-1.8.50}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.8.47
+Version: 1.8.50
 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
@@ -64,6 +64,7 @@ With a single line of command to easily plot publication-ready plots with custom
 - **Electrochemistry Plot**: Galvanostatic cycling (GC), cyclic voltammetry (CV), differential capacity (dQdV), capacity per cycle (CPC) with multi-file support
 - **1D XY plot**: Designed for XRD, PDF, XAS (XANES/EXAFS) but also support other types
 - **Operando Contour plot**: Correlate in-situ characterizations (XRD/PDF/XAS) with electrochemical data
+- **XRD axis units**: Interactive Options `u` converts 2θ ↔ Q ↔ d (XY and operando); CIF phase ticks follow the current domain
 - **Histogram mode**: Column histograms from tabular `.csv`/`.txt` data (e.g. particle-size lists)
 - **Interactive plotting**: Real-time editing customized for each type of plottings
 - **Session Persistence**: Save and reload complete plot states with `.pkl` files
@@ -94,11 +95,12 @@ In batplot, --xaxis is frequently used to indicate the data type.
 
 ```bash
 
-# Specify X-axis type (Q, 2theta, r, k, energy, time or any user defined names)
+# Specify X-axis type (Q, 2theta, d, r, k, energy, time or any user defined names)
 # By defauly, batplot will skip the header lines, plot the first and second columns as x and y
 # Q and q are equivalent (case-insensitive)
 batplot pattern.xye --xaxis 2theta --i
 batplot data.qye --xaxis q --i
+batplot data.xye --xaxis d --wl 1.54 --i
 batplot data.txt --xaxis whatever --i
 
 # Set X-axis range
@@ -191,6 +193,27 @@ batplot file1.xy file2.xy --stack --i
 batplot allfiles --xaxis 2theta --xrange 15 75 --i
 ```
 
+**XRD Options `u` (axis units):** On diffraction plots only, press `u` to convert the x-axis among **2θ ↔ Q ↔ d**. Conversions that involve 2θ need a wavelength (`--wl`, `file:wl`, or a prompt). Data, axis labels/limits, and CIF ticks stay in sync. Not available for PDF/XAS or other non-XRD axes.
+
+```bash
+# Launch in 2θ, then use Options u → q (or d) inside the menu
+batplot data.xye:0.709 --xaxis 2theta --i
+batplot data.xye --xaxis 2theta --wl 1.5406 --i
+```
+
+### CIF phase ticks
+
+Add one or more `.cif` files to overlay Bragg reflection markers. Peaks are stored in Q and drawn in the current axis domain (2θ / Q / d). Use `cif` in the interactive menu to add, rename, or hide sets; after Options `u`, ticks redraw in the new units.
+
+```bash
+# Q plot + CIF ticks
+batplot scan.xye:1.54 phase.cif --i
+
+# 2θ plot: give λ for data and/or CIF (file.cif:wl)
+batplot scan.xye phase.cif:0.709 --xaxis 2theta --wl 0.709 --i
+batplot scan.xye:1.54 phase.cif --stack --i
+```
+
 ### Session save without interactive menu (`--save`)
 
 ```bash
@@ -306,6 +329,12 @@ batplot --operando --1d --i
 batplot folder phase.cif:1.54 --operando --i
 ```
 
+**XRD Options `u`:** In the operando interactive menu, press `u` to convert the contour x-axis among **2θ ↔ Q ↔ d** (XRD only; needs λ for 2θ). CIF ticks follow the new domain. Prefer an explicit `--xaxis` when combining with `--wl` (e.g. `--xaxis 2theta --wl 0.709` keeps degrees; `--wl` alone still defaults to Q).
+
+```bash
+batplot folder phase.cif --operando --xaxis 2theta --wl 0.709 --i
+```
+
 Operando column selection:
 - `--readcolc <x> <y>`: columns for the contour plot (from .xy/.xye/.qye/.dat files)
 - `--readcols <x> <y>`: columns for the side panel (from .mpt file)

{batplot-1.8.47 → batplot-1.8.50}/README.md

@@ -10,6 +10,7 @@ With a single line of command to easily plot publication-ready plots with custom
 - **Electrochemistry Plot**: Galvanostatic cycling (GC), cyclic voltammetry (CV), differential capacity (dQdV), capacity per cycle (CPC) with multi-file support
 - **1D XY plot**: Designed for XRD, PDF, XAS (XANES/EXAFS) but also support other types
 - **Operando Contour plot**: Correlate in-situ characterizations (XRD/PDF/XAS) with electrochemical data
+- **XRD axis units**: Interactive Options `u` converts 2θ ↔ Q ↔ d (XY and operando); CIF phase ticks follow the current domain
 - **Histogram mode**: Column histograms from tabular `.csv`/`.txt` data (e.g. particle-size lists)
 - **Interactive plotting**: Real-time editing customized for each type of plottings
 - **Session Persistence**: Save and reload complete plot states with `.pkl` files
@@ -40,11 +41,12 @@ In batplot, --xaxis is frequently used to indicate the data type.
 
 ```bash
 
-# Specify X-axis type (Q, 2theta, r, k, energy, time or any user defined names)
+# Specify X-axis type (Q, 2theta, d, r, k, energy, time or any user defined names)
 # By defauly, batplot will skip the header lines, plot the first and second columns as x and y
 # Q and q are equivalent (case-insensitive)
 batplot pattern.xye --xaxis 2theta --i
 batplot data.qye --xaxis q --i
+batplot data.xye --xaxis d --wl 1.54 --i
 batplot data.txt --xaxis whatever --i
 
 # Set X-axis range
@@ -137,6 +139,27 @@ batplot file1.xy file2.xy --stack --i
 batplot allfiles --xaxis 2theta --xrange 15 75 --i
 ```
 
+**XRD Options `u` (axis units):** On diffraction plots only, press `u` to convert the x-axis among **2θ ↔ Q ↔ d**. Conversions that involve 2θ need a wavelength (`--wl`, `file:wl`, or a prompt). Data, axis labels/limits, and CIF ticks stay in sync. Not available for PDF/XAS or other non-XRD axes.
+
+```bash
+# Launch in 2θ, then use Options u → q (or d) inside the menu
+batplot data.xye:0.709 --xaxis 2theta --i
+batplot data.xye --xaxis 2theta --wl 1.5406 --i
+```
+
+### CIF phase ticks
+
+Add one or more `.cif` files to overlay Bragg reflection markers. Peaks are stored in Q and drawn in the current axis domain (2θ / Q / d). Use `cif` in the interactive menu to add, rename, or hide sets; after Options `u`, ticks redraw in the new units.
+
+```bash
+# Q plot + CIF ticks
+batplot scan.xye:1.54 phase.cif --i
+
+# 2θ plot: give λ for data and/or CIF (file.cif:wl)
+batplot scan.xye phase.cif:0.709 --xaxis 2theta --wl 0.709 --i
+batplot scan.xye:1.54 phase.cif --stack --i
+```
+
 ### Session save without interactive menu (`--save`)
 
 ```bash
@@ -252,6 +275,12 @@ batplot --operando --1d --i
 batplot folder phase.cif:1.54 --operando --i
 ```
 
+**XRD Options `u`:** In the operando interactive menu, press `u` to convert the contour x-axis among **2θ ↔ Q ↔ d** (XRD only; needs λ for 2θ). CIF ticks follow the new domain. Prefer an explicit `--xaxis` when combining with `--wl` (e.g. `--xaxis 2theta --wl 0.709` keeps degrees; `--wl` alone still defaults to Q).
+
+```bash
+batplot folder phase.cif --operando --xaxis 2theta --wl 0.709 --i
+```
+
 Operando column selection:
 - `--readcolc <x> <y>`: columns for the contour plot (from .xy/.xye/.qye/.dat files)
 - `--readcols <x> <y>`: columns for the side panel (from .mpt file)

{batplot-1.8.47 → batplot-1.8.50}/batplot/__init__.py

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

{batplot-1.8.47 → batplot-1.8.50}/batplot/args.py

@@ -172,6 +172,8 @@ 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"
+        "  • 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"
         "  • Save session: --save (choose folder + name; default stem for single file / --all batch)\n"
@@ -204,10 +206,21 @@ def _print_xy_help() -> None:
     msg = (
         "XY plots (XRD/PDF/XAS and many more)\n\n"
         "Supported files: .xye .xy .qye .dat .csv .gr .nor .chik .chir .txt .brml .raw .xrdml .rasx and other formats. CIF overlays supported.\n\n"
-        "Axis detection: .qye→Q, .gr→r, .nor→energy, .chik→k, .chir→r, else use --xaxis (Q, 2theta, r, k, energy, time or user defined).\n"
+        "Axis detection: .qye→Q, .gr→r, .nor→energy, .chik→k, .chir→r, else use --xaxis (Q, 2theta, d, r, k, energy, time or user defined).\n"
         "If mixing 2θ data in Q, give wavelength per-file (file.xye:1.5406) or global flag --wl.\n"
         "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"
+        "  Conversions involving 2θ need λ (--wl, file:wl, or prompt). CIF ticks stay Bragg-aligned.\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"
+        "  Add .cif files on the command line (optional :wl for 2θ). Peaks are stored in Q and\n"
+        "  drawn in the current domain (2θ / Q / d). In --i use cif to add/reorder/hide ticks;\n"
+        "  after Options u, ticks redraw in the new units. Example:\n"
+        "    batplot scan.xye:1.54 phase.cif --i\n"
+        "    batplot scan.xye phase.cif:0.709 --xaxis 2theta --wl 0.709 --i\n\n"
         "Examples:\n"
         "  batplot file.xy file2.xye --xaxis 2theta --i         # Plot XRD data in 2theta space\n"
         "  batplot file1.xye:1.5406 file2.txt:0.709 --i         # Plot XRD data in different wavelengths in q space\n"
@@ -225,6 +238,7 @@ def _print_xy_help() -> None:
         "Tips and options:\n"
         "[XY plot]\n"
         "  --i            : open interactive menu for styling, ranges, fonts, export, sessions\n"
+        "                   (XRD: Options u = convert axis 2θ ↔ Q ↔ d; cif = phase tick overlay)\n"
         "  --delta <float>           : spacing between curves, e.g. --delta 0.1\n"
         "  --norm                    : normalize intensity to 0-1 range. Stack mode (--stack) auto-normalizes\n"
         "  --chik                    : EXAFS χ(k) plot (sets labels to k (Å⁻¹) vs χ(k))\n"
@@ -236,8 +250,8 @@ def _print_xy_help() -> None:
         "  --xrange <min> <max>      : set x-axis range, e.g. --xrange 0 10\n"
         "  --out <filename>          : save figure to file, e.g. --out file.svg\n"
         "  --save                    : save .pkl session (prompt folder + name; no --i menu)\n"
-        "  --xaxis <type>            : set x-axis type (Q, 2theta, r, k, energy, rft, time, or user defined)\n"
-        "                              Q and q are equivalent (case-insensitive). e.g. --xaxis 2theta, --xaxis Q, --xaxis time\n"
+        "  --xaxis <type>            : set x-axis type (Q, 2theta, d, r, k, energy, rft, time, or user defined)\n"
+        "                              Q and q are equivalent (case-insensitive). e.g. --xaxis 2theta, --xaxis Q, --xaxis d\n"
         "  --ro                      : swap x and y axes (exchange x and y values before plotting)\n"
         "                              e.g. --xaxis time --ro plots time as y-axis and potential as x-axis\n"
         "  --wl <float>              : set wavelength for Q conversion for all files, e.g. --wl 1.5406\n"
@@ -426,6 +440,9 @@ def _print_op_help() -> None:
         "Interactive (--i): menu has (Styles), (Operando), (Side Panel), (Options) columns.\n"
         "Resize axes/canvas, change colormap, set intensity range (oz), side-panel options,\n"
         "geometry tweaks, toggle spines/ticks/labels, print/export/import style, save session.\n"
+        "XRD only — Options u: convert contour X among 2θ ↔ Q ↔ d (needs λ for 2θ; CIF ticks follow).\n"
+        "CIF: add .cif on the command line or via the CIF submenu; ticks stay Bragg-aligned after u.\n"
+        "  Example: batplot folder phase.cif --operando --xaxis 2theta --wl 0.709 --i\n"
         "Session save without menu: --save (combined operando plot — session name required).\n"
     )
     _print_help(msg)

{batplot-1.8.47 → batplot-1.8.50}/batplot/batch.py

@@ -255,6 +255,7 @@ def batch_process(directory: str, args):
             # We detect the format from the file extension and use the
             # appropriate reader function.
             # ============================================================
+            file_wl = getattr(args, "wl", None)
             
             if ext == '.gr':
                 x, y = read_gr_file(fpath); e = None
@@ -281,8 +282,9 @@ def batch_process(directory: str, args):
             elif ext in ('.brml', '.xrdml', '.rasx') or (ext == '.raw' and is_bruker_raw(fpath)):
                 x, y, e, wl_from_file = read_xrd_vendor_file(fpath)
                 axis_mode = '2theta'
-                if args.wl is None and wl_from_file is not None:
-                    args.wl = wl_from_file
+                if file_wl is None and wl_from_file is not None:
+                    # Per-file wavelength only — do not mutate shared args.wl
+                    file_wl = wl_from_file
             elif ext == '.raw':
                 # .raw from non-Bruker instrument: load as generic text
                 data = robust_loadtxt_skipheader(fpath)
@@ -374,12 +376,12 @@ def batch_process(directory: str, args):
 
             # Convert to Q if needed
             if axis_mode == 'Q' and ext not in ('.qye', '.gr', '.nor'):
-                if args.wl is None:
+                if file_wl is None:
                     axis_mode = '2theta'
                     x_plot = x
                 else:
                     theta_rad = np.radians(x/2)
-                    x_plot = 4*np.pi*np.sin(theta_rad)/args.wl
+                    x_plot = 4*np.pi*np.sin(theta_rad)/file_wl
             else:
                 x_plot = x
 

{batplot-1.8.47 → batplot-1.8.50}/batplot/batplot.py

@@ -414,6 +414,8 @@ def batplot_main() -> int:  # type: ignore
         getattr(args, 'histo', False),  # Histogram mode
         getattr(args, 'all', None) is not None,  # Batch mode flag
         getattr(args, 'convert', None) is not None,  # Conversion mode
+        getattr(args, 'canvas', False),  # Canvas combine mode
+        getattr(args, 'extract_brml_scans', None) is not None,  # BRML scan extract
     ])
     
     # If no files AND no special flags, nothing to do
@@ -422,12 +424,37 @@ def batplot_main() -> int:  # type: ignore
         print("Use 'batplot --v' for version and release info, 'batplot --h' for CLI help, or 'batplot --m' to open the user manual.")
         return 0  # Exit successfully (not an error, just nothing to do)
 
+    # --extract-brml-scans: extract each XRD scan from .brml to .xy files, then exit
+    if getattr(args, "extract_brml_scans", None) is not None:
+        from .readers_xrd import extract_bruker_brml_scans
+
+        brml_files = [f for f in (args.files or []) if str(f).lower().endswith(".brml")]
+        if not brml_files:
+            print("batplot --extract-brml-scans: provide at least one .brml file.")
+            return 1
+        out_opt = getattr(args, "extract_brml_scans", "")
+        status = 0
+        for brml in brml_files:
+            try:
+                stem = os.path.splitext(os.path.basename(brml))[0]
+                out_dir = out_opt if out_opt else f"{stem}_scans"
+                if not os.path.isabs(out_dir):
+                    out_dir = os.path.join(os.path.dirname(os.path.abspath(brml)) or ".", out_dir)
+                scans = extract_bruker_brml_scans(brml, out_dir=out_dir)
+                print(f"Extracted {len(scans)} scan(s) from {brml} → {out_dir}")
+            except Exception as exc:
+                print(f"Error extracting {brml}: {exc}")
+                status = 1
+        return status
+
     from ._mpl_backend import ensure_gui_backend
 
     ensure_gui_backend(args)
 
-    # Histogram mode (tabular CSV/TXT)
-    if getattr(args, 'histo', False):
+    # Histogram mode (tabular CSV/TXT) — after convert so --histo --convert still converts
+    # (convert is handled below after allfiles expansion when both flags appear).
+    # Prefer convert when both are set.
+    if getattr(args, 'histo', False) and getattr(args, 'convert', None) is None:
         from .plot_modes.histo.routing import handle_histo_mode
         return handle_histo_mode(args)
 
@@ -550,20 +577,32 @@ def batplot_main() -> int:  # type: ignore
     if len(args.files) == 1:
         sole = args.files[0]
         if sole.lower() == 'all':
-            batch_process(os.getcwd(), args)
-            exit()
+            if getattr(args, "interactive", False):
+                _prepare_allfiles_directory(os.getcwd(), args, use_relative_paths=True)
+                # Continue to interactive multi-file plotting
+            else:
+                batch_process(os.getcwd(), args)
+                raise SystemExit(0)
         elif sole.lower() == 'allfiles':
             _prepare_allfiles_directory(os.getcwd(), args, use_relative_paths=True)
             # Continue to normal plotting mode with all files
         elif os.path.isdir(sole):
-            batch_process(os.path.abspath(sole), args)
-            exit()
+            if getattr(args, "interactive", False):
+                _prepare_allfiles_directory(os.path.abspath(sole), args, use_relative_paths=False)
+                # Continue to interactive multi-file plotting of directory contents
+            else:
+                batch_process(os.path.abspath(sole), args)
+                raise SystemExit(0)
 
     # --- XY Batch Mode: check for --all flag for XY files ---
     # Handle --all flag for XY batch processing (consistent with EC batch mode)
     if not ec_mode_active and getattr(args, 'all', None) is not None:
-        batch_process(os.getcwd(), args)
-        exit()
+        if getattr(args, "interactive", False):
+            # --all --i: expand cwd files into interactive session instead of SVG batch
+            _prepare_allfiles_directory(os.getcwd(), args, use_relative_paths=True)
+        else:
+            batch_process(os.getcwd(), args)
+            raise SystemExit(0)
 
     # ---------------- Canvas mode: combine multiple .pkl sessions ----------------
     canvas_status = _run_canvas_route(args)

{batplot-1.8.47 → batplot-1.8.50}/batplot/canvas_interactive.py

@@ -103,10 +103,16 @@ def _load_panel_session(path: str) -> Optional[Tuple[str, Any, Dict[str, Any]]]:
                 return None
             fig, ax, menu_kwargs = res
             return ('xy', (fig, ax, menu_kwargs), {'menu_kwargs': menu_kwargs})
+        if kind == 'histo':
+            from .plot_modes.histo.session import load_histo_session
+            res = load_histo_session(path)
+            if not res:
+                return None
+            return ('histo', res, {})
     except Exception as e:
         print(f"  Error loading {path}: {e}")
         return None
-    print(f"  {path}: unknown session format (supported: XY/1D, EC/GC/CV/dQdV, CPC/EPC, operando)")
+    print(f"  {path}: unknown session format (supported: XY/1D, EC/GC/CV/dQdV, CPC/EPC, operando, histo)")
     return None
 
 
@@ -158,7 +164,11 @@ def _default_positions_from_sizes(
 
 def _print_canvas_menu(panels: List[Tuple[str, str]]):
     """Print canvas menu with panel numbers and filenames."""
-    print("\n\033[1mCanvas Interactive Menu:\033[0m")
+    from batplot.plot_modes.common.menu_rendering import menu_block_begin, menu_block_end
+
+    print()
+    menu_block_begin(force_new=True)
+    print("\033[1mCanvas Interactive Menu:\033[0m")
     for i, (_, path) in enumerate(panels):
         name = os.path.basename(path)
         print(f"  \033[93m{i+1}\033[0m: {name}")
@@ -167,6 +177,7 @@ def _print_canvas_menu(panels: List[Tuple[str, str]]):
     print("  1-9: edit panel • p: insert image • t: add text • Backspace: delete selected annotation")
     print("  e: export • s: save (includes images/text) • q q: quit")
     print("  (Click canvas first for keys; orange box = picture or text overlay)")
+    menu_block_end()
 
 
 def _event_to_figure_coords(fig, event) -> Optional[Tuple[float, float]]:
@@ -664,6 +675,10 @@ def run_canvas_mode(pkl_paths: List[str]) -> None:
             elif kind == 'xy':
                 fig, ax, menu_kwargs = data
                 interactive_menu(fig, ax, **normalize_xy_menu_kwargs({**menu_kwargs, 'canvas_mode': True}))
+            elif kind == 'histo':
+                from .plot_modes.histo.interactive import histo_interactive_menu
+                fig, ax, state = data
+                histo_interactive_menu(fig, ax, state)
         except Exception as e:
             print(f"Panel menu failed: {e}")
         finally:

{batplot-1.8.47 → batplot-1.8.50}/batplot/color_utils.py

@@ -261,6 +261,16 @@ def _ansi_color_block_from_rgba(rgba) -> str:
         return "[??]"
 
 
+def to_display_hex(color) -> Optional[str]:
+    """Normalize any matplotlib-accepted color to lowercase ``#rrggbb`` (no alpha)."""
+    if color is None:
+        return None
+    try:
+        return str(mcolors.to_hex(mcolors.to_rgba(color), keep_alpha=False)).lower()
+    except Exception:
+        return None
+
+
 def color_block(color: Optional[str]) -> str:
     """Return a colored block (ANSI) for the supplied color string."""
     if not color:
@@ -273,17 +283,21 @@ def color_block(color: Optional[str]) -> str:
 
 
 def format_color_listing(color) -> str:
-    """Return ``<swatch> <hex>`` for menu listings (curves, saved colors, etc.)."""
+    """Return ``<swatch> <hex>`` for menu listings (curves, saved colors, etc.).
+
+    Always prefers a hex code next to the ANSI color cube so every mode shows
+    the same readable form (e.g. ``██ #1f77b4``), including named colors,
+    ``C0`` cycle colors, and RGBA tuples from matplotlib artists.
+    """
     if color is None:
         return f"{color_block(None)} --"
-    try:
-        rgba = mcolors.to_rgba(color)
-        return f"{color_block(color)} {mcolors.to_hex(rgba)}"
-    except Exception:
+    hex_code = to_display_hex(color)
+    if hex_code is None:
         text = str(color).strip()
         if not text:
             return f"{color_block(None)} --"
-        return f"{color_block(text)} {text}"
+        return f"{color_block(None)} {text}"
+    return f"{color_block(hex_code)} {hex_code}"
 
 
 def color_bar(colors: Sequence[str]) -> str:
@@ -543,21 +557,23 @@ def resolve_color_token(token: str, fig=None) -> str:
         colors = get_user_color_list(fig)
         # Check if index is valid (within bounds of color list)
         if 0 <= idx < len(colors):
-            return colors[idx]  # Return the actual color code
-    
-    # Not a reference, or invalid index - return token as-is
-    return token
+            token = colors[idx]
+
+    # Normalize named / cycle / RGBA colors to lowercase hex for consistent
+    # display and storage across modes. Unknown tokens pass through unchanged.
+    hex_code = to_display_hex(token)
+    return hex_code if hex_code is not None else token
 
 
 def print_user_colors(fig=None) -> None:
-    """Print saved colors with indices and color blocks."""
+    """Print saved colors with indices, color cubes, and hex codes."""
     colors = get_user_color_list(fig)
     if not colors:
         print("No saved user colors.")
         return
     print("Saved colors:")
     for idx, color in enumerate(colors, 1):
-        print(f"  {idx}: {color_block(color)} {color}")
+        print(f"  {idx}: {format_color_listing(color)}")
 
 
 def manage_user_colors(fig=None) -> None:
@@ -567,7 +583,7 @@ def manage_user_colors(fig=None) -> None:
         print("\n\033[1mUser color list:\033[0m")
         if colors:
             for idx, color in enumerate(colors, 1):
-                print(f"  {idx}: {color_block(color)} {color}")
+                print(f"  {idx}: {format_color_listing(color)}")
         else:
             print("  (empty)")
         print("Options: \033[96ma\033[0m=add colors  \033[96md\033[0m=delete numbers  \033[96mc\033[0m=clear  \033[96mq\033[0m=back")
@@ -588,8 +604,9 @@ def manage_user_colors(fig=None) -> None:
                 colors = get_user_color_list(fig)
                 added = 0
                 for col in new_colors:
-                    if col not in colors:
-                        colors.append(col)
+                    hex_col = to_display_hex(col) or col
+                    if hex_col not in colors and col not in colors:
+                        colors.append(hex_col)
                         added += 1
                 _save_user_colors(colors, fig)
                 print(f"Added {added} color(s).")
@@ -640,11 +657,13 @@ __all__ = [
     'color_bar',
     'color_block',
     'ensure_colormap',
+    'format_color_listing',
     'get_colormap',
     'manage_user_colors',
     'palette_preview',
     'print_user_colors',
     'remove_user_color',
+    'to_display_hex',
     'resolve_color_token',
     'get_user_color_list',
 ]

{batplot-1.8.47 → batplot-1.8.50}/batplot/data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [1.8.50] - 2026-08-02
+- Cosmetic changes of interactive interface
+- Better CIF file handling
+- Bug fixes
+
+
+## [1.8.49] - 2026-07-30
+- GC/CPC interactive overview key `o`: per-cycle capacity & CE table
+  (respects CPC invert-efficiency), capacity retention over a cycle range,
+  summary stats, and CSV/TXT export. Also available in batch EC/CPC menus.
+
+
+## [1.8.48] - 2026-07-29
+- Bug fixes on session reload
+
+
 ## [1.8.47] - 2026-07-21
 - Added Batch Interactive mode, loading multiple saved .pkl sessions
   (must be the same type, e.g All are GC) to edit basic styles and

batplot-1.8.50/batplot/data/latest_release_notes.json

@@ -0,0 +1,9 @@
+{
+  "version": "1.8.50",
+  "custom_message": "- Cosmetic changes of interactive interface",
+  "update_notes": [
+    "- Cosmetic changes of interactive interface",
+    "- Better CIF file handling",
+    "- Bug fixes"
+  ]
+}

{batplot-1.8.47 → batplot-1.8.50}/batplot/plot_modes/batch_session/batch_figure_io.py

@@ -26,17 +26,20 @@ def save_standard_panel_figure(
     """Save a panel figure with SVG transparency handling (shared by batch export)."""
     path = ensure_exact_case_filename(path)
     _, ext = os.path.splitext(path)
-    owners: list[tuple[Any, Any | None]] = [(fig, getattr(fig, "patch", None)), (ax, getattr(ax, "patch", None))]
-    for extra in extra_axes:
-        if extra is not None:
-            owners.append((extra, getattr(extra, "patch", None)))
+    # Collect only real patches so restore never sees Optional patch/owner.
+    patch_owners: list[tuple[Any, Any]] = []
+    for owner in (fig, ax, *extra_axes):
+        if owner is None:
+            continue
+        patch = getattr(owner, "patch", None)
+        if patch is None:
+            continue
+        patch_owners.append((owner, patch))
 
     if ext.lower() == ".svg":
-        saved: list[tuple[Any, Any | None, Any]] = []
+        saved: list[tuple[Any, Any, Any]] = []
         try:
-            for owner, patch in owners:
-                if patch is None:
-                    continue
+            for owner, patch in patch_owners:
                 try:
                     fc = owner.get_facecolor() if owner is fig else patch.get_facecolor()
                 except Exception:

{batplot-1.8.47 → batplot-1.8.50}/batplot/plot_modes/batch_session/batch_menu_io.py

@@ -61,7 +61,7 @@ def batch_import_style(
     *,
     path_prompt: str,
     load_style: Callable[[str], Any],
-    apply_style: Callable[[Any, Any], None],
+    apply_style: Callable[[Any, Any], bool | None],
     prepare: Callable[[list[int]], None] | None = None,
     on_applied: Callable[[list[int], str], None] | None = None,
 ) -> list[int] | None:

{batplot-1.8.47 → batplot-1.8.50}/batplot/plot_modes/batch_session/common.py

@@ -34,7 +34,7 @@ class SyncUndoStacks:
         """True when at least one panel has more than the baseline snapshot (index 0)."""
         return any(len(s) > 1 for s in self._stacks)
 
-    def undo_all(self, restore_fn: Callable[[int, Any], None]) -> bool:
+    def undo_all(self, restore_fn: Callable[[int, Any], object]) -> bool:
         if not self.can_undo():
             print("No undo history.")
             return False

{batplot-1.8.47 → batplot-1.8.50}/batplot/plot_modes/batch_session/ec_batch_helpers.py

@@ -75,9 +75,19 @@ def default_ec_tick_state() -> dict:
     }
 
 
-def ec_tick_state_from_fig(fig: Any) -> dict:
-    """Rebuild the flat EC tick_state dict from the stored WASD state."""
+def ec_tick_state_from_fig(fig: Any, ax: Any | None = None) -> dict:
+    """Rebuild the flat EC tick_state dict from the stored WASD state.
+
+    Falls back to ``ax._saved_tick_state`` when ``fig._ec_wasd_state`` is missing
+    (older sessions / loaders that only seeded the axis attribute).
+    """
     wasd = getattr(fig, "_ec_wasd_state", None)
+    if not isinstance(wasd, dict) and ax is not None:
+        saved = getattr(ax, "_saved_tick_state", None)
+        if isinstance(saved, dict) and saved:
+            out = default_ec_tick_state()
+            out.update(saved)
+            return out
     if isinstance(wasd, dict):
         top = wasd.get("top", {})
         bot = wasd.get("bottom", {})
@@ -148,6 +158,8 @@ def ensure_ec_fig_state(panel: EcPanel, file_data: list[dict], is_multi_file: bo
     try:
         fig._ec_file_data = file_data
         fig._ec_is_multi_file = is_multi_file
+        # Batch EC sessions are GC-only (kind=ec_gc)
+        fig._ec_overview_enabled = True
         if is_multi_file and not hasattr(fig, "_ec_legend_file_order"):
             fig._ec_legend_file_order = list(range(len(file_data)))
     except Exception:
@@ -304,7 +316,7 @@ def run_ec_batch_spine_menu(
     """Full WASD spine/tick editor on the reference panel, synced to all panels."""
     ax = ref.ax
     fig = ref.fig
-    tick_state = ec_tick_state_from_fig(fig)
+    tick_state = ec_tick_state_from_fig(fig, ax)
 
     def _get_spine_visible(side: str) -> bool:
         sp = ax.spines.get(side)

{batplot-1.8.47 → batplot-1.8.50}/batplot/plot_modes/batch_session/load.py

@@ -170,6 +170,9 @@ def _load_one_panel(kind: str, path: str):
             "mly": False,
             "mry": False,
         }
+        saved = getattr(ax, "_saved_tick_state", None) or getattr(fig, "_saved_tick_state", None)
+        if isinstance(saved, dict) and saved:
+            tick_state.update(saved)
         return CpcPanel(
             path=path,
             fig=fig,