batplot 1.3.7__tar.gz → 1.3.9__tar.gz

{batplot-1.3.7 → batplot-1.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.3.7
+Version: 1.3.9
 Summary: Interactive plotting for XRD, PDF, and XAS data (.xye, .xy, .qye, .dat, .csv, .gr, .nor, .chik, .chir)
 Author-email: Tian Dai <tianda@uio.no>
 License: MIT License

{batplot-1.3.7 → batplot-1.3.9}/batplot/__init__.py

@@ -1,5 +1,5 @@
 """batplot: Interactive plotting for battery data visualization."""
 
-__version__ = "1.3.7"
+__version__ = "1.3.9"
 
 __all__ = ["__version__"]

{batplot-1.3.7 → batplot-1.3.9}/batplot/cpc_interactive.py

@@ -296,6 +296,11 @@ def _style_snapshot(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_data=Non
             'right':  {'linewidth': ax2.spines.get('right').get_linewidth() if ax2.spines.get('right') else None,
                        'visible': ax2.spines.get('right').get_visible() if ax2.spines.get('right') else None},
         },
+        'labelpads': {
+            'x': getattr(ax.xaxis, 'labelpad', None),
+            'ly': getattr(ax.yaxis, 'labelpad', None),  # left y-axis (capacity)
+            'ry': getattr(ax2.yaxis, 'labelpad', None),  # right y-axis (efficiency)
+        },
         'series': {
             'charge': {
                 'color': _color_of(sc_charge),
@@ -628,6 +633,18 @@ def _apply_style(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, cfg: Dict, file_
                     except Exception: pass
     except Exception:
         pass
+    # Restore labelpads
+    try:
+        pads = cfg.get('labelpads', {})
+        if pads:
+            if pads.get('x') is not None:
+                ax.xaxis.labelpad = pads['x']
+            if pads.get('ly') is not None:
+                ax.yaxis.labelpad = pads['ly']
+            if pads.get('ry') is not None:
+                ax2.yaxis.labelpad = pads['ry']
+    except Exception:
+        pass
     try:
         fig.canvas.draw_idle()
     except Exception:

{batplot-1.3.7 → batplot-1.3.9}/batplot/electrochem_interactive.py

@@ -649,6 +649,10 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 'wasd_state': dict(getattr(fig, '_ec_wasd_state', {})) if hasattr(fig, '_ec_wasd_state') else {},
                 'fig_size': list(fig.get_size_inches()),
                 'rotation_angle': getattr(fig, '_ec_rotation_angle', 0),
+                'labelpads': {
+                    'x': getattr(ax.xaxis, 'labelpad', None),
+                    'y': getattr(ax.yaxis, 'labelpad', None),
+                },
                 'spines': {name: {
                     'lw': (ax.spines.get(name).get_linewidth() if ax.spines.get(name) else None),
                     'visible': (ax.spines.get(name).get_visible() if ax.spines.get(name) else None)
@@ -776,6 +780,16 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 _position_top_xlabel(); _position_right_ylabel()
             except Exception:
                 pass
+            # Restore labelpads (for title positioning)
+            try:
+                pads = snap.get('labelpads', {})
+                if pads:
+                    if pads.get('x') is not None:
+                        ax.xaxis.labelpad = pads['x']
+                    if pads.get('y') is not None:
+                        ax.yaxis.labelpad = pads['y']
+            except Exception:
+                pass
             # Lines (by index)
             try:
                 if len(ax.lines) == len(snap.get('lines', [])):

{batplot-1.3.7 → batplot-1.3.9}/batplot/operando.py

@@ -167,8 +167,8 @@ def plot_operando_folder(folder: str, args) -> Tuple[plt.Figure, plt.Axes, Dict[
     # Use imshow for speed; mask nans
     Zm = np.ma.masked_invalid(Z)
     extent = (grid_x.min(), grid_x.max(), 0, Zm.shape[0]-1)
-    # Top-to-down visual order (scan 0 at top) -> origin='upper'
-    im = ax.imshow(Zm, aspect='auto', origin='upper', extent=extent, cmap='viridis', interpolation='nearest')
+    # Bottom-to-top visual order (scan 0 at bottom) to match EC time progression -> origin='lower'
+    im = ax.imshow(Zm, aspect='auto', origin='lower', extent=extent, cmap='viridis', interpolation='nearest')
     # Place colorbar on the left
     cbar = fig.colorbar(im, ax=ax, location='left', pad=0.15)
     cbar.ax.yaxis.set_ticks_position('left')
@@ -259,7 +259,8 @@ def plot_operando_folder(folder: str, args) -> Tuple[plt.Figure, plt.Axes, Dict[
             # Match interactive default: shrink EC gap and rebalance widths
             try:
                 # Decrease gap more aggressively with a sensible minimum
-                ec_gap_in = max(0.02, ec_gap_in * 0.2)
+                # Increase the multiplier from 0.2 to 0.35 for more spacing
+                ec_gap_in = max(0.05, ec_gap_in * 0.35)
                 # Transfer a fraction of width from EC to operando while keeping total similar
                 combined = (desired_ax_w_in if desired_ax_w_in > 0 else ax_wf * fig_w_in) + ec_w_in
                 ax_w_in_current = desired_ax_w_in if desired_ax_w_in > 0 else (ax_wf * fig_w_in)