batplot 1.7.26__tar.gz → 1.7.28__tar.gz

{batplot-1.7.26/batplot.egg-info → batplot-1.7.28}/PKG-INFO

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

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

{batplot-1.7.26 → batplot-1.7.28}/batplot/cpc_interactive.py

@@ -2090,6 +2090,10 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                         if yn != 'y':
                             _print_menu(); continue
                 if target:
+                    # Ensure exact case is preserved (important for macOS case-insensitive filesystem)
+                    from .utils import ensure_exact_case_filename
+                    target = ensure_exact_case_filename(target)
+                    
                     # Save current legend position before export (savefig can change layout)
                     saved_legend_pos = None
                     try:

{batplot-1.7.26 → batplot-1.7.28}/batplot/electrochem_interactive.py

@@ -1684,6 +1684,10 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     if not already_confirmed and os.path.exists(target):
                         target = _confirm_overwrite(target)
                     if target:
+                        # Ensure exact case is preserved (important for macOS case-insensitive filesystem)
+                        from .utils import ensure_exact_case_filename
+                        target = ensure_exact_case_filename(target)
+                        
                         # Save current legend position before export (savefig can change layout)
                         saved_legend_pos = None
                         try:

{batplot-1.7.26 → batplot-1.7.28}/batplot/interactive.py

@@ -3709,6 +3709,10 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                 if not export_target:
                     print("Export canceled.")
                 else:
+                        # Ensure exact case is preserved (important for macOS case-insensitive filesystem)
+                        from .utils import ensure_exact_case_filename
+                        export_target = ensure_exact_case_filename(export_target)
+                        
                         # Temporarily remove numbering for export
                         for i, txt in enumerate(label_text_objects):
                             txt.set_text(labels[i])

{batplot-1.7.26 → batplot-1.7.28}/batplot/operando.py

@@ -386,7 +386,7 @@ def plot_operando_folder(folder: str, args) -> Tuple[plt.Figure, plt.Axes, Dict[
                     x_data, y_data, current_mA, x_label, y_label = result
                     # For EC-Lab files: x_label='Time (h)', y_label='Voltage (V)'
                     # For simple files: x_label could be 'Time(h)', 'time', etc.
-                    # EC-Lab returns time in seconds, needs conversion to hours
+                    # EC-Lab files: read_mpt_file already converts time from seconds to hours
                     # operando plots with voltage on X-axis and time on Y-axis
                     
                     # Check if labels indicate time/voltage data (flexible matching)
@@ -400,8 +400,8 @@ def plot_operando_folder(folder: str, args) -> Tuple[plt.Figure, plt.Axes, Dict[
                     is_time_voltage = (has_time_in_x or has_time_in_y) and (has_voltage_in_x or has_voltage_in_y)
                     
                     if x_label == 'Time (h)' and y_label == 'Voltage (V)':
-                        # EC-Lab file: convert time to hours and swap axes
-                        time_h = np.asarray(x_data, float) / 3600.0
+                        # EC-Lab file: time is already in hours from read_mpt_file, just swap axes
+                        time_h = np.asarray(x_data, float)  # Already in hours, no conversion needed
                         voltage_v = np.asarray(y_data, float)
                         x_data = voltage_v
                         y_data = time_h

{batplot-1.7.26 → batplot-1.7.28}/batplot/operando_ec_interactive.py

@@ -344,6 +344,64 @@ def _update_custom_colorbar(cbar_ax, im=None, label=None, label_mode=None):
     _draw_custom_colorbar(cbar_ax, im, label, label_mode)
 
 
+def _detach_mpl_colorbar_callbacks(cbar, im) -> None:
+    """Detach a Matplotlib Colorbar from its mappable callbacks.
+
+    Why this exists:
+    - In this interactive menu we draw a *custom* colorbar by clearing/redrawing `cbar.ax`.
+    - If `cbar` is a real `matplotlib.colorbar.Colorbar` (e.g., loaded from a session),
+      it remains connected to `im` via `im.callbacksSM`. Subsequent `im.set_clim()` /
+      `im.set_cmap()` triggers `Colorbar.update_normal()`, which can crash after we
+      cleared/redrew the axes (observed as: NotImplementedError: cannot remove artist).
+    - We therefore disconnect that callback once and always update the custom colorbar
+      via `_update_custom_colorbar(...)`.
+    """
+    try:
+        if cbar is None or im is None:
+            return
+        cax = getattr(cbar, 'ax', None)
+        if cax is not None and getattr(cax, '_bp_detached_mpl_colorbar', False):
+            return
+
+        # Matplotlib's Colorbar stores the callback id as `_cid` (most versions).
+        cid = None
+        for attr in ('_cid', '_cid_colorbar', 'cid'):
+            try:
+                v = getattr(cbar, attr, None)
+                if isinstance(v, int):
+                    cid = v
+                    break
+            except Exception:
+                pass
+
+        # Disconnect from the ScalarMappable callback registry.
+        if cid is not None:
+            try:
+                cbreg = getattr(im, 'callbacksSM', None)
+                if cbreg is not None and hasattr(cbreg, 'disconnect'):
+                    cbreg.disconnect(cid)
+            except Exception:
+                pass
+
+        # Prevent future built-in updates (best-effort; safe for mock colorbars too).
+        try:
+            if hasattr(cbar, 'mappable'):
+                cbar.mappable = None
+        except Exception:
+            pass
+        try:
+            if hasattr(cbar, 'solids'):
+                cbar.solids = None
+        except Exception:
+            pass
+
+        if cax is not None:
+            setattr(cax, '_bp_detached_mpl_colorbar', True)
+    except Exception:
+        # Never let detaching break the interactive menu.
+        return
+
+
 def _ensure_fixed_params(fig, ax, cbar_ax, ec_ax):
     """Initialize and return fixed geometry parameters in inches.
     
@@ -540,6 +598,11 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
     # Normalize file path list for downstream helpers
     file_paths = list(file_paths) if file_paths else []
 
+    # If we were given a real Matplotlib Colorbar (e.g. from session load),
+    # detach it from `im` immediately. This must happen before any function
+    # that may clear/redraw `cbar.ax` (custom colorbar) is called.
+    _detach_mpl_colorbar_callbacks(cbar, im)
+
     def _renormalize_to_visible():
         """Adjust color scale to match the intensity range of the currently visible region.
         
@@ -904,6 +967,9 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
     # Initialize custom colorbar (replaces matplotlib's colorbar)
     cbar_label = getattr(cbar.ax, '_colorbar_label', 'Intensity')
     cbar_label_mode = getattr(fig, '_colorbar_label_mode', 'normal')
+    # If we were given a real Matplotlib Colorbar (e.g. from session load),
+    # detach it from `im` before we clear/redraw the axes for the custom colorbar.
+    _detach_mpl_colorbar_callbacks(cbar, im)
     _draw_custom_colorbar(cbar.ax, im, cbar_label, cbar_label_mode)
     # Decrease distance between operando and EC plots once per session
     if not getattr(ec_ax, '_ec_gap_adjusted', False):
@@ -1204,7 +1270,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 if snap.get('cmap'):
                     im.set_cmap(snap['cmap'])
                     if cbar is not None:
-                        cbar.update_normal(im)
+                        _update_custom_colorbar(cbar.ax, im)
             except Exception:
                 pass
             # Restore colorbar side (ticks/label) and redraw custom colorbar to keep position
@@ -1765,6 +1831,10 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     target = _co(target)
                 if not target:
                     print_menu(); continue
+                # Ensure exact case is preserved (important for macOS case-insensitive filesystem)
+                from .utils import ensure_exact_case_filename
+                target = ensure_exact_case_filename(target)
+                
                 _, ext = os.path.splitext(target)
                 if ext.lower() == '.svg':
                     try:
@@ -2052,6 +2122,19 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             print_menu(); continue
                     dump_operando_session(target, fig=fig, ax=ax, im=im, cbar=cbar, ec_ax=ec_ax, skip_confirm=True)
                     fig._last_session_save_path = target
+                    # Show the actual filename that was saved (in case of case differences on macOS)
+                    actual_name = os.path.basename(target)
+                    if os.path.exists(target):
+                        # Get the actual filename as stored on disk (for case-sensitive display)
+                        try:
+                            dir_files = os.listdir(folder)
+                            for f in dir_files:
+                                if f.lower() == actual_name.lower():
+                                    actual_name = f
+                                    break
+                        except Exception:
+                            pass
+                    print(f"Operando session saved to {os.path.join(folder, actual_name)}")
             except Exception as e:
                 print(f"Save failed: {e}")
             print_menu(); continue
@@ -3777,6 +3860,10 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                             if yn != 'y':
                                 target = None
                     if target:
+                        # Ensure exact case is preserved (important for macOS case-insensitive filesystem)
+                        from .utils import ensure_exact_case_filename
+                        target = ensure_exact_case_filename(target)
+                        
                         with open(target, 'w', encoding='utf-8') as f:
                             json.dump(cfg, f, indent=2)
                         print(f"Exported style to {target}")
@@ -3900,7 +3987,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                     try:
                         im.set_cmap(cmap)
                         if cbar is not None:
-                            cbar.update_normal(im)
+                            _update_custom_colorbar(cbar.ax, im)
                     except Exception:
                         pass
                 

{batplot-1.7.26 → batplot-1.7.28}/batplot/session.py

@@ -519,6 +519,10 @@ def dump_session(
             if not target:
                 print("Session save canceled.")
                 return
+        # Ensure exact case is preserved (important for macOS case-insensitive filesystem)
+        from .utils import ensure_exact_case_filename
+        target = ensure_exact_case_filename(target)
+        
         with open(target, 'wb') as f:
             pickle.dump(sess, f)
         print(f"Session saved to {target}")
@@ -663,6 +667,16 @@ def dump_operando_session(
         # Capture operando WASD state, spines, and tick widths
         op_wasd_state = _capture_wasd_state(ax)
         op_spines, op_ticks = _capture_spine_tick_widths(ax)
+        
+        # Capture operando title offsets
+        op_title_offsets = {
+            'top_y': float(getattr(ax, '_top_xlabel_manual_offset_y_pts', 0.0) or 0.0),
+            'top_x': float(getattr(ax, '_top_xlabel_manual_offset_x_pts', 0.0) or 0.0),
+            'bottom_y': float(getattr(ax, '_bottom_xlabel_manual_offset_y_pts', 0.0) or 0.0),
+            'left_x': float(getattr(ax, '_left_ylabel_manual_offset_x_pts', 0.0) or 0.0),
+            'right_x': float(getattr(ax, '_right_ylabel_manual_offset_x_pts', 0.0) or 0.0),
+            'right_y': float(getattr(ax, '_right_ylabel_manual_offset_y_pts', 0.0) or 0.0),
+        }
 
         # EC panel (optional)
         ec_state = None
@@ -783,6 +797,10 @@ def dump_operando_session(
             if not target:
                 print("Session save canceled.")
                 return
+        # Ensure exact case is preserved (important for macOS case-insensitive filesystem)
+        from .utils import ensure_exact_case_filename
+        target = ensure_exact_case_filename(target)
+        
         with open(target, 'wb') as f:
             pickle.dump(sess, f)
         print(f"Operando session saved to {target}")

{batplot-1.7.26 → batplot-1.7.28}/batplot/style.py

@@ -787,6 +787,10 @@ def export_style_config(
                         print("Style export canceled.")
                         return None
 
+        # Ensure exact case is preserved (important for macOS case-insensitive filesystem)
+        from .utils import ensure_exact_case_filename
+        target_path = ensure_exact_case_filename(target_path)
+        
         with open(target_path, "w", encoding="utf-8") as f:
             json.dump(cfg, f, indent=2)
         print(f"Exported style to {target_path}")

{batplot-1.7.26 → batplot-1.7.28}/batplot/utils.py

@@ -777,6 +777,54 @@ def choose_save_path(file_paths: list, purpose: str = "saving") -> Optional[str]
         return os.getcwd()
 
 
+def ensure_exact_case_filename(target_path: str) -> str:
+    """Ensure a file is saved with the exact case specified, even on case-insensitive filesystems.
+    
+    This function handles case-insensitive filesystems (macOS, Windows) by ensuring that
+    if a file exists with different case, it is removed first so the new file can be created
+    with the exact case specified by the user.
+    
+    On case-sensitive filesystems (Linux, Unix), this function is safe but has no effect
+    since files with different case are treated as different files.
+    
+    Args:
+        target_path: The desired file path with exact case
+    
+    Returns:
+        The same path (for compatibility)
+    """
+    folder = os.path.dirname(target_path)
+    desired_basename = os.path.basename(target_path)
+    
+    if not folder or not desired_basename:
+        return target_path
+    
+    try:
+        # Check if file already exists with exact case
+        if os.path.exists(target_path):
+            # Check if the actual filename on disk matches the desired case
+            existing_files = os.listdir(folder)
+            for existing_file in existing_files:
+                # If same name (case-insensitive) but different case, we need to fix it
+                if existing_file.lower() == desired_basename.lower() and existing_file != desired_basename:
+                    existing_path = os.path.join(folder, existing_file)
+                    # Delete the existing file with wrong case
+                    # This is safe on case-insensitive filesystems and has no effect on case-sensitive ones
+                    try:
+                        if os.path.exists(existing_path):
+                            os.remove(existing_path)
+                    except Exception:
+                        # Ignore errors (e.g., permission issues, file in use)
+                        pass
+                    break
+    except Exception:
+        # If we can't check/list the directory, just return the path as-is
+        # This is safe and ensures we don't break on permission errors
+        pass
+    
+    return target_path
+
+
 def _normalize_extension(ext: str) -> str:
     if not ext:
         return ext

{batplot-1.7.26 → batplot-1.7.28/batplot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.7.26
+Version: 1.7.28
 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.7.26 → batplot-1.7.28}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "batplot"
-version = "1.7.26"
+version = "1.7.28"
 description = "Interactive plotting tool for material science (1D plot) and electrochemistry (GC, CV, dQ/dV, CPC, operando) with batch processing"
 authors = [
     { name = "Tian Dai", email = "tianda@uio.no" }