batplot 1.8.2__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.2"
+__version__ = "1.8.3"
 
 __all__ = ["__version__"]

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 = []
@@ -2973,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()
@@ -3498,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)
                 

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)

batplot/session.py

@@ -36,11 +36,116 @@ import os
 
 import matplotlib.pyplot as plt
 import numpy as np
+import sys
 
 from .utils import _confirm_overwrite
 from .color_utils import ensure_colormap
 
 
+def _get_package_versions():
+    """Get versions of critical packages for compatibility checking.
+    
+    Returns:
+        dict: Package name -> version string mapping
+    """
+    versions = {}
+    critical_packages = ['numpy', 'matplotlib', 'scipy']
+    
+    for pkg_name in critical_packages:
+        try:
+            mod = __import__(pkg_name)
+            versions[pkg_name] = getattr(mod, '__version__', 'unknown')
+        except ImportError:
+            versions[pkg_name] = 'not_installed'
+        except Exception:
+            versions[pkg_name] = 'unknown'
+    
+    # Also track Python version
+    versions['python'] = f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}"
+    
+    return versions
+
+
+def _check_package_compatibility(saved_versions, current_versions, filename):
+    """Check if package versions are compatible and warn/error if not.
+    
+    Args:
+        saved_versions: dict of package -> version from saved session
+        current_versions: dict of package -> version currently installed
+        filename: session filename for error messages
+        
+    Returns:
+        bool: True if compatible (or can proceed), False if should abort
+    """
+    if not saved_versions:
+        # Old session file without version info - allow but warn
+        print("Warning: Session file does not contain package version information.")
+        print("This may cause compatibility issues. Consider recreating the session.")
+        return True
+    
+    mismatches = []
+    critical_mismatches = []
+    
+    for pkg in ['numpy', 'matplotlib', 'python']:
+        saved_ver = saved_versions.get(pkg, 'unknown')
+        current_ver = current_versions.get(pkg, 'unknown')
+        
+        if saved_ver == 'unknown' or current_ver == 'unknown':
+            continue
+        
+        if saved_ver != current_ver:
+            # Check for critical incompatibilities
+            if pkg == 'numpy':
+                # numpy 2.0+ uses _core, <2.0 doesn't - this is a breaking change
+                try:
+                    saved_major = int(saved_ver.split('.')[0])
+                    current_major = int(current_ver.split('.')[0])
+                    if saved_major != current_major:
+                        critical_mismatches.append((pkg, saved_ver, current_ver))
+                    else:
+                        mismatches.append((pkg, saved_ver, current_ver))
+                except (ValueError, IndexError):
+                    mismatches.append((pkg, saved_ver, current_ver))
+            elif pkg == 'python':
+                # Python major version changes are critical
+                try:
+                    saved_major = int(saved_ver.split('.')[0])
+                    current_major = int(current_ver.split('.')[0])
+                    if saved_major != current_major:
+                        critical_mismatches.append((pkg, saved_ver, current_ver))
+                    else:
+                        mismatches.append((pkg, saved_ver, current_ver))
+                except (ValueError, IndexError):
+                    mismatches.append((pkg, saved_ver, current_ver))
+            else:
+                mismatches.append((pkg, saved_ver, current_ver))
+    
+    if critical_mismatches:
+        print(f"\nERROR: Critical package version mismatch detected for session: {filename}")
+        print("The following packages have incompatible major version changes:")
+        for pkg, saved, current in critical_mismatches:
+            print(f"  {pkg}: saved with {saved}, current is {current}")
+        print("\nThis will likely cause pickle loading to fail.")
+        print("Solutions:")
+        print("  1. Install matching package versions:")
+        for pkg, saved, current in critical_mismatches:
+            print(f"     pip install '{pkg}=={saved}'  # or use conda")
+        print("  2. Recreate the session from original data files")
+        return False
+    
+    if mismatches:
+        print(f"\nWarning: Package version differences detected for session: {filename}")
+        print("Minor version differences may be okay, but proceed with caution:")
+        for pkg, saved, current in mismatches:
+            print(f"  {pkg}: saved with {saved}, current is {current}")
+        print("If you encounter errors, try matching the saved versions.")
+        response = input("Continue loading session? (y/n): ").strip().lower()
+        if response != 'y':
+            return False
+    
+    return True
+
+
 def _current_tick_width(axis_obj, which: str):
     """
     Return the configured tick width for the given X/Y axis.
@@ -431,8 +536,12 @@ def dump_session(
     wasd_state = _capture_wasd_state(ax)
 
     try:
+        # Get current package versions for compatibility checking
+        package_versions = _get_package_versions()
+        
         sess = {
             'version': 3,
+            'package_versions': package_versions,  # Track versions for compatibility checking
             'x_data': [np.array(a) for a in x_data_list],
             'y_data': [np.array(a) for a in y_data_list],
             'orig_y': [np.array(a) for a in orig_y],
@@ -507,6 +616,8 @@ def dump_session(
         }
         # Save curve names visibility
         sess['curve_names_visible'] = bool(getattr(fig, '_curve_names_visible', True))
+        # Save whether data were plotted with swapped axes via --ro
+        sess['ro_active'] = bool(getattr(fig, '_ro_active', False))
         # Save stack/legend anchor preferences
         sess['stack_label_at_bottom'] = bool(getattr(fig, '_stack_label_at_bottom', False))
         sess['label_anchor_left'] = bool(getattr(fig, '_label_anchor_left', False))
@@ -752,9 +863,13 @@ def dump_operando_session(
         cb_h_offset = getattr(cbar.ax, '_cb_h_offset_in', 0.0)
         ec_h_offset = getattr(ec_ax, '_ec_h_offset_in', 0.0) if ec_ax is not None else None
         
+        # Get current package versions for compatibility checking
+        package_versions = _get_package_versions()
+        
         sess = {
             'kind': 'operando_ec',
             'version': 2,
+            'package_versions': package_versions,  # Track versions for compatibility checking
             'figure': {'size': (fig_w, fig_h), 'dpi': dpi},
             'layout_inches': {
                 'cb_w_in': cb_w_in,
@@ -819,6 +934,26 @@ def load_operando_session(filename: str):
     try:
         with open(filename, 'rb') as f:
             sess = pickle.load(f)
+    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: {filename}")
+            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: {filename}")
+            print(f"Error: {e}")
+            print("This usually indicates a package version mismatch.")
+            print("Try installing matching package versions or recreate the session.")
+        return None
     except Exception as e:
         print(f"Failed to load session: {e}")
         return None
@@ -826,6 +961,12 @@ def load_operando_session(filename: str):
     if not isinstance(sess, dict) or sess.get('kind') != 'operando_ec':
         print("Not an operando+EC session file.")
         return None
+    
+    # Check package version compatibility
+    saved_versions = sess.get('package_versions', {})
+    current_versions = _get_package_versions()
+    if not _check_package_compatibility(saved_versions, current_versions, filename):
+        return None
 
     # Use standard DPI of 100 instead of saved DPI to avoid display-dependent issues
     # (Retina displays, Windows scaling, etc. can cause saved DPI to differ)
@@ -1605,9 +1746,13 @@ def dump_ec_session(
                 legend_xy_in = (float(xy[0]), float(xy[1]))
         except Exception:
             legend_xy_in = None
+        # Get current package versions for compatibility checking
+        package_versions = _get_package_versions()
+        
         sess = {
             'kind': 'ec_gc',
             'version': 2,
+            'package_versions': package_versions,  # Track versions for compatibility checking
             'figure': {'size': (fig_w, fig_h), 'dpi': dpi},
             'axis': axis,
             'subplot_margins': subplot_margins,
@@ -1657,6 +1802,26 @@ def load_ec_session(filename: str):
     try:
         with open(filename, 'rb') as f:
             sess = pickle.load(f)
+    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: {filename}")
+            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: {filename}")
+            print(f"Error: {e}")
+            print("This usually indicates a package version mismatch.")
+            print("Try installing matching package versions or recreate the session.")
+        return None
     except Exception as e:
         print(f"Failed to load EC session: {e}")
         return None
@@ -1664,6 +1829,12 @@ def load_ec_session(filename: str):
     if not isinstance(sess, dict) or sess.get('kind') != 'ec_gc':
         print("Not an EC GC session file.")
         return None
+    
+    # Check package version compatibility
+    saved_versions = sess.get('package_versions', {})
+    current_versions = _get_package_versions()
+    if not _check_package_compatibility(saved_versions, current_versions, filename):
+        return None
 
     # Use standard DPI of 100 instead of saved DPI to avoid display-dependent issues
     # (Retina displays, Windows scaling, etc. can cause saved DPI to differ)
@@ -2368,9 +2539,13 @@ def dump_cpc_session(
             'right_y': float(getattr(ax2, '_right_ylabel_manual_offset_y_pts', 0.0) or 0.0),
         }
         
+        # Get current package versions for compatibility checking
+        package_versions = _get_package_versions()
+        
         meta = {
             'kind': 'cpc',
             'version': 2,  # Incremented version for new format
+            'package_versions': package_versions,  # Track versions for compatibility checking
             'figure': {
                 'size': (fig_w, fig_h),
                 'dpi': dpi,
@@ -2526,12 +2701,38 @@ def load_cpc_session(filename: str):
     try:
         with open(filename, 'rb') as f:
             sess = pickle.load(f)
+    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: {filename}")
+            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: {filename}")
+            print(f"Error: {e}")
+            print("This usually indicates a package version mismatch.")
+            print("Try installing matching package versions or recreate the session.")
+        return None
     except Exception as e:
         print(f"Failed to load session: {e}")
         return None
     if not isinstance(sess, dict) or sess.get('kind') != 'cpc':
         print("Not a CPC session file.")
         return None
+    
+    # Check package version compatibility
+    saved_versions = sess.get('package_versions', {})
+    current_versions = _get_package_versions()
+    if not _check_package_compatibility(saved_versions, current_versions, filename):
+        return None
     try:
         # Use standard DPI of 100 instead of saved DPI to avoid display-dependent issues
         # (Retina displays, Windows scaling, etc. can cause saved DPI to differ)

batplot/style.py

@@ -358,6 +358,13 @@ def print_style_info(
     print(f"Font family chain (rcParams['font.sans-serif']): {plt.rcParams.get('font.sans-serif')}")
     print(f"Mathtext fontset: {plt.rcParams.get('mathtext.fontset')}")
 
+    # Report whether data axes were swapped via --ro when this figure was created
+    try:
+        ro_active = bool(getattr(fig, "_ro_active", False))
+    except Exception:
+        ro_active = False
+    print(f"Data axes swapped via --ro: {'YES' if ro_active else 'no'}")
+
     # Rotation angle
     rotation_angle = getattr(ax, '_rotation_angle', 0)
     if rotation_angle != 0:
@@ -646,6 +653,8 @@ def export_style_config(
         }
         # Save rotation angle
         cfg["rotation_angle"] = getattr(ax, '_rotation_angle', 0)
+        # Track whether data axes were swapped via --ro when this style was saved
+        cfg["ro_active"] = bool(getattr(fig, '_ro_active', False))
         
         # Save curve names visibility
         cfg["curve_names_visible"] = True  # Default to visible
@@ -853,6 +862,17 @@ def apply_style_config(
     except Exception as e:
         print(f"Could not read config: {e}")
         return
+    # Enforce compatibility between style/geometry 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: 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 style/geometry to avoid corrupting axis orientation.")
+        return
     # Save current labelpad values BEFORE any style changes
     saved_xlabelpad = None
     saved_ylabelpad = None
@@ -878,8 +898,7 @@ def apply_style_config(
                 if not keep_canvas_fixed:
                     # Use forward=False to prevent automatic subplot adjustment that can shift the plot
                     fig.set_size_inches(fw, fh, forward=False)
-                else:
-                    print("(Canvas fixed) Ignoring style figure size request.")
+                # No message needed when canvas is fixed - this is normal behavior
             except Exception as e:
                 print(f"Warning: could not parse figure size: {e}")
         try:

{batplot-1.8.2.dist-info → batplot-1.8.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.8.2
+Version: 1.8.3
 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.2.dist-info → batplot-1.8.3.dist-info}/RECORD

@@ -1,28 +1,28 @@
-batplot/__init__.py,sha256=cmYE6SKId-NqANj2k5EUEXFUnzP58FNBG7XRF6CLfgQ,118
+batplot/__init__.py,sha256=RAScNSaXpWIGw1hbfjWc2RDcKAf-ftvoSfY-3DOZTF0,118
 batplot/args.py,sha256=mrDjMURp_OQnXrAwl9WnE_FW4HJu940O7NmL9QWQnD4,35189
-batplot/batch.py,sha256=YQ7obCIqLCObwDbM7TXpOBh7g7BO95wZNsa2Fy84c6o,53858
-batplot/batplot.py,sha256=Avb0Txs-VaG1UU-bL-7HWnZf_8RS_n-KTnZz9O_3GPA,174374
+batplot/batch.py,sha256=P2HNBYqrSzDr2fruYz8BFKwNFX6vdJpHDZpaG_hmEc8,55253
+batplot/batplot.py,sha256=Yd6wyMTRgu65BY9ousd_3Zxoauce99vYqzeSgqhxv8U,177164
 batplot/cif.py,sha256=JfHwNf3SHrcpALc_F5NjJmQ3lg71MBRSaIUJjGYPTx8,30120
 batplot/cli.py,sha256=ScDb2je8VQ0mz_z0SLCHEigiTuFPY5pb1snnzCouKms,5828
 batplot/color_utils.py,sha256=7InQLVo1XTg7sgAbltM2KeDSFJgr787YEaV9vJbIoWY,20460
 batplot/config.py,sha256=6nGY7fKN4T5KZUGQS2ArUBgEkLAL0j37XwG5SCVQgKA,6420
 batplot/converters.py,sha256=rR2WMPM0nR5E3eZI3gWbaJf_AfbdQx3urVSbJmZXNzo,8237
-batplot/cpc_interactive.py,sha256=r70RVu75QAPEWkK_bR4c3MWDXNSwHYxOAYGEVf0TgUg,238755
-batplot/electrochem_interactive.py,sha256=ti7V8BoAxUk4BD_vDRKAu5ydlHMl75htLvdVYFUUVsw,221778
-batplot/interactive.py,sha256=2hQrvV-7VEz0cscIb3Bc7qQ9MpRxP4hjZ6raEnpl5yg,206779
+batplot/cpc_interactive.py,sha256=qadWV2PaQMsqM16mSp5r1-WP7di0JCnzNI4RJy27alo,239616
+batplot/electrochem_interactive.py,sha256=8mFr5vtWb_ZDiJmZWXjkARq21D2GflT8-J2xvCGvDIc,222769
+batplot/interactive.py,sha256=5u2ulhTzRr7fA-INc5hfcz7xaHObnnigiXjrgdtE7XE,206728
 batplot/manual.py,sha256=pbRI6G4Pm12pOW8LrOLWWu7IEOtqWN3tRHtgge50LlA,11556
 batplot/modes.py,sha256=qE2OsOQQKhwOWene5zxJeuuewTrZxubtahQuz5je7ok,37252
 batplot/operando.py,sha256=p2Ug1mFUQxaU702cTBGgJKb3_v1C2p3LLUwfXaVBpPY,28311
 batplot/operando_ec_interactive.py,sha256=8GQ47-I8SLTS88sFEk8m3vDxFEjSfD3hao62Qke7SxA,305137
 batplot/plotting.py,sha256=hG2_EdDhF1Qpn1XfZKdCQ5-w_m9gUYFbr804UQ5QjsU,10841
 batplot/readers.py,sha256=kAI0AvYrdfGRZkvADJ4riN96IWtrH24aAoZpBtONTbw,112960
-batplot/session.py,sha256=WuBZR-HKDr4VlqjwynyK8gCkx6xLoHzNaGBH948p9jU,135638
-batplot/style.py,sha256=ig1ozX4dhEsXf5JKaPZOvgVS3CWx-BTFSc3vfAH3Y-E,62274
+batplot/session.py,sha256=5eZLJHE66wtZPwNsnR1I2iyEvxY3cLTl3aY7HNxpX6U,145772
+batplot/style.py,sha256=jXtFaJR1aa6vIHupmDNqY2NY5Rgtw49UxF7cS4y8fCA,63375
 batplot/ui.py,sha256=ifpbK74juUzLMCt-sJGVaWtpDb1NMRJzs2YyiwwafzY,35302
 batplot/utils.py,sha256=LY2-Axr3DsQMTxuXe48vSjrLJKEnkzkZjdSFdQizbpg,37599
 batplot/version_check.py,sha256=--U_74DKgHbGtVdBsg9DfUJ10S5-OMXT-rzaYjK0JBc,9997
 batplot/data/USER_MANUAL.md,sha256=VYPvNZt3Fy8Z4Izr2FnQBw9vEaFTPkybhHDnF-OuKws,17694
-batplot-1.8.2.dist-info/licenses/LICENSE,sha256=2PAnHeCiTfgI7aKZLWr0G56HI9fGKQ0CEbQ02H-yExQ,1065
+batplot-1.8.3.dist-info/licenses/LICENSE,sha256=2PAnHeCiTfgI7aKZLWr0G56HI9fGKQ0CEbQ02H-yExQ,1065
 batplot_backup_20251121_223043/__init__.py,sha256=3s2DUQuTbWs65hoN9cQQ8IiJbaFJY8fNxiCpwRBYoOA,118
 batplot_backup_20251121_223043/args.py,sha256=OH-h84QhN-IhMS8sPAsSEqccHD3wpeMgmXa_fqv5xtg,21215
 batplot_backup_20251121_223043/batch.py,sha256=oI7PONJyciHDOqNPq-8fnOQMyn9CpAdVznKaEdsy0ig,48650
@@ -68,8 +68,8 @@ batplot_backup_20251221_101150/style.py,sha256=ig1ozX4dhEsXf5JKaPZOvgVS3CWx-BTFS
 batplot_backup_20251221_101150/ui.py,sha256=ifpbK74juUzLMCt-sJGVaWtpDb1NMRJzs2YyiwwafzY,35302
 batplot_backup_20251221_101150/utils.py,sha256=LY2-Axr3DsQMTxuXe48vSjrLJKEnkzkZjdSFdQizbpg,37599
 batplot_backup_20251221_101150/version_check.py,sha256=ztTHwqgWd8OlS9PLLY5A_TabWxBASDA_-5yyN15PZC8,9996
-batplot-1.8.2.dist-info/METADATA,sha256=ZNkBWCjEFRJVKuq1FtQ9JCovRWnEm3lmqWs8eYsvMzU,7406
-batplot-1.8.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-batplot-1.8.2.dist-info/entry_points.txt,sha256=73GgH3Zs-qGIvgiyQLgGsSW-ryOwPPKHveOW6TDIR5Q,82
-batplot-1.8.2.dist-info/top_level.txt,sha256=Z5Q4sAiT_FDqZqhlLsYn9avRTuFAEEf3AVfkswxOb18,70
-batplot-1.8.2.dist-info/RECORD,,
+batplot-1.8.3.dist-info/METADATA,sha256=BNWy96koh0Pcj9CDJYuJ6Xp44krYa8Wg9SM1T4qhYhA,7406
+batplot-1.8.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+batplot-1.8.3.dist-info/entry_points.txt,sha256=73GgH3Zs-qGIvgiyQLgGsSW-ryOwPPKHveOW6TDIR5Q,82
+batplot-1.8.3.dist-info/top_level.txt,sha256=Z5Q4sAiT_FDqZqhlLsYn9avRTuFAEEf3AVfkswxOb18,70
+batplot-1.8.3.dist-info/RECORD,,