batplot 1.8.5__py3-none-any.whl → 1.8.6__py3-none-any.whl

batplot/style.py

@@ -8,6 +8,7 @@ from __future__ import annotations
 from typing import List, Dict, Any, Callable, Optional
 import json
 import importlib
+import os
 import sys
 import numpy as np
 import matplotlib.pyplot as plt
@@ -520,6 +521,7 @@ def export_style_config(
     base_path: Optional[str] = None,
     show_cif_titles: Optional[bool] = None,
     overwrite_path: Optional[str] = None,
+    force_kind: Optional[str] = None,
 ) -> Optional[str]:
     """Export style configuration after displaying a summary and prompting the user.
     
@@ -604,6 +606,8 @@ def export_style_config(
                 "x_minor_width": axis_tick_width(ax.xaxis, "minor"),
                 "y_major_width": axis_tick_width(ax.yaxis, "major"),
                 "y_minor_width": axis_tick_width(ax.yaxis, "minor"),
+                "lengths": dict(getattr(fig, '_tick_lengths', {})),
+                "direction": getattr(fig, '_tick_direction', 'out'),
             },
             "wasd_state": wasd_state,
             "spines": {
@@ -726,18 +730,22 @@ def export_style_config(
         # as style files are for styling only, and the data would be specific
         # to the dataset. Session files (pickle) store this data instead.
         
-        # If overwrite_path is provided, determine export type from existing file
+        # If overwrite_path is provided, determine export type from existing file,
+        # unless the caller explicitly forces style-only or style+geometry.
         if overwrite_path:
-            try:
-                with open(overwrite_path, 'r', encoding='utf-8') as f:
-                    old_cfg = json.load(f)
-                old_kind = old_cfg.get('kind', '')
-                if old_kind == 'xy_style_geom':
-                    exp_choice = 'psg'
-                else:
-                    exp_choice = 'ps'
-            except Exception:
-                exp_choice = 'ps'  # Default to style-only if can't read
+            if force_kind in ('ps', 'psg'):
+                exp_choice = force_kind
+            else:
+                try:
+                    with open(overwrite_path, 'r', encoding='utf-8') as f:
+                        old_cfg = json.load(f)
+                    old_kind = old_cfg.get('kind', '')
+                    if old_kind == 'xy_style_geom':
+                        exp_choice = 'psg'
+                    else:
+                        exp_choice = 'ps'
+                except Exception:
+                    exp_choice = 'ps'  # Default to style-only if can't read
         else:
             # Ask user for style-only or style+geometry
             print("\nExport options:")
@@ -907,6 +915,34 @@ def apply_style_config(
             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
+
+    # --- Style-import check messages (to debug y-axis / curve visibility after import)
+    # Disabled by default; set BATPLOT_STYLE_DEBUG=1 to enable. ---
+    _style_debug = os.environ.get("BATPLOT_STYLE_DEBUG", "0") == "1"
+    if _style_debug:
+        kind = cfg.get("kind", "")
+        has_geom = "geometry" in cfg and isinstance(cfg.get("geometry"), dict)
+        geom_ylim = cfg.get("geometry", {}).get("ylim") if has_geom else None
+        print("[style-import check] BEFORE applying style:")
+        print(f"  kind={kind!r}  has_geometry={has_geom}  geom_ylim={geom_ylim}")
+        try:
+            xlim0, xlim1 = ax.get_xlim()
+            ylim0, ylim1 = ax.get_ylim()
+            print(f"  ax xlim=({xlim0}, {xlim1})  ylim=({ylim0}, {ylim1})")
+        except Exception as e:
+            print(f"  ax get_xlim/get_ylim failed: {e}")
+        nlines = len(ax.lines)
+        print(f"  n_ax.lines={nlines}  n_cfg.lines={len(cfg.get('lines', []))}")
+        if orig_y is not None:
+            print(f"  len(orig_y)={len(orig_y)}  len(offsets_list)={len(offsets_list) if offsets_list else 0}")
+        for i in range(nlines):
+            ln = ax.lines[i]
+            xd, yd = ln.get_data()
+            ymn = float(yd.min()) if yd.size else float("nan")
+            ymx = float(yd.max()) if yd.size else float("nan")
+            print(f"  line[{i}] y_range=({ymn}, {ymx})  n_pts={len(yd)}")
+    # --- end check ---
+
     # Save current labelpad values BEFORE any style changes
     saved_xlabelpad = None
     saved_ylabelpad = None
@@ -955,6 +991,12 @@ def apply_style_config(
                 fig.subplots_adjust(left=left, right=left + w_frac, bottom=bottom, top=bottom + h_frac)
         except Exception as e:
             print(f"[DEBUG] Exception in frame/axes fraction adjustment: {e}")
+        if _style_debug:
+            try:
+                ylim0, ylim1 = ax.get_ylim()
+                print(f"[style-import check] AFTER figure size/axes_frac: ax ylim=({ylim0}, {ylim1})")
+            except Exception:
+                pass
         # Don't restore DPI from style - use system default to avoid display-dependent issues
         # (Retina displays, Windows scaling, etc. can cause saved DPI to differ)
 
@@ -1135,6 +1177,32 @@ def apply_style_config(
                     ax.tick_params(axis="y", which="minor", width=yminr)
             except Exception as e:
                 print(f"[DEBUG] Exception setting tick widths: {e}")
+        # Tick lengths (t submenu)
+        tick_lengths = ticks_cfg.get("lengths") or {}
+        if isinstance(tick_lengths, dict):
+            try:
+                major_len = tick_lengths.get("major")
+                minor_len = tick_lengths.get("minor")
+                if major_len is not None:
+                    ax.tick_params(axis="both", which="major", length=float(major_len))
+                    if not hasattr(fig, '_tick_lengths'):
+                        fig._tick_lengths = {}
+                    fig._tick_lengths['major'] = float(major_len)
+                if minor_len is not None:
+                    ax.tick_params(axis="both", which="minor", length=float(minor_len))
+                    if not hasattr(fig, '_tick_lengths'):
+                        fig._tick_lengths = {}
+                    fig._tick_lengths['minor'] = float(minor_len)
+            except Exception as e:
+                print(f"Warning: Could not restore tick lengths: {e}")
+        # Tick direction (t submenu)
+        tick_direction = ticks_cfg.get("direction")
+        if tick_direction:
+            try:
+                setattr(fig, '_tick_direction', tick_direction)
+                ax.tick_params(axis="both", which="both", direction=tick_direction)
+            except Exception as e:
+                print(f"Warning: Could not restore tick direction: {e}")
 
     # Spines
         for name, sp_dict in cfg.get("spines", {}).items():
@@ -1213,19 +1281,33 @@ def apply_style_config(
                 except Exception:
                     pass
             # Restore offset if available
-            if "offset" in entry and offsets_list is not None and orig_y is not None and x_data_list is not None:
+            # Use current displayed y and current offset to get baseline, then apply file offset.
+            # (orig_y can be wrong in stacked sessions—e.g. already offset—so we derive baseline here.)
+            if "offset" in entry and offsets_list is not None and x_data_list is not None:
                 try:
                     offset_val = float(entry["offset"])
-                    if idx < len(offsets_list):
+                    if idx < len(offsets_list) and idx < len(y_data_list) and idx < len(x_data_list):
+                        current_y = y_data_list[idx]
+                        current_offset = offsets_list[idx]
+                        baseline = current_y - current_offset
+                        y_with_offset = baseline + offset_val
                         offsets_list[idx] = offset_val
-                        # Reapply offset to the curve
-                        if idx < len(orig_y) and idx < len(y_data_list) and idx < len(x_data_list):
-                            y_norm = orig_y[idx]
-                            y_with_offset = y_norm + offset_val
-                            y_data_list[idx] = y_with_offset
-                            ln.set_data(x_data_list[idx], y_with_offset)
+                        y_data_list[idx] = y_with_offset
+                        ln.set_data(x_data_list[idx], y_with_offset)
+                        if orig_y is not None and idx < len(orig_y):
+                            orig_y[idx] = np.asarray(baseline, dtype=float)
+                        if _style_debug:
+                            bmin, bmax = (float(baseline.min()), float(baseline.max())) if getattr(baseline, "size", 0) else (float("nan"), float("nan"))
+                            ymin, ymax = (float(y_with_offset.min()), float(y_with_offset.max())) if getattr(y_with_offset, "size", 0) else (float("nan"), float("nan"))
+                            print(f"[style-import check] line[{idx}] offset_from_file={offset_val} baseline=({bmin}, {bmax}) y_with_offset=({ymin}, {ymax})")
                 except Exception as e:
                     print(f"Warning: Could not restore offset for curve {idx+1}: {e}")
+        if _style_debug:
+            try:
+                ylim0, ylim1 = ax.get_ylim()
+                print(f"[style-import check] AFTER lines/offset restore: ax ylim=({ylim0}, {ylim1})")
+            except Exception as e:
+                print(f"[style-import check] AFTER lines: get_ylim failed: {e}")
         palette_cfg = cfg.get("curve_palettes", [])
         if palette_cfg:
             sanitized_history = []
@@ -1425,11 +1507,19 @@ def apply_style_config(
                 if 'xlim' in geom and isinstance(geom['xlim'], list) and len(geom['xlim']) == 2:
                     ax.set_xlim(geom['xlim'][0], geom['xlim'][1])
                 if 'ylim' in geom and isinstance(geom['ylim'], list) and len(geom['ylim']) == 2:
+                    if _style_debug:
+                        print(f"[style-import check] Applying geometry ylim=({geom['ylim'][0]}, {geom['ylim'][1]})")
                     ax.set_ylim(geom['ylim'][0], geom['ylim'][1])
                 print("Applied geometry (labels and limits)")
             except Exception as e:
                 print(f"Warning: Could not apply geometry: {e}")
         
+        if _style_debug:
+            try:
+                ylim0, ylim1 = ax.get_ylim()
+                print(f"[style-import check] FINAL (before draw_idle): ax ylim=({ylim0}, {ylim1})")
+            except Exception as e:
+                print(f"[style-import check] FINAL get_ylim failed: {e}")
         try:
             fig.canvas.draw_idle()
         except Exception as e:

{batplot-1.8.5.dist-info → batplot-1.8.6.dist-info}/METADATA

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

@@ -1,28 +1,28 @@
-batplot/__init__.py,sha256=6mfbpfSzbSfjCLrvmBzBMKmDyiFSBUJlcB8Qqv6o26s,118
+batplot/__init__.py,sha256=Fy71HWPcaheFTg920KgEZ7reiHA27RQ-B6mxzpc8ZbI,118
 batplot/args.py,sha256=DGTe2PKmJnI8Iq12QgO76V8lZvWhMOqY14gsyE5SgEs,37001
 batplot/batch.py,sha256=hqLNvd88OLd0PLo_ot6JjC3FM6wwxCJ1jO2J63f9Zyg,55899
-batplot/batplot.py,sha256=-mAf1aW7bniyfQ5DCorqyOr-OcRtUgRtq6TZHKk5xCU,184599
+batplot/batplot.py,sha256=zD9kTLMKzYf73Ptn8jTOSeYZbxFzxlKxtrAE6bFHHNQ,187980
 batplot/cif.py,sha256=JfHwNf3SHrcpALc_F5NjJmQ3lg71MBRSaIUJjGYPTx8,30120
 batplot/cli.py,sha256=2-7NtxBlyOUfzHVwP7vZK7OZlyKyPVy-3daKN-MPWyU,6657
 batplot/color_utils.py,sha256=7InQLVo1XTg7sgAbltM2KeDSFJgr787YEaV9vJbIoWY,20460
 batplot/config.py,sha256=6nGY7fKN4T5KZUGQS2ArUBgEkLAL0j37XwG5SCVQgKA,6420
 batplot/converters.py,sha256=c4qhgN9zHUiBZhXVAdf0zGtPPoktD3JjMLkhjjYEwlk,9787
-batplot/cpc_interactive.py,sha256=-9etN342VqLbY9pLP7cyBcSzgVHuWpDwEZHkXzShl7E,240683
-batplot/electrochem_interactive.py,sha256=a3ocYQEfi0FsiMq9B4_0GY97td00e8uyzlHc3Sr6EKE,225211
-batplot/interactive.py,sha256=b-0xeza_Rs4S59ve-pyWVq_-FvTpqDIy1tu4M3tT3Eg,300447
+batplot/cpc_interactive.py,sha256=pPx6B8IN9YYnc7TWJnTV_2ZxcotCBXD29Db7G7ool-4,247355
+batplot/electrochem_interactive.py,sha256=Ui1_E-oTNvk7bKossx1MyULNHosFMFnl2a_EAOE550E,225991
+batplot/interactive.py,sha256=BTcr8ZtmWdID4uKiDA7KW72p9tfaC6sNhMZvhVA6py0,311985
 batplot/manual.py,sha256=pbRI6G4Pm12pOW8LrOLWWu7IEOtqWN3tRHtgge50LlA,11556
-batplot/modes.py,sha256=qE2OsOQQKhwOWene5zxJeuuewTrZxubtahQuz5je7ok,37252
+batplot/modes.py,sha256=BajbnDzzYRD-FRr5Hoft0TyQ5CTWyggJjKa9yrM6iy4,37376
 batplot/operando.py,sha256=h09xu1BsdR68YlzhWeUSypYX83DzjJABIQQS2noQzPI,29400
-batplot/operando_ec_interactive.py,sha256=YExiuKn-qQksW3YFYCTpvumuCit4cc4YiiaSRWGa0og,317833
+batplot/operando_ec_interactive.py,sha256=at0ZTk5jSLc2Tm5NEtXl8_neyFJayp8aSrtJEM3vIqc,326058
 batplot/plotting.py,sha256=hG2_EdDhF1Qpn1XfZKdCQ5-w_m9gUYFbr804UQ5QjsU,10841
 batplot/readers.py,sha256=kAI0AvYrdfGRZkvADJ4riN96IWtrH24aAoZpBtONTbw,112960
-batplot/session.py,sha256=sgcJyCj00lOhmIRdDxGSqu2vEpOm7WSFZzLXxukYNL0,144936
-batplot/style.py,sha256=3XnWlU9aTb1b-aiq5BQOuAREE5nOEYZ0b75v_LS0xDM,67790
+batplot/session.py,sha256=6kVDR_7Lm6vUdxt9DaeI_UBV6uNqVaFqKveegrSaXyk,147407
+batplot/style.py,sha256=RZKoRO77lxHZhxJ8q2mjEPJoCXvv8pYu-Z2-H-_YeoA,72826
 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=w6pmDXoLINFkCWWh3zay7uNIxUaDxSOrocnPIZwu2uA,19542
-batplot-1.8.5.dist-info/licenses/LICENSE,sha256=2PAnHeCiTfgI7aKZLWr0G56HI9fGKQ0CEbQ02H-yExQ,1065
+batplot-1.8.6.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.5.dist-info/METADATA,sha256=WTflN9nVzAXg4xPnjpjfJeRNhuyUaXaJKBLyjhjVxko,7175
-batplot-1.8.5.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-batplot-1.8.5.dist-info/entry_points.txt,sha256=73GgH3Zs-qGIvgiyQLgGsSW-ryOwPPKHveOW6TDIR5Q,82
-batplot-1.8.5.dist-info/top_level.txt,sha256=Z5Q4sAiT_FDqZqhlLsYn9avRTuFAEEf3AVfkswxOb18,70
-batplot-1.8.5.dist-info/RECORD,,
+batplot-1.8.6.dist-info/METADATA,sha256=3vYzKlIUX7G_DynQgFBh-Weezl7GTs6u1a3vb2-Ir9w,7175
+batplot-1.8.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+batplot-1.8.6.dist-info/entry_points.txt,sha256=73GgH3Zs-qGIvgiyQLgGsSW-ryOwPPKHveOW6TDIR5Q,82
+batplot-1.8.6.dist-info/top_level.txt,sha256=Z5Q4sAiT_FDqZqhlLsYn9avRTuFAEEf3AVfkswxOb18,70
+batplot-1.8.6.dist-info/RECORD,,