batplot 1.3.0__tar.gz → 1.3.1__tar.gz

{batplot-1.3.0 → batplot-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.3.0
+Version: 1.3.1
 Summary: Interactive plotting for XRD, PDF, and XAS data (.xye, .xy, .qye, .dat, .csv, .gr, .nor, .chik, .chir)
 Author-email: Tian Dai <tianda@uio.no>
 License: MIT License
@@ -60,7 +60,7 @@ Dynamic: license-file
 - **Operando Analysis**: Correlate in-situ characterizations (XRD/PDF/XAS) with electrochemical data
 - **Interactive plotting**: Real-time editing customized for each type of plottings
 - **Session Persistence**: Save and reload complete plot states with `.pkl` files
-- **Style Management**: Import/export plot styles as `.bpcfg` files
+- **Style Management**: Import/export plot styles as `.bps`/`.bpsg` files
 - **Batch Processing**: Plot multiple files simultaneously with automatic SVG export
 
 ## Installation
@@ -130,6 +130,7 @@ batplot --operando --interactive
 | **Electrochemistry** | `.csv` (Neware), `.mpt` (Biologic) |
 | **XRD / PDF** | `.xye`, `.xy`, `.qye`, `.dat` |
 | **XAS** | `.nor`, `.chik`, `.chir` |
+| **Others** | `user defined` (plot first two columns as x and y) |
 
 ## Interactive Features
 
@@ -137,7 +138,7 @@ When launched with `--interactive`:
 - **Cycle/Scan Control**: Toggle visibility, change colors
 - **Styling**: Line widths, markers, transparency
 - **Axes**: Labels, limits, ticks, spine styles
-- **Export**: Save sessions (`.pkl`), styles (`.bpcfg`), or high-res images
+- **Export**: Save sessions (`.pkl`), styles (`.bps`/`.bpsg`), or high-res images
 - **Live Preview**: All changes update in real-time
 
 ## Documentation

{batplot-1.3.0 → batplot-1.3.1}/README.md

@@ -11,7 +11,7 @@
 - **Operando Analysis**: Correlate in-situ characterizations (XRD/PDF/XAS) with electrochemical data
 - **Interactive plotting**: Real-time editing customized for each type of plottings
 - **Session Persistence**: Save and reload complete plot states with `.pkl` files
-- **Style Management**: Import/export plot styles as `.bpcfg` files
+- **Style Management**: Import/export plot styles as `.bps`/`.bpsg` files
 - **Batch Processing**: Plot multiple files simultaneously with automatic SVG export
 
 ## Installation
@@ -81,6 +81,7 @@ batplot --operando --interactive
 | **Electrochemistry** | `.csv` (Neware), `.mpt` (Biologic) |
 | **XRD / PDF** | `.xye`, `.xy`, `.qye`, `.dat` |
 | **XAS** | `.nor`, `.chik`, `.chir` |
+| **Others** | `user defined` (plot first two columns as x and y) |
 
 ## Interactive Features
 
@@ -88,7 +89,7 @@ When launched with `--interactive`:
 - **Cycle/Scan Control**: Toggle visibility, change colors
 - **Styling**: Line widths, markers, transparency
 - **Axes**: Labels, limits, ticks, spine styles
-- **Export**: Save sessions (`.pkl`), styles (`.bpcfg`), or high-res images
+- **Export**: Save sessions (`.pkl`), styles (`.bps`/`.bpsg`), or high-res images
 - **Live Preview**: All changes update in real-time
 
 ## Documentation

batplot-1.3.1/batplot/__init__.py

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

{batplot-1.3.0 → batplot-1.3.1}/batplot/args.py

@@ -102,7 +102,7 @@ def _print_ec_help() -> None:
         "  batplot --all --dqdv my.bps            # Apply style to all dQdV plots\n"
         "  batplot --all --cpc geom.bpsg --mass 6 # Apply style+geom to all CPC plots\n\n"
         "Interactive (--interactive): choose cycles, colors/palettes, line widths, axis scales (linear/log/symlog),\n"
-        "rename axes, toggle ticks/titles/spines, print/export/import style (.bpcfg), save session (.pkl).\n"
+        "rename axes, toggle ticks/titles/spines, print/export/import style (.bps/.bpsg), save session (.pkl).\n"
         "Note: Batch mode exports SVG files automatically; --interactive is for single-file plotting only.\n"
     )
     print(msg)

{batplot-1.3.0 → batplot-1.3.1}/batplot/batplot.py

@@ -1297,10 +1297,19 @@ def batplot_main() -> int:
         delta = sess.get('delta', 0.0)
         ax.set_xlabel(sess.get('axis', {}).get('xlabel', 'X'))
         ax.set_ylabel(sess.get('axis', {}).get('ylabel', 'Intensity'))
-        if 'xlim' in sess.get('axis', {}):
-            ax.set_xlim(*sess['axis']['xlim'])
-        if 'ylim' in sess.get('axis', {}):
-            ax.set_ylim(*sess['axis']['ylim'])
+        
+        # Restore normalization ranges (if saved)
+        axis_cfg = sess.get('axis', {})
+        if 'norm_xlim' in axis_cfg and axis_cfg['norm_xlim'] is not None:
+            ax._norm_xlim = tuple(axis_cfg['norm_xlim'])
+        if 'norm_ylim' in axis_cfg and axis_cfg['norm_ylim'] is not None:
+            ax._norm_ylim = tuple(axis_cfg['norm_ylim'])
+        
+        # Restore display limits
+        if 'xlim' in axis_cfg:
+            ax.set_xlim(*axis_cfg['xlim'])
+        if 'ylim' in axis_cfg:
+            ax.set_ylim(*axis_cfg['ylim'])
         # Apply figure size & dpi if stored
         fig_cfg = sess.get('figure', {})
         try:
@@ -1881,6 +1890,10 @@ def batplot_main() -> int:
     ax.autoscale_view()
     fig.canvas.draw()
 
+    # Store the x/y limits that were used for data normalization (.bpsg save/restore)
+    ax._norm_xlim = tuple(ax.get_xlim())
+    ax._norm_ylim = tuple(ax.get_ylim())
+
     # Define a sample_tick safely (may be None if no labels yet)
     sample_tick = None
     xt_lbls = ax.get_xticklabels()

{batplot-1.3.0 → batplot-1.3.1}/batplot/cpc_interactive.py

@@ -1398,7 +1398,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                     print("Available style files:")
                     for i, f in enumerate(files, 1):
                         print(f"  {i}: {f}")
-                inp = input("Enter number or filename (.bps/.bpsg/.bpcfg; q=cancel): ").strip()
+                inp = input("Enter number or filename (.bps/.bpsg; q=cancel): ").strip()
                 if not inp or inp.lower() == 'q':
                     _print_menu(); continue
                 push_state("import-style")

{batplot-1.3.0 → batplot-1.3.1}/batplot/electrochem_interactive.py

@@ -1029,7 +1029,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     print("Available style files:")
                     for _i, _f in enumerate(_style_files, 1):
                         print(f"  {_i}: {_f}")
-                inp = input("Enter number or filename (.bps/.bpsg/.bpcfg, q=cancel): ").strip()
+                inp = input("Enter number or filename (.bps/.bpsg, q=cancel): ").strip()
                 if not inp or inp.lower() == 'q':
                     _print_menu(len(all_cycles), is_dqdv); continue
                 push_state("import-style")

{batplot-1.3.0 → batplot-1.3.1}/batplot/interactive.py

@@ -1022,6 +1022,7 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                             print("Canceled.")
                             continue
                         target_path = os.path.join(folder, name)
+                        skip_confirm = True  # Already confirmed above
                     else:
                         print("Invalid number.")
                         continue
@@ -1032,11 +1033,13 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                     if ext == '':
                         name = name + '.pkl'
                     target_path = name if os.path.isabs(name) else os.path.join(folder, name)
+                    skip_confirm = False  # Let dump_session ask
                     if os.path.exists(target_path):
                         yn = input(f"'{os.path.basename(target_path)}' exists. Overwrite? (y/n): ").strip().lower()
                         if yn != 'y':
                             print("Canceled.")
                             continue
+                        skip_confirm = True  # Already confirmed
                 # Delegate to session dumper
                 _bp_dump_session(
                     target_path,
@@ -1055,6 +1058,7 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                     cif_hkl_label_map=(getattr(_bp, 'cif_hkl_label_map', None) if _bp is not None else None),
                     show_cif_hkl=(bool(getattr(_bp,'show_cif_hkl', False)) if _bp is not None else False),
                     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}")
             except Exception as e:
@@ -1698,6 +1702,10 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                             push_state("font-change")
                             fs_val = float(fs)
                             apply_font_changes(new_size=fs_val)
+                            # Reposition top/right labels to match new tick label sizes
+                            position_top_xlabel()
+                            position_right_ylabel()
+                            fig.canvas.draw()
                     except Exception as e:
                         print(f"Error changing font size: {e}")
                 elif subkey == 'f':
@@ -1723,6 +1731,10 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                             push_state("font-change")
                             print(f"Setting font family to: {ft}")
                             apply_font_changes(new_family=ft)
+                            # Reposition top/right labels to match new tick label sizes
+                            position_top_xlabel()
+                            position_right_ylabel()
+                            fig.canvas.draw()
                     except Exception as e:
                         print(f"Error changing font family: {e}")
                 else:
@@ -2048,13 +2060,13 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                 style_menu_active = True
                 while style_menu_active:
                     print_style_info()
-                    # List available .bpcfg to speed up export/import workflows
+                    # List available style files (.bps, .bpsg, .bpcfg) to speed up export/import workflows
                     try:
-                        _bpcfg_files = sorted([f for f in os.listdir(os.getcwd()) if f.lower().endswith('.bpcfg')])
+                        _bpcfg_files = sorted([f for f in os.listdir(os.getcwd()) if f.lower().endswith(('.bps', '.bpsg', '.bpcfg'))])
                     except Exception:
                         _bpcfg_files = []
                     if _bpcfg_files:
-                        print("Existing .bpcfg files:")
+                        print("Existing style files (.bps/.bpsg):")
                         for _i, _f in enumerate(_bpcfg_files, 1):
                             print(f"  {_i}: {_f}")
                     sub = input("Style submenu: (e=export, q=return, r=refresh): ").strip().lower()
@@ -2081,7 +2093,7 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                     print("Available style files:")
                     for _i, _f in enumerate(_style_files, 1):
                         print(f"  {_i}: {_f}")
-                inp = input("Enter number or filename (.bps/.bpsg/.bpcfg; q=cancel): ").strip()
+                inp = input("Enter number or filename (.bps/.bpsg; q=cancel): ").strip()
                 if not inp or inp.lower() == 'q':
                     print("Canceled.")
                     continue

{batplot-1.3.0 → batplot-1.3.1}/batplot/operando_ec_interactive.py

@@ -1938,13 +1938,13 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                     print("  (no EC line found)")
                 
                 print("-------------------------\n")
-                # List .bpcfg files for convenience
+                # List style files (.bps, .bpsg, .bpcfg) for convenience
                 try:
-                    _bpcfg_files = sorted([f for f in os.listdir(os.getcwd()) if f.lower().endswith('.bpcfg')])
+                    _bpcfg_files = sorted([f for f in os.listdir(os.getcwd()) if f.lower().endswith(('.bps', '.bpsg', '.bpcfg'))])
                 except Exception:
                     _bpcfg_files = []
                 if _bpcfg_files:
-                    print("Existing .bpcfg files:")
+                    print("Existing style files (.bps/.bpsg):")
                     for _i, _f in enumerate(_bpcfg_files, 1):
                         print(f"  {_i}: {_f}")
                 sub = input("Style: (e=export, q=return): ").strip().lower()
@@ -2145,7 +2145,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                     print("Available style files:")
                     for _i, _f in enumerate(_style_files, 1):
                         print(f"  {_i}: {_f}")
-                inp = input("Enter number or filename (.bps/.bpsg/.bpcfg, q=cancel): ").strip()
+                inp = input("Enter number or filename (.bps/.bpsg, q=cancel): ").strip()
                 if not inp or inp.lower() == 'q':
                     print_menu(); continue
                 _snapshot("import-style")

{batplot-1.3.0 → batplot-1.3.1}/batplot/session.py

@@ -36,10 +36,12 @@ def dump_session(
     cif_hkl_label_map: Dict[str, Dict[float, str]] | None = None,
     show_cif_hkl: bool | None = None,
     show_cif_titles: bool | None = None,
+    skip_confirm: bool = False,
 ) -> None:
     """Serialize the current interactive session to a pickle file.
 
     Parameters mirror the state captured in the original inline helper.
+    skip_confirm: If True, skip overwrite confirmation (already confirmed by caller).
     """
 
     # Infer axis mode string
@@ -172,6 +174,8 @@ def dump_session(
                 'ylabel': ax.get_ylabel(),
                 'xlim': ax.get_xlim(),
                 'ylim': ax.get_ylim(),
+                'norm_xlim': getattr(ax, '_norm_xlim', None),  # x-range used for normalization
+                'norm_ylim': getattr(ax, '_norm_ylim', None),  # y-range used for normalization
             },
             'figure': {
                 'size': tuple(map(float, fig.get_size_inches())),
@@ -211,10 +215,13 @@ def dump_session(
             'has_bottom_x': bool(ax.get_xlabel()),
             'has_left_y': bool(ax.get_ylabel()),
         }
-        target = _confirm_overwrite(filename)
-        if not target:
-            print("Session save canceled.")
-            return
+        if skip_confirm:
+            target = filename
+        else:
+            target = _confirm_overwrite(filename)
+            if not target:
+                print("Session save canceled.")
+                return
         with open(target, 'wb') as f:
             pickle.dump(sess, f)
         print(f"Session saved to {target}")

{batplot-1.3.0 → batplot-1.3.1}/batplot/style.py

@@ -287,6 +287,9 @@ def export_style_config(
                 'ylabel': ax.get_ylabel() or '',
                 'xlim': list(ax.get_xlim()),
                 'ylim': list(ax.get_ylim()),
+                # Store the x/y ranges that the current data was normalized to
+                'norm_xlim': list(getattr(ax, '_norm_xlim', ax.get_xlim())),
+                'norm_ylim': list(getattr(ax, '_norm_ylim', ax.get_ylim())),
             }
             default_ext = '.bpsg'
         else:
@@ -672,6 +675,14 @@ def apply_style_config(
                     ax.set_xlabel(geom['xlabel'])
                 if 'ylabel' in geom and geom['ylabel']:
                     ax.set_ylabel(geom['ylabel'])
+                
+                # Restore normalization ranges (if saved)
+                if 'norm_xlim' in geom and isinstance(geom['norm_xlim'], list) and len(geom['norm_xlim']) == 2:
+                    ax._norm_xlim = tuple(geom['norm_xlim'])
+                if 'norm_ylim' in geom and isinstance(geom['norm_ylim'], list) and len(geom['norm_ylim']) == 2:
+                    ax._norm_ylim = tuple(geom['norm_ylim'])
+                
+                # Restore display limits
                 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:

{batplot-1.3.0 → batplot-1.3.1}/batplot/ui.py

@@ -197,10 +197,10 @@ def position_right_ylabel(ax, fig, tick_state: Dict[str, bool]):
                 except Exception:
                     pass
 
-            # Convert to points and add gap (match matplotlib's labelpad = 14pt)
+            # Convert to points and add gap (6pt gap to visually match left labelpad=8pt)
             if max_w_px > 0:
                 tick_width_pts = max_w_px * 72.0 / dpi
-                dx_pts = tick_width_pts + 14.0  # 14pt gap to match left labelpad
+                dx_pts = tick_width_pts + 6.0  # 6pt gap to visually match left labelpad
             else:
                 dx_pts = 6.0  # Minimal spacing when no tick labels (match small labelpad)
             
@@ -634,4 +634,4 @@ __all__ = [
     'ensure_text_visibility',
     'resize_plot_frame',
     'resize_canvas',
-]
+]

{batplot-1.3.0 → batplot-1.3.1}/batplot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.3.0
+Version: 1.3.1
 Summary: Interactive plotting for XRD, PDF, and XAS data (.xye, .xy, .qye, .dat, .csv, .gr, .nor, .chik, .chir)
 Author-email: Tian Dai <tianda@uio.no>
 License: MIT License
@@ -60,7 +60,7 @@ Dynamic: license-file
 - **Operando Analysis**: Correlate in-situ characterizations (XRD/PDF/XAS) with electrochemical data
 - **Interactive plotting**: Real-time editing customized for each type of plottings
 - **Session Persistence**: Save and reload complete plot states with `.pkl` files
-- **Style Management**: Import/export plot styles as `.bpcfg` files
+- **Style Management**: Import/export plot styles as `.bps`/`.bpsg` files
 - **Batch Processing**: Plot multiple files simultaneously with automatic SVG export
 
 ## Installation
@@ -130,6 +130,7 @@ batplot --operando --interactive
 | **Electrochemistry** | `.csv` (Neware), `.mpt` (Biologic) |
 | **XRD / PDF** | `.xye`, `.xy`, `.qye`, `.dat` |
 | **XAS** | `.nor`, `.chik`, `.chir` |
+| **Others** | `user defined` (plot first two columns as x and y) |
 
 ## Interactive Features
 
@@ -137,7 +138,7 @@ When launched with `--interactive`:
 - **Cycle/Scan Control**: Toggle visibility, change colors
 - **Styling**: Line widths, markers, transparency
 - **Axes**: Labels, limits, ticks, spine styles
-- **Export**: Save sessions (`.pkl`), styles (`.bpcfg`), or high-res images
+- **Export**: Save sessions (`.pkl`), styles (`.bps`/`.bpsg`), or high-res images
 - **Live Preview**: All changes update in real-time
 
 ## Documentation

{batplot-1.3.0 → batplot-1.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "batplot"
-version = "1.3.0"
+version = "1.3.1"
 description = "Interactive plotting for XRD, PDF, and XAS data (.xye, .xy, .qye, .dat, .csv, .gr, .nor, .chik, .chir)"
 authors = [
     { name = "Tian Dai", email = "tianda@uio.no" }

batplot-1.3.0/batplot/__init__.py

@@ -1,6 +0,0 @@
-"""batplot package."""
-
-# Skip version check to avoid OneDrive timeout issues
-__version__ = "1.3.0"
-
-__all__ = ["__version__"]