batplot 1.8.41__tar.gz → 1.8.42__tar.gz

{batplot-1.8.41/batplot.egg-info → batplot-1.8.42}/PKG-INFO

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

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

{batplot-1.8.41 → batplot-1.8.42}/batplot/color_utils.py

@@ -177,6 +177,76 @@ def ensure_colormap(name: Optional[str]) -> bool:
         return False
 
 
+def get_colormap(name: Optional[str]) -> Optional[Colormap]:
+    """Return a Colormap by name across matplotlib versions and custom maps.
+
+    Prefer this over ``matplotlib.cm.get_cmap`` — that API was removed in
+    matplotlib 3.11, which broke palette commands such as ``all viridis`` on
+    Windows installs with newer matplotlib.
+    """
+    if not name:
+        return None
+
+    ensure_colormap(name)
+
+    candidates: List[str] = []
+    for candidate in (name, name.lower()):
+        if candidate and candidate not in candidates:
+            candidates.append(candidate)
+
+    try:
+        from matplotlib import colormaps as mpl_colormaps
+
+        registry_get = getattr(mpl_colormaps, "get_cmap", None)
+        if callable(registry_get):
+            for candidate in candidates:
+                try:
+                    return registry_get(candidate)
+                except Exception:
+                    pass
+        for candidate in candidates:
+            try:
+                return mpl_colormaps[candidate]
+            except Exception:
+                pass
+    except Exception:
+        pass
+
+    for candidate in candidates:
+        try:
+            return plt.get_cmap(candidate)
+        except Exception:
+            pass
+
+    reversed_flag = name.lower().endswith("_r")
+    base = name[:-2] if reversed_flag else name
+    base_lower = base.lower()
+
+    custom = _CUSTOM_CMAPS.get(base_lower)
+    if custom:
+        try:
+            cmap_obj = LinearSegmentedColormap.from_list(base_lower, custom, N=256)
+            if reversed_flag:
+                cmap_obj = cmap_obj.reversed()
+            return cmap_obj
+        except Exception:
+            pass
+
+    if base_lower.startswith("batlow"):
+        try:
+            import cmcrameri.cm as cmc  # type: ignore[import]
+
+            cmap_obj = getattr(cmc, base_lower, None) or getattr(cmc, "batlow", None)
+            if cmap_obj is not None:
+                if reversed_flag and hasattr(cmap_obj, "reversed"):
+                    return cmap_obj.reversed()
+                return cmap_obj
+        except Exception:
+            pass
+
+    return None
+
+
 def _ansi_color_block_from_rgba(rgba) -> str:
     """Return a two-space block with the given RGBA color."""
     try:
@@ -570,6 +640,8 @@ __all__ = [
     'clear_user_colors',
     'color_bar',
     'color_block',
+    'ensure_colormap',
+    'get_colormap',
     'manage_user_colors',
     'palette_preview',
     'print_user_colors',

{batplot-1.8.41 → batplot-1.8.42}/batplot/data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.8.42] - 2026-06-12
+- Bug fixes
+
+
 ## [1.8.41] - 2026-06-12
 - Bug fixes
 - Complete update of the codebase

{batplot-1.8.41 → batplot-1.8.42}/batplot/ec_common.py

@@ -20,7 +20,8 @@ except ImportError:
 
 _EC_DEFAULT_FIGSIZE = (10.0, 6.0)
 _EC_DEFAULT_LAYOUT = {'left': 0.12, 'right': 0.95, 'top': 0.88, 'bottom': 0.15}
-_CPC_DEFAULT_LAYOUT = {'left': 0.12, 'right': 0.88, 'top': 0.88, 'bottom': 0.15}
+# CPC shares the same canvas and plot-frame defaults as GC/CV/dQ/dV.
+_CPC_DEFAULT_LAYOUT = _EC_DEFAULT_LAYOUT
 _EC_DEFAULT_FRAME_SIZE = (
     _EC_DEFAULT_FIGSIZE[0] * (_EC_DEFAULT_LAYOUT['right'] - _EC_DEFAULT_LAYOUT['left']),
     _EC_DEFAULT_FIGSIZE[1] * (_EC_DEFAULT_LAYOUT['top'] - _EC_DEFAULT_LAYOUT['bottom']),
@@ -39,12 +40,14 @@ def _default_ec_figsize() -> tuple[float, float]:
 
 
 def _default_cpc_figsize() -> tuple[float, float]:
-    return _figsize_for_frame(_CPC_DEFAULT_LAYOUT)
+    """Alias for :func:`_default_ec_figsize` (GC/CV/dQ/dV/CPC share one default)."""
+    return _default_ec_figsize()
 
 
 def _apply_default_ec_layout(fig, *, cpc: bool = False) -> None:
-    """Apply the default layout while keeping the plotted frame size identical."""
-    fig.subplots_adjust(**(_CPC_DEFAULT_LAYOUT if cpc else _EC_DEFAULT_LAYOUT))
+    """Apply the default electrochem layout (same for GC, CV, dQ/dV, and CPC)."""
+    del cpc  # kept for backward compatibility; CPC uses the same layout as other EC modes
+    fig.subplots_adjust(**_EC_DEFAULT_LAYOUT)
 
 
 def _resolve_mass(mass_arg, file_idx: int = 0):

{batplot-1.8.41 → batplot-1.8.42}/batplot/plot_modes/cpc/routing.py

@@ -23,7 +23,7 @@ import matplotlib.colors as mcolors  # type: ignore[import-untyped]
 
 from ...ec_common import (
     _resolve_mass,
-    _default_cpc_figsize,
+    _default_ec_figsize,
     _apply_default_ec_layout,
 )
 from ...batch import _apply_ec_style
@@ -340,8 +340,8 @@ def handle_cpc_mode(args) -> int:
         print("No valid CPC data files to plot.")
         exit(1)
 
-    # Plot (same figsize as GC)
-    fig, ax = plt.subplots(figsize=_default_cpc_figsize())
+    # Plot (same canvas and frame size as GC/CV/dQ/dV)
+    fig, ax = plt.subplots(figsize=_default_ec_figsize())
     ax.set_xlabel('Cycle number', labelpad=8.0)
     if is_epc:
         ax.set_ylabel(r'Specific Energy (mWh g$^{-1}$)', labelpad=8.0)
@@ -439,7 +439,7 @@ def handle_cpc_mode(args) -> int:
         print(f"Warning: Could not create CPC legend: {e}")
 
     # Adjust layout to ensure top and bottom labels/titles are visible
-    _apply_default_ec_layout(fig, cpc=True)
+    _apply_default_ec_layout(fig)
     
     # Check for style file in file list
     style_file_path = None

{batplot-1.8.41 → batplot-1.8.42}/batplot/plot_modes/electrochem/actions.py

@@ -540,6 +540,16 @@ def handle_import_style_command(ctx: ElectrochemActionContext) -> None:  # pyrig
                         plt.rcParams['mathtext.fontset'] = font_cfg['mathtext_fontset']
                     except Exception:
                         pass
+                axis_label_colors = cfg.get('axis_label_colors') or {}
+                try:
+                    if axis_label_colors.get('x'):
+                        ax.xaxis.label.set_color(axis_label_colors['x'])
+                        ax._stored_xlabel_color = axis_label_colors['x']
+                    if axis_label_colors.get('y'):
+                        ax.yaxis.label.set_color(axis_label_colors['y'])
+                        ax._stored_ylabel_color = axis_label_colors['y']
+                except Exception:
+                    pass
             except Exception as e:
                 print(f"Warning: Could not apply figure/font settings: {e}")
 

{batplot-1.8.41 → batplot-1.8.42}/batplot/plot_modes/electrochem/dqdv_2d.py

@@ -10,6 +10,7 @@ from matplotlib.ticker import FuncFormatter, NullFormatter  # type: ignore[impor
 
 from ...ui import capture_axes_tick_locators, restore_axes_tick_locators
 from ...utils import natural_sort_key
+from ...ec_common import _default_ec_figsize
 
 
 def _dqdv_2d_row_tick_indices(n_rows: int, max_ticks: int = 24) -> np.ndarray:
@@ -536,11 +537,13 @@ def restore_dqdv_2d_companion_figure(blob: Dict[str, Any]) -> Optional[Tuple[Any
     row_labels = [str(x) for x in (blob.get("row_labels") or [])]
     zlab = str(blob.get("zlabel") or "dQ/dV")
     cmap = str(blob.get("cmap") or "viridis")
-    figsize = blob.get("figsize") or [8.0, 6.0]
+    figsize = blob.get("figsize")
+    if not figsize:
+        figsize = list(_default_ec_figsize())
     try:
         cfig, cax = plt.subplots(figsize=(float(figsize[0]), float(figsize[1])))
     except Exception:
-        cfig, cax = plt.subplots(figsize=(8, 6))
+        cfig, cax = plt.subplots(figsize=_default_ec_figsize())
     Zm = np.ma.masked_invalid(Z)
     extent = (0.0, float(2 * dv), -0.5, float(Zm.shape[0] - 0.5))
     im = cax.imshow(

{batplot-1.8.41 → batplot-1.8.42}/batplot/plot_modes/electrochem/interactive.py

@@ -32,6 +32,7 @@ from matplotlib.ticker import (  # type: ignore[import-untyped]
     AutoLocator,
 )
 from ...plotting import update_labels as _update_labels
+from ...ec_common import _default_ec_figsize
 import matplotlib as mpl  # type: ignore[import-untyped]
 from ...color_utils import (
     color_block,
@@ -981,6 +982,11 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Optional[Dict[int, Dict[s
                 'font_size': plt.rcParams.get('font.size'),
                 'font_family': plt.rcParams.get('font.family'),
                 'font_sans_serif': list(plt.rcParams.get('font.sans-serif', [])),
+                'mathtext_fontset': plt.rcParams.get('mathtext.fontset'),
+                'axis_label_colors': {
+                    'x': getattr(ax, '_stored_xlabel_color', None) or ax.xaxis.label.get_color(),
+                    'y': getattr(ax, '_stored_ylabel_color', None) or ax.yaxis.label.get_color(),
+                },
                 'titles': {
                     'top_x': bool(getattr(ax, '_top_xlabel_on', False)),
                     'right_y': bool(getattr(ax, '_right_ylabel_on', False))
@@ -1210,6 +1216,22 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Optional[Dict[int, Dict[s
                     _rebuild_legend(ax)
             except Exception:
                 pass
+            try:
+                mathtext_fontset = snap.get('mathtext_fontset')
+                if mathtext_fontset:
+                    mpl.rcParams['mathtext.fontset'] = mathtext_fontset
+            except Exception:
+                pass
+            try:
+                axis_label_colors = snap.get('axis_label_colors') or {}
+                if axis_label_colors.get('x') is not None:
+                    ax.xaxis.label.set_color(axis_label_colors['x'])
+                    ax._stored_xlabel_color = axis_label_colors['x']
+                if axis_label_colors.get('y') is not None:
+                    ax.yaxis.label.set_color(axis_label_colors['y'])
+                    ax._stored_ylabel_color = axis_label_colors['y']
+            except Exception:
+                pass
             # Title offsets - all four titles
             try:
                 offsets = snap.get('title_offsets', {})
@@ -1998,7 +2020,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Optional[Dict[int, Dict[s
             im = None
             dv = float(v_hi - v_lo)
             try:
-                cfig, cax = plt.subplots(figsize=(8, 6))
+                cfig, cax = plt.subplots(figsize=_default_ec_figsize())
                 Zm = np.ma.masked_invalid(Z)
                 extent = (0.0, float(2 * dv), -0.5, float(Zm.shape[0] - 0.5))
                 im = cax.imshow(

{batplot-1.8.41 → batplot-1.8.42}/batplot/plot_modes/electrochem/style.py

@@ -321,6 +321,10 @@ def _get_style_snapshot(fig, ax, cycle_lines: Dict, tick_state: Dict, file_data:
             'size': font_size,
             'mathtext_fontset': plt.rcParams.get('mathtext.fontset'),
         },
+        'axis_label_colors': {
+            'x': mcolors.to_hex(getattr(ax, '_stored_xlabel_color', None) or ax.xaxis.label.get_color()),
+            'y': mcolors.to_hex(getattr(ax, '_stored_ylabel_color', None) or ax.yaxis.label.get_color()),
+        },
         'legend': {
             'visible': legend_visible,
             'position_inches': legend_xy_in,

{batplot-1.8.41 → batplot-1.8.42}/batplot/plot_modes/operando/actions.py

@@ -855,6 +855,12 @@ def handle_import_style(ctx: OperandoActionContext) -> None:  # pyright: ignore[
         font = cfg.get('font', {})
         fam = font.get('family')
         size = font.get('size')
+        mathtext_fs = font.get('mathtext_fontset')
+        if mathtext_fs:
+            try:
+                plt.rcParams['mathtext.fontset'] = mathtext_fs
+            except Exception:
+                pass
         if fam or size is not None:
             try:
                 set_fonts(family=fam if fam else None, size=size if size is not None else None)

{batplot-1.8.41 → batplot-1.8.42}/batplot/plot_modes/operando/style.py

@@ -367,7 +367,7 @@ def build_operando_ec_style_config_v2(fig, ax, im, cbar, ec_ax, exp_choice: str)
             "title_offsets": op_title_offsets,
         },
         "ec": ec_payload,
-        "font": {"family": fam, "size": fsize},
+        "font": {"family": fam, "size": fsize, "mathtext_fontset": plt.rcParams.get("mathtext.fontset")},
         "colorbar": {"label": cb_label_text, "mode": cb_label_mode, "visible": cb_vis},
     }
     default_ext = ".bps" if exp_choice == "ps" else ".bpsg"

{batplot-1.8.41 → batplot-1.8.42}/batplot/plot_modes/xy/cif.py

@@ -24,6 +24,7 @@ from ...utils import (
 from ...color_utils import (
     color_block,
     ensure_colormap,
+    get_colormap,
     resolve_color_token,
     _CUSTOM_CMAPS,
 )
@@ -352,7 +353,7 @@ def run_cif_ticks_menu(
                                     print("No valid indices parsed.")
                                     continue
                                 try:
-                                    cmap = ensure_colormap(palette_name) or plt.get_cmap(palette_name)
+                                    cmap = get_colormap(palette_name)
                                 except Exception:
                                     cmap = None
                                 if cmap is None:

{batplot-1.8.41 → batplot-1.8.42}/batplot/plot_modes/xy/colors.py

@@ -9,13 +9,10 @@ so undo and CIF redraw behavior are unchanged.
 
 from __future__ import annotations
 
-import importlib as _il
 from typing import Any, Callable, List, Optional, Sequence
 
 import matplotlib.pyplot as plt  # type: ignore[import]
-import matplotlib.cm as _cm  # type: ignore[import]
 from matplotlib import colors as mcolors  # type: ignore[import]
-from matplotlib.colors import LinearSegmentedColormap  # type: ignore[import]
 
 from ...plotting import apply_curve_color, update_labels
 from ...ui import set_spine_side_color as _ui_set_spine_side_color
@@ -27,6 +24,7 @@ from ...color_utils import (
     get_user_color_list,
     resolve_color_token,
     ensure_colormap,
+    get_colormap,
     _CUSTOM_CMAPS,
 )
 from ..common.palettes import (
@@ -81,26 +79,7 @@ def run_xy_color_menu(
             return resolve_palette_token(token, _palette_index)
 
         def _apply_palette_to_lines(palette_name, indices):
-            ensure_colormap(palette_name)
-            cmap = None
-            try:
-                cmap = _cm.get_cmap(palette_name)
-            except Exception:
-                pass
-            if cmap is None and palette_name.lower().startswith('batlow'):
-                try:
-                    _cmc = _il.import_module('cmcrameri.cm')
-                    _attr = palette_name.lower()
-                    cmap = getattr(_cmc, _attr, None) or getattr(_cmc, 'batlow', None)
-                except Exception:
-                    pass
-            if cmap is None:
-                _base = palette_name.lower().rstrip('_r')
-                _cc = _CUSTOM_CMAPS.get(_base)
-                if _cc:
-                    cmap = LinearSegmentedColormap.from_list(_base, _cc, N=256)
-                    if palette_name.lower().endswith('_r'):
-                        cmap = cmap.reversed()
+            cmap = get_colormap(palette_name)
             if cmap is None:
                 print(f"Unknown palette '{palette_name}'.")
                 return
@@ -234,7 +213,7 @@ def run_xy_color_menu(
                                 print("No valid indices parsed.")
                                 continue
                             try:
-                                cmap = ensure_colormap(pal_name) or plt.get_cmap(pal_name)
+                                cmap = get_colormap(pal_name)
                             except Exception:
                                 cmap = None
                             if cmap is None:

{batplot-1.8.41 → batplot-1.8.42}/batplot/plot_modes/xy/interactive.py

@@ -18,7 +18,7 @@ from matplotlib.ticker import (  # type: ignore[import]
     NullLocator,
 )
 
-from ...plotting import update_labels
+from ...plotting import apply_curve_color, update_labels
 from ...utils import (
     normalize_label_text,
 )
@@ -39,6 +39,8 @@ from ...ui import (
 from .style import (
     print_style_info as _bp_print_style_info,
     apply_style_config as _bp_apply_style_config,
+    capture_xy_axis_style,
+    apply_xy_axis_style,
 )
 from ...config import load_config, save_config
 from .style import export_style_config as _export_style_config
@@ -1262,7 +1264,9 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                 "rotation_angle": getattr(ax, '_rotation_angle', 0),
                 "stack_label_at_bottom": getattr(fig, '_stack_label_at_bottom', False),
                 "label_anchor_left": getattr(fig, '_label_anchor_left', False),
-                "grid": any(line.get_visible() for line in ax.get_xgridlines() + ax.get_ygridlines())
+                "grid": any(line.get_visible() for line in ax.get_xgridlines() + ax.get_ygridlines()),
+                "curve_palettes": list(getattr(fig, '_curve_palette_history', []) or []),
+                "axis_style": capture_xy_axis_style(ax),
             }
             # Optional per-set CIF visibility state for 1D mode
             try:
@@ -1494,6 +1498,20 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
             except Exception:
                 pass
 
+            # Tick/label colors and labelpads
+            try:
+                axis_style = snap.get("axis_style")
+                if axis_style:
+                    spine_specs = {
+                        name: {"color": spec.get("color")}
+                        for name, spec in snap.get("spines", {}).items()
+                    }
+                    apply_xy_axis_style(ax, axis_style, fig=fig, spines_cfg=spine_specs)
+                    _ui_position_bottom_xlabel(ax, fig, tick_state)
+                    _ui_position_left_ylabel(ax, fig, tick_state)
+            except Exception:
+                pass
+
             # Labels list
             labels[:] = snap["labels"]
 
@@ -1503,22 +1521,30 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                     i = item["index"]
                     ln = _line(i)
                     ln.set_data(item["x"], item["y"])
-                    ln.set_color(item["color"]) 
-                    ln.set_linewidth(item["lw"]) 
-                    ln.set_linestyle(item["ls"]) 
+                    ln.set_linewidth(item["lw"])
+                    ln.set_linestyle(item["ls"])
                     if item["marker"] is not None:
-                        ln.set_marker(item["marker"]) 
+                        ln.set_marker(item["marker"])
                     if item.get("markersize") is not None:
-                        try: ln.set_markersize(item["markersize"]) 
-                        except Exception: pass
+                        try:
+                            ln.set_markersize(item["markersize"])
+                        except Exception:
+                            pass
+                    if item["alpha"] is not None:
+                        ln.set_alpha(item["alpha"])
+                    apply_curve_color(ln, item["color"])
                     if item.get("mfc") is not None:
-                        try: ln.set_markerfacecolor(item["mfc"]) 
-                        except Exception: pass
+                        try:
+                            if str(item["mfc"]).lower() == "none":
+                                ln.set_markerfacecolor("none")
+                        except Exception:
+                            pass
                     if item.get("mec") is not None:
-                        try: ln.set_markeredgecolor(item["mec"]) 
-                        except Exception: pass
-                    if item["alpha"] is not None:
-                        ln.set_alpha(item["alpha"]) 
+                        try:
+                            if str(item["mec"]).lower() == "none":
+                                ln.set_markeredgecolor("none")
+                        except Exception:
+                            pass
 
             # Replace lists
             x_data_list[:] = [np.array(a, copy=True) for a in snap["x_data_list"]]
@@ -1602,6 +1628,20 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
             if 'label_anchor_left' in snap:
                 fig._label_anchor_left = bool(snap['label_anchor_left'])
 
+            if snap.get("curve_palettes"):
+                fig._curve_palette_history = [
+                    {
+                        'palette': rec.get('palette'),
+                        'indices': list(rec.get('indices', [])),
+                        'low_clip': float(rec.get('low_clip', 0.08)),
+                        'high_clip': float(rec.get('high_clip', 0.85)),
+                    }
+                    for rec in snap["curve_palettes"]
+                    if rec.get('palette') and rec.get('indices')
+                ]
+            elif hasattr(fig, '_curve_palette_history'):
+                delattr(fig, '_curve_palette_history')
+
             # Restore grid state
             if 'grid' in snap:
                 try: