batplot 1.8.1__py3-none-any.whl → 1.8.3__py3-none-any.whl

batplot/__init__.py

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

batplot/args.py

@@ -152,6 +152,8 @@ def _print_general_help() -> None:
         "    batplot --all style.bps                # Batch with style: apply style.bps to all files\n"
         "    batplot --all ./Style/style.bps        # Batch with style: use relative path to style file\n"
         "    batplot --all config.bpsg              # Batch with style+geom: apply to all XY files\n"
+        "    batplot file1.xy:1.54 file2.qye --stack  # Stack mode: stack all files vertically\n"
+        "    batplot file1.xy:1.54 file2.qye structure.cif --stack --i # Stack mode: stack all files vertically with cif ticks\n"
         "    batplot file1.qye file2.qye style.bps  # Apply style to multiple files and export\n"
         "    batplot file1.xy file2.xye ./Style/style.bps  # Apply style from relative path\n\n"
         "  [Electrochemistry]\n"

batplot/batch.py

@@ -157,6 +157,18 @@ def _apply_xy_style(fig, ax, cfg: dict):
                     except Exception:
                         pass
         
+        # Enforce compatibility between style/geom ro state and current figure ro state.
+        # Styles saved from a plot using --ro (swapped x/y) must not be applied to a non-ro plot, and vice versa.
+        file_ro = bool(cfg.get('ro_active', False))
+        current_ro = bool(getattr(fig, '_ro_active', False))
+        if file_ro != current_ro:
+            if file_ro:
+                print("Warning: XY style/geometry file was saved with --ro (swapped x/y axes); batch plot is not using --ro.")
+            else:
+                print("Warning: XY style/geometry file was saved without --ro; batch plot is treated as non-ro.")
+            print("Skipping style/geometry in batch mode to avoid corrupting axis orientation.")
+            return
+
         # Apply WASD state (tick visibility)
         wasd_cfg = cfg.get('wasd_state', {})
         if wasd_cfg:
@@ -223,6 +235,17 @@ def _apply_ec_style(fig, ax, cfg: dict):
         cfg: Style configuration dictionary
     """
     try:
+        # Enforce compatibility between style/geom ro state and current figure ro state.
+        file_ro = bool(cfg.get('ro_active', False))
+        current_ro = bool(getattr(fig, '_ro_active', False))
+        if file_ro != current_ro:
+            if file_ro:
+                print("Warning: EC style/geometry file was saved with --ro (swapped x/y axes); batch EC plot is not using --ro.")
+            else:
+                print("Warning: EC style/geometry file was saved without --ro; batch EC plot is treated as non-ro.")
+            print("Skipping EC style/geometry in batch mode to avoid corrupting axis orientation.")
+            return
+
         # Apply fonts
         font_cfg = cfg.get('font', {})
         if font_cfg:

batplot/batplot.py

@@ -507,6 +507,11 @@ def batplot_main() -> int:
                     except Exception:
                         pass
                     _plt.show(block=False)
+                    # Track whether data axes were swapped via --ro for this EC figure
+                    try:
+                        fig._ro_active = bool(getattr(args, "ro", False))
+                    except Exception:
+                        pass
                     try:
                         fig._bp_source_paths = [_os.path.abspath(ec_file)]
                     except Exception:
@@ -1785,9 +1790,40 @@ def batplot_main() -> int:
             if not isinstance(sess, dict) or 'version' not in sess:
                 print("Not a valid batplot session file.")
                 exit(1)
+        except ModuleNotFoundError as e:
+            # Handle numpy._core and other module import errors
+            if '_core' in str(e) or 'numpy' in str(e).lower():
+                print(f"\nERROR: NumPy version mismatch detected when loading: {sess_path}")
+                print("This session was saved with a different NumPy version.")
+                print("The error 'No module named numpy._core' indicates:")
+                print("  - Session saved with NumPy 2.0+ but loading with NumPy <2.0, OR")
+                print("  - Session saved with NumPy <2.0 but loading with NumPy 2.0+")
+                print("\nSolutions:")
+                print("  1. Check NumPy version: python3 -c 'import numpy; print(numpy.__version__)'")
+                print("  2. Install matching version:")
+                print("     - If session was saved with NumPy 2.0+: pip install 'numpy>=2.0'")
+                print("     - If session was saved with NumPy <2.0: pip install 'numpy<2.0'")
+                print("  3. Recreate the session from original data files")
+            else:
+                print(f"\nERROR: Module import error when loading: {sess_path}")
+                print(f"Error: {e}")
+                print("This usually indicates a package version mismatch.")
+                print("Try installing matching package versions or recreate the session.")
+            exit(1)
         except Exception as e:
             print(f"Failed to load session: {e}")
             exit(1)
+        
+        # Check package version compatibility (if version info is available)
+        try:
+            from .session import _get_package_versions, _check_package_compatibility
+            saved_versions = sess.get('package_versions', {})
+            current_versions = _get_package_versions()
+            if saved_versions and not _check_package_compatibility(saved_versions, current_versions, sess_path):
+                exit(1)
+        except Exception:
+            # If compatibility checking fails, continue anyway (backward compatibility)
+            pass
         # If it's an EC GC session, load and open EC interactive menu directly
         if isinstance(sess, dict) and sess.get('kind') == 'ec_gc':
             try:
@@ -1882,6 +1918,11 @@ def batplot_main() -> int:
         # Reconstruct minimal state and go to interactive if requested
         plt.ion() if args.interactive else None
         fig, ax = plt.subplots(figsize=(8,6))
+        # Restore ro flag from session (if present) so style/geom imports can enforce compatibility
+        try:
+            fig._ro_active = bool(sess.get('ro_active', False))
+        except Exception:
+            pass
         y_data_list = []
         x_data_list = []
         labels_list = []
@@ -1890,10 +1931,31 @@ def batplot_main() -> int:
         x_full_list = []
         raw_y_full_list = []
         offsets_list = []
-        tick_state = {
-            'bx': True,'tx': False,'ly': True,'ry': False,
-            'mbx': False,'mtx': False,'mly': False,'mry': False
-        }
+        # Load tick_state from wasd_state if available (version 2+), otherwise use defaults
+        wasd_loaded = sess.get('wasd_state')
+        if wasd_loaded and isinstance(wasd_loaded, dict):
+            # Convert wasd_state to tick_state format
+            tick_state = {}
+            for side_key, prefix in [('top', 't'), ('bottom', 'b'), ('left', 'l'), ('right', 'r')]:
+                s = wasd_loaded.get(side_key, {})
+                tick_state[f'{prefix}_ticks'] = bool(s.get('ticks', side_key in ('bottom', 'left')))
+                tick_state[f'{prefix}_labels'] = bool(s.get('labels', side_key in ('bottom', 'left')))
+                tick_state[f'm{prefix}x' if prefix in 'tb' else f'm{prefix}y'] = bool(s.get('minor', False))
+            # Legacy keys for backward compatibility
+            tick_state['bx'] = tick_state.get('b_ticks', True)
+            tick_state['tx'] = tick_state.get('t_ticks', False)
+            tick_state['ly'] = tick_state.get('l_ticks', True)
+            tick_state['ry'] = tick_state.get('r_ticks', False)
+            tick_state['mbx'] = tick_state.get('mbx', False)
+            tick_state['mtx'] = tick_state.get('mtx', False)
+            tick_state['mly'] = tick_state.get('mly', False)
+            tick_state['mry'] = tick_state.get('mry', False)
+        else:
+            # Fallback to legacy tick_state or defaults
+            tick_state = sess.get('tick_state', {
+                'bx': True,'tx': False,'ly': True,'ry': False,
+                'mbx': False,'mtx': False,'mly': False,'mry': False
+            })
         saved_stack = bool(sess.get('args_subset', {}).get('stack', False))
         # Pull data
         # --- Robust reconstruction of stored curves ---
@@ -1954,8 +2016,27 @@ def batplot_main() -> int:
             pass
         labels_list[:] = sess.get('labels', [f"Curve {i+1}" for i in range(len(y_data_list))])
         delta = sess.get('delta', 0.0)
+        # Apply tick state (labels visibility) BEFORE setting axis labels
+        try:
+            ax.tick_params(axis='x',
+                          bottom=tick_state.get('b_ticks', tick_state.get('bx', True)),
+                          labelbottom=tick_state.get('b_labels', tick_state.get('bx', True)),
+                          top=tick_state.get('t_ticks', tick_state.get('tx', False)),
+                          labeltop=tick_state.get('t_labels', tick_state.get('tx', False)))
+            ax.tick_params(axis='y',
+                          left=tick_state.get('l_ticks', tick_state.get('ly', True)),
+                          labelleft=tick_state.get('l_labels', tick_state.get('ly', True)),
+                          right=tick_state.get('r_ticks', tick_state.get('ry', False)),
+                          labelright=tick_state.get('r_labels', tick_state.get('ry', False)))
+        except Exception:
+            pass
         ax.set_xlabel(sess.get('axis', {}).get('xlabel', 'X'))
         ax.set_ylabel(sess.get('axis', {}).get('ylabel', 'Intensity'))
+        # Store tick_state on axes for interactive menu
+        try:
+            ax._saved_tick_state = dict(tick_state)
+        except Exception:
+            pass
         
         # Restore normalization ranges (if saved)
         axis_cfg = sess.get('axis', {})
@@ -2933,19 +3014,21 @@ def batplot_main() -> int:
             offset += increment
 
         # ---- Plot curve ----
-        # Swap x and y if --ro flag is set
+        # Swap x and y if --ro flag is set (and keep lists aligned once)
         if getattr(args, 'ro', False):
-            ax.plot(y_plot_offset, x_plot, "-", lw=1, alpha=0.8)
-            y_data_list.append(x_plot.copy())
-            x_data_list.append(y_plot_offset)
+            x_plotted = y_plot_offset    # goes on x-axis when rotated
+            y_plotted = x_plot           # goes on y-axis when rotated
         else:
+            x_plotted = x_plot
+            y_plotted = y_plot_offset
 
-            ax.plot(x_plot, y_plot_offset, "-", lw=1, alpha=0.8)
-        y_data_list.append(y_plot_offset.copy())
-        x_data_list.append(x_plot)
+        ax.plot(x_plotted, y_plotted, "-", lw=1, alpha=0.8)
+        x_data_list.append(x_plotted)
+        y_data_list.append(y_plotted.copy())
         labels_list.append(label)
         # Store current normalized (subset) (used by rearrange logic)
-        orig_y.append(y_norm.copy())
+        # Keep orig_y aligned with the plotted y data to avoid length mismatch on undo/relabel.
+        orig_y.append(y_plotted.copy())
 
     # ---------------- Force axis to fit all data before labels ----------------
     ax.relim()
@@ -3458,6 +3541,12 @@ def batplot_main() -> int:
                 fig.set_tight_layout(False)
             except Exception:
                 pass
+
+        # Track whether data axes were swapped via --ro for this figure
+        try:
+            fig._ro_active = bool(getattr(args, "ro", False))
+        except Exception:
+            pass
         
         # Build CIF globals dict for explicit passing
         cif_globals = {

batplot/cpc_interactive.py

@@ -564,6 +564,8 @@ def _style_snapshot(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_data=Non
             'frame_size': [frame_w_in, frame_h_in],
             'axes_fraction': [ax_bbox.x0, ax_bbox.y0, ax_bbox.width, ax_bbox.height]
         },
+        # Track whether data axes were swapped via --ro when this style was saved
+        'ro_active': bool(getattr(fig, '_ro_active', False)),
         'font': {'family': fam0, 'size': fsize},
         'legend': {
             'visible': legend_visible,
@@ -1533,9 +1535,8 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                 ax2.tick_params(axis='y', which='minor', right=True, labelright=False)
             else:
                 ax2.tick_params(axis='y', which='minor', right=False, labelright=False)
-            # Position label spacings (bottom/left) for consistency
-            _ui_position_bottom_xlabel(ax, fig, tick_state)
-            _ui_position_left_ylabel(ax, fig, tick_state)
+            # Note: Do NOT call position functions during undo restore as it causes title drift
+            # Title offsets are already restored from snapshot in restore_state()
             try:
                 for spine_name, color in getattr(fig, '_cpc_spine_colors', {}).items():
                     _set_spine_color(spine_name, color)
@@ -2683,6 +2684,17 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                 kind = cfg.get('kind', '')
                 if kind not in ('cpc_style', 'cpc_style_geom'):
                     print("Not a CPC style file."); _print_menu(); continue
+
+                # Enforce compatibility between style/geom ro state and current figure ro state
+                file_ro = bool(cfg.get('ro_active', False))
+                current_ro = bool(getattr(fig, '_ro_active', False))
+                if file_ro != current_ro:
+                    if file_ro:
+                        print("Warning: Style/geometry file was saved with --ro (swapped x/y axes); current plot is not using --ro.")
+                    else:
+                        print("Warning: Style/geometry file was saved without --ro; current plot was created with --ro.")
+                    print("Not applying CPC style/geometry to avoid corrupting axis orientation.")
+                    _print_menu(); continue
                 
                 has_geometry = (kind == 'cpc_style_geom' and 'geometry' in cfg)
                 
@@ -3458,6 +3470,11 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                     if not cmd:
                         continue
                     if cmd == 'q':
+                        # Update ax._saved_tick_state before exiting so changes are persisted
+                        try:
+                            ax._saved_tick_state = dict(tick_state)
+                        except Exception:
+                            pass
                         break
                     if cmd == 'i':
                         # Invert tick direction (toggle between 'out' and 'in')
@@ -3779,6 +3796,11 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                             tick_state['mry'] = bool(wasd['right']['minor'])
                     if changed:
                         push_state("wasd-toggle")
+                        # Update ax._saved_tick_state so dump_session can read it
+                        try:
+                            ax._saved_tick_state = dict(tick_state)
+                        except Exception:
+                            pass
                         _apply_wasd(changed_sides if changed_sides else None)
                         # Single draw at the end after all positioning is complete
                         try:

batplot/electrochem_interactive.py

@@ -1551,10 +1551,8 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     ax._right_ylabel_manual_offset_y_pts = 0.0
                 ax._top_xlabel_on = bool(snap.get('titles',{}).get('top_x', False))
                 ax._right_ylabel_on = bool(snap.get('titles',{}).get('right_y', False))
-                _ui_position_top_xlabel(ax, fig, tick_state)
-                _ui_position_bottom_xlabel(ax, fig, tick_state)
-                _ui_position_left_ylabel(ax, fig, tick_state)
-                _ui_position_right_ylabel(ax, fig, tick_state)
+                # Note: Do NOT call position functions during undo restore as it causes title drift
+                # Title offsets are already restored from snapshot above
             except Exception:
                 pass
             # Restore labelpads (for title positioning)
@@ -2091,6 +2089,18 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     print("Not an EC style file.")
                     _print_menu(len(all_cycles), is_dqdv)
                     continue
+
+                # Enforce compatibility between style/geom ro state and current figure ro state
+                file_ro = bool(cfg.get('ro_active', False))
+                current_ro = bool(getattr(fig, '_ro_active', False))
+                if file_ro != current_ro:
+                    if file_ro:
+                        print("Warning: EC style/geometry file was saved with --ro (swapped x/y axes); current plot is not using --ro.")
+                    else:
+                        print("Warning: EC style/geometry file was saved without --ro; current plot was created with --ro.")
+                    print("Not applying EC style/geometry to avoid corrupting axis orientation.")
+                    _print_menu(len(all_cycles), is_dqdv)
+                    continue
                 
                 has_geometry = (kind == 'ec_style_geom' and 'geometry' in cfg)
                 
@@ -4231,6 +4241,8 @@ def _get_style_snapshot(fig, ax, cycle_lines: Dict, tick_state: Dict) -> Dict:
         'curve_markers': curve_marker_props,
         'rotation_angle': getattr(fig, '_ec_rotation_angle', 0),
         'cycle_styles': cycle_styles,
+        # Track whether data axes were swapped via --ro when this style was saved
+        'ro_active': bool(getattr(fig, '_ro_active', False)),
     }
 
 
@@ -4322,6 +4334,10 @@ def _print_style_snapshot(cfg: Dict):
     if rotation_angle != 0:
         print(f"Rotation angle: {rotation_angle}°")
 
+    # ro / axis-swap state
+    ro_active = bool(cfg.get('ro_active', False))
+    print(f"Data axes swapped via --ro: {'YES' if ro_active else 'no'}")
+
     # Per-side matrix summary (spine, major, minor, labels, title)
     def _onoff(v):
         return 'ON ' if bool(v) else 'off'

batplot/interactive.py

@@ -1218,8 +1218,7 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                         fig.set_size_inches(snap["fig_size"][0], snap["fig_size"][1], forward=True)
                     except Exception:
                         pass
-                else:
-                    print("(Canvas fixed) Ignoring undo figure size restore.")
+                # No message needed - canvas size is managed by system
             # Don't restore DPI from undo - use system default to avoid display-dependent issues
             
             # Restore axes (plot frame) via stored bbox if present
@@ -1287,15 +1286,9 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                 position_right_ylabel()
             except Exception:
                 pass
-            # Also reposition bottom/left titles to consume pending pads and match tick label visibility
-            try:
-                position_bottom_xlabel()
-            except Exception:
-                pass
-            try:
-                position_left_ylabel()
-            except Exception:
-                pass
+            # Note: Do NOT call position_bottom_xlabel() / position_left_ylabel() here
+            # as it causes title drift when combined with fig.canvas.draw() below.
+            # Title offsets are already restored from snapshot above.
 
             # Spines (linewidth, color, visibility)
             for name, spec in snap.get("spines", {}).items():
@@ -1737,7 +1730,7 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                             show_cif_titles=(bool(getattr(_bp,'show_cif_titles', True)) if _bp is not None else True),
                             skip_confirm=skip_confirm,
                         )
-                        print(f"Saved session to {target_path}")
+                        # Message already printed by dump_session
                         fig._last_session_save_path = target_path
                         continue
                     else:
@@ -1777,7 +1770,7 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                         show_cif_titles=(bool(getattr(_bp,'show_cif_titles', True)) if _bp is not None else True),
                         skip_confirm=skip_confirm,
                     )
-                    print(f"Saved session to {target_path}")
+                    # Message already printed by dump_session
                     fig._last_session_save_path = target_path
             except Exception as e:
                 print(f"Error saving session: {e}")
@@ -2697,10 +2690,11 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                                 eps = abs(y_min)*1e-6 if y_min != 0 else 1e-6
                                 y_min -= eps
                                 y_max += eps
-                        ax.set_ylim(y_min, y_max)
+                    ax.set_ylim(y_min, y_max)
                     update_labels(ax, y_data_list, label_text_objects, args.stack, getattr(fig, '_stack_label_at_bottom', False))
                     fig.canvas.draw_idle()
-                    print(f"Y range set to {ax.get_ylim()}")
+                    ymin, ymax = ax.get_ylim()
+                    print(f"Y range set to ({float(ymin)}, {float(ymax)})")
                 except Exception as e:
                     print(f"Error setting Y-axis range: {e}")
         elif key == 'd':  # <-- DELTA / OFFSET HANDLER (now only reachable if not args.stack)
@@ -3313,6 +3307,11 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                     if not cmd:
                         continue
                     if cmd == 'q':
+                        # Update ax._saved_tick_state before exiting so changes are persisted
+                        try:
+                            ax._saved_tick_state = dict(tick_state)
+                        except Exception:
+                            pass
                         break
                     if cmd == 'i':
                         # Invert tick direction (toggle between 'out' and 'in')
@@ -3584,6 +3583,11 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                             continue
                         # Unknown code
                         print(f"Unknown code: {p}")
+                    # After tick toggles, update ax._saved_tick_state so dump_session can read it
+                    try:
+                        ax._saved_tick_state = dict(tick_state)
+                    except Exception:
+                        pass
                     # After tick toggles, update visibility and reposition ALL axis labels for independence
                     update_tick_visibility()
                     update_labels(ax, y_data_list, label_text_objects, args.stack, getattr(fig, '_stack_label_at_bottom', False))

batplot/modes.py

@@ -280,8 +280,8 @@ def handle_cv_mode(args) -> int:
             ax.set_xlabel('Current (mA)', labelpad=8.0)
             ax.set_ylabel('Voltage (V)', labelpad=8.0)
         else:
-            ax.set_xlabel('Voltage (V)', labelpad=8.0)
-            ax.set_ylabel('Current (mA)', labelpad=8.0)
+        ax.set_xlabel('Voltage (V)', labelpad=8.0)
+        ax.set_ylabel('Current (mA)', labelpad=8.0)
         legend = ax.legend(title='Cycle')
         legend.get_title().set_fontsize('medium')
         # Adjust margins to prevent label clipping
@@ -642,8 +642,8 @@ def handle_gc_mode(args) -> int:
                         ln_c, = ax.plot(y_b, x_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
                                         linewidth=2.0, label=str(cyc), alpha=0.8)
                     else:
-                        ln_c, = ax.plot(x_b, y_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
-                                        linewidth=2.0, label=str(cyc), alpha=0.8)
+                    ln_c, = ax.plot(x_b, y_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
+                                    linewidth=2.0, label=str(cyc), alpha=0.8)
                 else:
                     ln_c = None
                 mask_d = (cyc_int == cyc) & discharge_mask
@@ -656,8 +656,8 @@ def handle_gc_mode(args) -> int:
                         ln_d, = ax.plot(yd_b, xd_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
                                         linewidth=2.0, label=lbl, alpha=0.8)
                     else:
-                        ln_d, = ax.plot(xd_b, yd_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
-                                        linewidth=2.0, label=lbl, alpha=0.8)
+                    ln_d, = ax.plot(xd_b, yd_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
+                                    linewidth=2.0, label=lbl, alpha=0.8)
                 else:
                     ln_d = None
                 cycle_lines[cyc] = {"charge": ln_c, "discharge": ln_d}
@@ -677,8 +677,8 @@ def handle_gc_mode(args) -> int:
                         ln_c, = ax.plot(y_b, x_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
                                         linewidth=2.0, label=str(cyc), alpha=0.8)
                     else:
-                        ln_c, = ax.plot(x_b, y_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
-                                        linewidth=2.0, label=str(cyc), alpha=0.8)
+                    ln_c, = ax.plot(x_b, y_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
+                                    linewidth=2.0, label=str(cyc), alpha=0.8)
                 ln_d = None
                 if i < len(dch_blocks):
                     a, b = dch_blocks[i]
@@ -690,8 +690,8 @@ def handle_gc_mode(args) -> int:
                         ln_d, = ax.plot(yd_b, xd_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
                                         linewidth=2.0, label=lbl, alpha=0.8)
                     else:
-                        ln_d, = ax.plot(xd_b, yd_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
-                                        linewidth=2.0, label=lbl, alpha=0.8)
+                    ln_d, = ax.plot(xd_b, yd_b, '-', color=base_colors[(cyc-1) % len(base_colors)],
+                                    linewidth=2.0, label=lbl, alpha=0.8)
                 cycle_lines[cyc] = {"charge": ln_c, "discharge": ln_d}
                 
         # Swap x and y if --ro flag is set
@@ -699,8 +699,8 @@ def handle_gc_mode(args) -> int:
             ax.set_xlabel('Voltage (V)', labelpad=8.0)
             ax.set_ylabel(x_label_gc, labelpad=8.0)
         else:
-            ax.set_xlabel(x_label_gc, labelpad=8.0)
-            ax.set_ylabel('Voltage (V)', labelpad=8.0)
+        ax.set_xlabel(x_label_gc, labelpad=8.0)
+        ax.set_ylabel('Voltage (V)', labelpad=8.0)
         legend = ax.legend(title='Cycle')
         legend.get_title().set_fontsize('medium')
         fig.subplots_adjust(left=0.12, right=0.95, top=0.88, bottom=0.15)

batplot/operando_ec_interactive.py

@@ -354,7 +354,7 @@ def _draw_custom_colorbar(cbar_ax, im, label='Intensity', label_mode='normal'):
 
 def _update_custom_colorbar(cbar_ax, im=None, label=None, label_mode=None):
     """Update the custom colorbar when colormap or limits change.
-
+    
     Args:
         cbar_ax: Axes object containing the colorbar
         im: Optional AxesImage object (if None, uses stored reference)
@@ -365,13 +365,13 @@ def _update_custom_colorbar(cbar_ax, im=None, label=None, label_mode=None):
         im = getattr(cbar_ax, '_colorbar_im', None)
         if im is None:
             return
-
+    
     if label is None:
         label = getattr(cbar_ax, '_colorbar_label', 'Intensity')
-
+    
     if label_mode is None:
         label_mode = getattr(cbar_ax, '_colorbar_label_mode', 'normal')
-
+    
     # Redraw the colorbar
     _draw_custom_colorbar(cbar_ax, im, label, label_mode)