batplot 1.3.8__tar.gz → 1.3.10__tar.gz

{batplot-1.3.8 → batplot-1.3.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.3.8
+Version: 1.3.10
 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

{batplot-1.3.8 → batplot-1.3.10}/batplot/__init__.py

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

{batplot-1.3.8 → batplot-1.3.10}/batplot/batplot.py

@@ -1409,6 +1409,29 @@ def batplot_main() -> int:
             spm = fig_cfg.get('subplot_margins')
             if spm and all(k in spm for k in ('left','right','bottom','top')):
                 fig.subplots_adjust(left=spm['left'], right=spm['right'], bottom=spm['bottom'], top=spm['top'])
+            
+            # Restore exact frame size if stored (for precision)
+            frame_size = fig_cfg.get('frame_size')
+            if frame_size and isinstance(frame_size, (list, tuple)) and len(frame_size) == 2:
+                target_w_in, target_h_in = map(float, frame_size)
+                # Get current canvas size
+                canvas_w_in, canvas_h_in = fig.get_size_inches()
+                # Calculate needed fractions to achieve exact frame size
+                if canvas_w_in > 0 and canvas_h_in > 0:
+                    # Get current position to preserve centering
+                    bbox = ax.get_position()
+                    center_x = (bbox.x0 + bbox.x1) / 2.0
+                    center_y = (bbox.y0 + bbox.y1) / 2.0
+                    # Calculate new fractions
+                    new_w_frac = target_w_in / canvas_w_in
+                    new_h_frac = target_h_in / canvas_h_in
+                    # Reposition to maintain centering
+                    new_left = center_x - new_w_frac / 2.0
+                    new_right = center_x + new_w_frac / 2.0
+                    new_bottom = center_y - new_h_frac / 2.0
+                    new_top = center_y + new_h_frac / 2.0
+                    # Apply
+                    fig.subplots_adjust(left=new_left, right=new_right, bottom=new_bottom, top=new_top)
         except Exception:
             pass
         # Font
@@ -1431,13 +1454,13 @@ def batplot_main() -> int:
         try:
             tw = sess.get('tick_widths', {})
             if tw.get('x_major') is not None:
-                ax.tick_params(axis='x', which='major', width=tw['x_major'])
+                ax.tick_params(axis='x', which='major', width=float(tw['x_major']))
             if tw.get('x_minor') is not None:
-                ax.tick_params(axis='x', which='minor', width=tw['x_minor'])
+                ax.tick_params(axis='x', which='minor', width=float(tw['x_minor']))
             if tw.get('y_major') is not None:
-                ax.tick_params(axis='y', which='major', width=tw['y_major'])
+                ax.tick_params(axis='y', which='major', width=float(tw['y_major']))
             if tw.get('y_minor') is not None:
-                ax.tick_params(axis='y', which='minor', width=tw['y_minor'])
+                ax.tick_params(axis='y', which='minor', width=float(tw['y_minor']))
         except Exception:
             pass
         # Tick lengths restore
@@ -1457,6 +1480,78 @@ def batplot_main() -> int:
                 fig._tick_lengths['minor'] = minor_len
         except Exception:
             pass
+        
+        # Restore WASD state (spine, ticks, labels, title visibility for all 4 sides)
+        try:
+            wasd = sess.get('wasd_state', {})
+            if wasd:
+                # Store the xlabel/ylabel before applying WASD (to restore hidden titles later if needed)
+                stored_xlabel = ax.get_xlabel()
+                stored_ylabel = ax.get_ylabel()
+                
+                # Apply spine visibility
+                for side in ('top', 'bottom', 'left', 'right'):
+                    state = wasd.get(side, {})
+                    sp = ax.spines.get(side)
+                    if sp and 'spine' in state:
+                        sp.set_visible(bool(state['spine']))
+                
+                # Apply tick and label visibility
+                for side in ('top', 'bottom', 'left', 'right'):
+                    state = wasd.get(side, {})
+                    if side in ('top', 'bottom'):
+                        # X-axis ticks
+                        tick_key = 'tick1On' if side == 'top' else 'tick2On'
+                        label_key = 'label1On' if side == 'top' else 'label2On'
+                        if 'ticks' in state:
+                            ax.tick_params(axis='x', which='major', **{tick_key: bool(state['ticks'])})
+                        if 'labels' in state:
+                            ax.tick_params(axis='x', which='major', **{label_key: bool(state['labels'])})
+                        if 'minor' in state:
+                            ax.tick_params(axis='x', which='minor', **{tick_key: bool(state['minor'])})
+                    else:
+                        # Y-axis ticks
+                        tick_key = 'tick1On' if side == 'left' else 'tick2On'
+                        label_key = 'label1On' if side == 'left' else 'label2On'
+                        if 'ticks' in state:
+                            ax.tick_params(axis='y', which='major', **{tick_key: bool(state['ticks'])})
+                        if 'labels' in state:
+                            ax.tick_params(axis='y', which='major', **{label_key: bool(state['labels'])})
+                        if 'minor' in state:
+                            ax.tick_params(axis='y', which='minor', **{tick_key: bool(state['minor'])})
+                
+                # Apply title visibility - CRITICAL: Check title state before restoring labels
+                # Bottom xlabel
+                bottom_title_on = wasd.get('bottom', {}).get('title', True)
+                if bottom_title_on:
+                    ax.set_xlabel(stored_xlabel)
+                else:
+                    ax.set_xlabel('')  # Hidden by user via s5
+                    # Store the hidden label for later restoration
+                    if stored_xlabel:
+                        setattr(ax, '_stored_xlabel', stored_xlabel)
+                
+                # Left ylabel  
+                left_title_on = wasd.get('left', {}).get('title', True)
+                if left_title_on:
+                    ax.set_ylabel(stored_ylabel)
+                else:
+                    ax.set_ylabel('')  # Hidden by user via a5
+                    # Store the hidden label for later restoration
+                    if stored_ylabel:
+                        setattr(ax, '_stored_ylabel', stored_ylabel)
+                
+                # Top xlabel (if exists)
+                top_title_on = wasd.get('top', {}).get('title', False)
+                setattr(ax, '_top_xlabel_on', top_title_on)
+                
+                # Right ylabel (if exists)
+                right_title_on = wasd.get('right', {}).get('title', False)
+                setattr(ax, '_right_ylabel_on', right_title_on)
+        except Exception as e:
+            # Don't fail session load if WASD restoration fails
+            print(f"Warning: Could not fully restore WASD state: {e}")
+        
         # Rebuild label texts
         for i, lab in enumerate(labels_list):
             txt = ax.text(1.0, 1.0, f"{i+1}: {lab}", ha='right', va='top', transform=ax.transAxes,

{batplot-1.3.8 → batplot-1.3.10}/batplot/cpc_interactive.py

@@ -296,6 +296,11 @@ def _style_snapshot(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_data=Non
             'right':  {'linewidth': ax2.spines.get('right').get_linewidth() if ax2.spines.get('right') else None,
                        'visible': ax2.spines.get('right').get_visible() if ax2.spines.get('right') else None},
         },
+        'labelpads': {
+            'x': getattr(ax.xaxis, 'labelpad', None),
+            'ly': getattr(ax.yaxis, 'labelpad', None),  # left y-axis (capacity)
+            'ry': getattr(ax2.yaxis, 'labelpad', None),  # right y-axis (efficiency)
+        },
         'series': {
             'charge': {
                 'color': _color_of(sc_charge),
@@ -628,6 +633,18 @@ def _apply_style(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, cfg: Dict, file_
                     except Exception: pass
     except Exception:
         pass
+    # Restore labelpads
+    try:
+        pads = cfg.get('labelpads', {})
+        if pads:
+            if pads.get('x') is not None:
+                ax.xaxis.labelpad = pads['x']
+            if pads.get('ly') is not None:
+                ax.yaxis.labelpad = pads['ly']
+            if pads.get('ry') is not None:
+                ax2.yaxis.labelpad = pads['ry']
+    except Exception:
+        pass
     try:
         fig.canvas.draw_idle()
     except Exception:
@@ -1187,13 +1204,46 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
             continue
         elif key == 'e':
             try:
-                fname = input("Export filename (default .svg if no extension, q=cancel): ").strip()
+                # List existing figure files
+                folder = os.getcwd()
+                fig_extensions = ('.svg', '.png', '.jpg', '.jpeg', '.pdf', '.eps', '.tif', '.tiff')
+                files = []
+                try:
+                    files = sorted([f for f in os.listdir(folder) if f.lower().endswith(fig_extensions)])
+                except Exception:
+                    files = []
+                if files:
+                    print("Existing figure files:")
+                    for i, f in enumerate(files, 1):
+                        print(f"  {i}: {f}")
+                
+                fname = input("Export filename (default .svg if no extension) or number to overwrite (q=cancel): ").strip()
                 if not fname or fname.lower() == 'q':
                     _print_menu(); continue
-                root, ext = os.path.splitext(fname)
-                if ext == '':
-                    fname = fname + '.svg'
-                target = _confirm_overwrite(fname)
+                
+                # Check if user selected a number
+                already_confirmed = False
+                if fname.isdigit() and files:
+                    idx = int(fname)
+                    if 1 <= idx <= len(files):
+                        name = files[idx-1]
+                        yn = input(f"Overwrite '{name}'? (y/n): ").strip().lower()
+                        if yn != 'y':
+                            _print_menu(); continue
+                        fname = name
+                        already_confirmed = True
+                    else:
+                        print("Invalid number.")
+                        _print_menu(); continue
+                else:
+                    root, ext = os.path.splitext(fname)
+                    if ext == '':
+                        fname = fname + '.svg'
+                
+                if already_confirmed:
+                    target = fname
+                else:
+                    target = _confirm_overwrite(fname)
                 if target:
                     # Remove numbering from legend labels before export
                     original_labels = {}
@@ -2230,6 +2280,9 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
             _print_menu(); continue
         elif key == 'r':
             # Rename axis titles
+            print("Tip: Use LaTeX/mathtext for special characters:")
+            print("  Subscript: H$_2$O → H₂O  |  Superscript: m$^2$ → m²")
+            print("  Greek: $\\alpha$, $\\beta$  |  Angstrom: $\\AA$ → Å")
             while True:
                 print("Rename titles: x=x-axis, ly=left y-axis, ry=right y-axis, q=back")
                 sub = input("Rename> ").strip().lower()

{batplot-1.3.8 → batplot-1.3.10}/batplot/electrochem_interactive.py

@@ -649,6 +649,10 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 'wasd_state': dict(getattr(fig, '_ec_wasd_state', {})) if hasattr(fig, '_ec_wasd_state') else {},
                 'fig_size': list(fig.get_size_inches()),
                 'rotation_angle': getattr(fig, '_ec_rotation_angle', 0),
+                'labelpads': {
+                    'x': getattr(ax.xaxis, 'labelpad', None),
+                    'y': getattr(ax.yaxis, 'labelpad', None),
+                },
                 'spines': {name: {
                     'lw': (ax.spines.get(name).get_linewidth() if ax.spines.get(name) else None),
                     'visible': (ax.spines.get(name).get_visible() if ax.spines.get(name) else None)
@@ -776,6 +780,16 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 _position_top_xlabel(); _position_right_ylabel()
             except Exception:
                 pass
+            # Restore labelpads (for title positioning)
+            try:
+                pads = snap.get('labelpads', {})
+                if pads:
+                    if pads.get('x') is not None:
+                        ax.xaxis.labelpad = pads['x']
+                    if pads.get('y') is not None:
+                        ax.yaxis.labelpad = pads['y']
+            except Exception:
+                pass
             # Lines (by index)
             try:
                 if len(ax.lines) == len(snap.get('lines', [])):
@@ -828,15 +842,50 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
         elif key == 'e':
             # Export current figure to a file; default extension .svg if missing
             try:
-                fname = input("Export filename (default .svg if no extension, q=cancel): ").strip()
+                # List existing figure files
+                folder = os.getcwd()
+                fig_extensions = ('.svg', '.png', '.jpg', '.jpeg', '.pdf', '.eps', '.tif', '.tiff')
+                files = []
+                try:
+                    files = sorted([f for f in os.listdir(folder) if f.lower().endswith(fig_extensions)])
+                except Exception:
+                    files = []
+                if files:
+                    print("Existing figure files:")
+                    for i, f in enumerate(files, 1):
+                        print(f"  {i}: {f}")
+                
+                fname = input("Export filename (default .svg if no extension) or number to overwrite (q=cancel): ").strip()
                 if not fname or fname.lower() == 'q':
                     _print_menu(len(all_cycles), is_dqdv)
                     continue
-                root, ext = os.path.splitext(fname)
-                if ext == '':
-                    fname = fname + '.svg'
+                
+                # Check if user selected a number
+                already_confirmed = False
+                if fname.isdigit() and files:
+                    idx = int(fname)
+                    if 1 <= idx <= len(files):
+                        name = files[idx-1]
+                        yn = input(f"Overwrite '{name}'? (y/n): ").strip().lower()
+                        if yn != 'y':
+                            _print_menu(len(all_cycles), is_dqdv)
+                            continue
+                        fname = name
+                        already_confirmed = True
+                    else:
+                        print("Invalid number.")
+                        _print_menu(len(all_cycles), is_dqdv)
+                        continue
+                else:
+                    root, ext = os.path.splitext(fname)
+                    if ext == '':
+                        fname = fname + '.svg'
+                
                 try:
-                    target = _confirm_overwrite(fname)
+                    if already_confirmed:
+                        target = fname
+                    else:
+                        target = _confirm_overwrite(fname)
                     if target:
                         # If exporting SVG, make background transparent for PowerPoint
                         _, ext2 = os.path.splitext(target)
@@ -1471,6 +1520,9 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
         elif key == 'r':
             # Rename axis labels
             try:
+                print("Tip: Use LaTeX/mathtext for special characters:")
+                print("  Subscript: H$_2$O → H₂O  |  Superscript: m$^2$ → m²")
+                print("  Greek: $\\alpha$, $\\beta$  |  Angstrom: $\\AA$ → Å")
                 while True:
                     print("Rename axis: x, y, both, q=back")
                     sub = input("Rename> ").strip().lower()