batplot 1.1.7__tar.gz → 1.2.0__tar.gz

{batplot-1.1.7 → batplot-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.1.7
+Version: 1.2.0
 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.1.7 → batplot-1.2.0}/batplot/cpc_interactive.py

@@ -259,7 +259,6 @@ def _style_snapshot(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_data=Non
             'position_inches': legend_xy_in  # [x, y] offset from canvas center in inches
         },
         'ticks': {
-            'visibility': tick_vis,
             'widths': {
                 'x_major': _tick_width(ax.xaxis, 'major'),
                 'x_minor': _tick_width(ax.xaxis, 'minor'),
@@ -1316,7 +1315,6 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
             _print_menu(); continue
         elif key == 'i':
             try:
-                push_state("import-style")
                 try:
                     files = sorted([f for f in os.listdir(os.getcwd()) if f.lower().endswith('.bpcfg')])
                 except Exception:
@@ -1328,6 +1326,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                 inp = input("Enter number to open or filename (.bpcfg; q=cancel): ").strip()
                 if not inp or inp.lower() == 'q':
                     _print_menu(); continue
+                push_state("import-style")
                 if inp.isdigit() and files:
                     idx = int(inp)
                     if 1 <= idx <= len(files):

{batplot-1.1.7 → batplot-1.2.0}/batplot/electrochem_interactive.py

@@ -570,10 +570,10 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     except Exception:
                         pass
             
-            # Convert to points and add gap (match matplotlib's labelpad = 14pt)
+            # Convert to points and add gap (match matplotlib's 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 + 8.0  # 8pt gap to match left labelpad
             else:
                 dx_pts = 6.0  # Minimal spacing when no tick labels (match small labelpad)
             
@@ -981,7 +981,6 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
         elif key == 'i':
             # Import style from .bpcfg (with numbered list)
             try:
-                push_state("import-style")
                 try:
                     _bpcfg_files = sorted([f for f in os.listdir(os.getcwd()) if f.lower().endswith('.bpcfg')])
                 except Exception:
@@ -993,6 +992,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 inp = input("Enter number to open or filename (.bpcfg, q=cancel): ").strip()
                 if not inp or inp.lower() == 'q':
                     _print_menu(len(all_cycles), is_dqdv); continue
+                push_state("import-style")
                 if inp.isdigit() and _bpcfg_files:
                     _idx = int(inp)
                     if 1 <= _idx <= len(_bpcfg_files):
@@ -1031,17 +1031,79 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         _apply_font_family(ax, font_cfg['family'])
                     if font_cfg.get('size') is not None:
                         _apply_font_size(ax, float(font_cfg['size']))
-                except Exception: pass
+                except Exception as e:
+                    print(f"Warning: Could not apply figure/font settings: {e}")
 
                 # WASD state and dependent components
                 try:
                     wasd_state = cfg.get('wasd_state')
                     if wasd_state and isinstance(wasd_state, dict):
-                        # Store on fig and apply
-                        setattr(fig, '_ec_wasd_state', wasd_state)
-                        _sync_tick_state()
-                        _apply_wasd()
-                except Exception: pass
+                        # Apply spines
+                        for name in ('top','bottom','left','right'):
+                            side = wasd_state.get(name, {})
+                            if name in ax.spines and 'spine' in side:
+                                ax.spines[name].set_visible(bool(side['spine']))
+                        
+                        # Apply major ticks & labels
+                        top_s = wasd_state.get('top', {})
+                        bot_s = wasd_state.get('bottom', {})
+                        left_s = wasd_state.get('left', {})
+                        right_s = wasd_state.get('right', {})
+                        
+                        ax.tick_params(axis='x', 
+                                      top=bool(top_s.get('ticks', False)), 
+                                      bottom=bool(bot_s.get('ticks', True)),
+                                      labeltop=bool(top_s.get('labels', False)), 
+                                      labelbottom=bool(bot_s.get('labels', True)))
+                        ax.tick_params(axis='y', 
+                                      left=bool(left_s.get('ticks', True)), 
+                                      right=bool(right_s.get('ticks', False)),
+                                      labelleft=bool(left_s.get('labels', True)), 
+                                      labelright=bool(right_s.get('labels', False)))
+                        
+                        # Apply minor ticks
+                        if top_s.get('minor') or bot_s.get('minor'):
+                            ax.xaxis.set_minor_locator(AutoMinorLocator())
+                            ax.xaxis.set_minor_formatter(NullFormatter())
+                        ax.tick_params(axis='x', which='minor', 
+                                      top=bool(top_s.get('minor', False)), 
+                                      bottom=bool(bot_s.get('minor', False)), 
+                                      labeltop=False, labelbottom=False)
+                        
+                        if left_s.get('minor') or right_s.get('minor'):
+                            ax.yaxis.set_minor_locator(AutoMinorLocator())
+                            ax.yaxis.set_minor_formatter(NullFormatter())
+                        ax.tick_params(axis='y', which='minor', 
+                                      left=bool(left_s.get('minor', False)), 
+                                      right=bool(right_s.get('minor', False)), 
+                                      labelleft=False, labelright=False)
+                        
+                        # Apply axis titles
+                        ax._top_xlabel_on = bool(top_s.get('title', False))
+                        ax._right_ylabel_on = bool(right_s.get('title', False))
+                        
+                        # Update tick_state for consistency
+                        tick_state['t_ticks'] = bool(top_s.get('ticks', False))
+                        tick_state['t_labels'] = bool(top_s.get('labels', False))
+                        tick_state['b_ticks'] = bool(bot_s.get('ticks', True))
+                        tick_state['b_labels'] = bool(bot_s.get('labels', True))
+                        tick_state['l_ticks'] = bool(left_s.get('ticks', True))
+                        tick_state['l_labels'] = bool(left_s.get('labels', True))
+                        tick_state['r_ticks'] = bool(right_s.get('ticks', False))
+                        tick_state['r_labels'] = bool(right_s.get('labels', False))
+                        tick_state['mtx'] = bool(top_s.get('minor', False))
+                        tick_state['mbx'] = bool(bot_s.get('minor', False))
+                        tick_state['mly'] = bool(left_s.get('minor', False))
+                        tick_state['mry'] = bool(right_s.get('minor', False))
+                        
+                        # Reposition titles
+                        _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)
+                        
+                except Exception as e:
+                    print(f"Warning: Could not apply tick visibility: {e}")
 
                 # Spines and Ticks (widths)
                 try:
@@ -1903,7 +1965,7 @@ def _get_style_snapshot(fig, ax, cycle_lines: Dict, tick_state: Dict) -> Dict:
         },
         'font': {'family': font_fam0, 'size': font_size},
         'spines': spines,
-        'ticks': {'widths': tick_widths, 'state': dict(tick_state)},
+        'ticks': {'widths': tick_widths},
         'wasd_state': wasd_state,
         'curve_linewidth': curve_linewidth,
         'curve_markers': curve_marker_props,

{batplot-1.1.7 → batplot-1.2.0}/batplot/operando_ec_interactive.py

@@ -534,6 +534,15 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
     # Crosshair state for both axes
     # Undo history
     state_history = []
+    
+    def _get_spine_visible(axis, which: str) -> bool:
+        """Helper to get spine visibility status"""
+        sp = axis.spines.get(which)
+        try:
+            return bool(sp.get_visible()) if sp is not None else False
+        except Exception:
+            return False
+    
     def _snapshot(note: str = ""):
         try:
             fig_w, fig_h = _get_fig_size(fig)
@@ -561,37 +570,37 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
             # WASD state for both panes
             op_wasd = {
                 'top':    {'spine': _get_spine_visible(ax, 'top'), 'ticks': ax.xaxis._major_tick_kw.get('tick1On', True), 
-                           'minor': bool(ax.xaxis._minortickkw.get('tick1On', False)), 
+                           'minor': bool(ax.xaxis._minor_tick_kw.get('tick1On', False)), 
                            'labels': ax.xaxis._major_tick_kw.get('label1On', True), 
                            'title': bool(getattr(ax, '_top_xlabel_on', False))},
                 'bottom': {'spine': _get_spine_visible(ax, 'bottom'), 'ticks': ax.xaxis._major_tick_kw.get('tick2On', True), 
-                           'minor': bool(ax.xaxis._minortickkw.get('tick2On', False)), 
+                           'minor': bool(ax.xaxis._minor_tick_kw.get('tick2On', False)), 
                            'labels': ax.xaxis._major_tick_kw.get('label2On', True), 
                            'title': bool(ax.get_xlabel())},
                 'left':   {'spine': _get_spine_visible(ax, 'left'), 'ticks': ax.yaxis._major_tick_kw.get('tick1On', True), 
-                           'minor': bool(ax.yaxis._minortickkw.get('tick1On', False)), 
+                           'minor': bool(ax.yaxis._minor_tick_kw.get('tick1On', False)), 
                            'labels': ax.yaxis._major_tick_kw.get('label1On', True), 
                            'title': bool(ax.get_ylabel())},
                 'right':  {'spine': _get_spine_visible(ax, 'right'), 'ticks': ax.yaxis._major_tick_kw.get('tick2On', False), 
-                           'minor': bool(ax.yaxis._minortickkw.get('tick2On', False)), 
+                           'minor': bool(ax.yaxis._minor_tick_kw.get('tick2On', False)), 
                            'labels': ax.yaxis._major_tick_kw.get('label2On', False), 
                            'title': bool(getattr(ax, '_right_ylabel_on', False))},
             }
             ec_wasd = {
                 'top':    {'spine': _get_spine_visible(ec_ax, 'top'), 'ticks': ec_ax.xaxis._major_tick_kw.get('tick1On', True), 
-                           'minor': bool(ec_ax.xaxis._minortickkw.get('tick1On', False)), 
+                           'minor': bool(ec_ax.xaxis._minor_tick_kw.get('tick1On', False)), 
                            'labels': ec_ax.xaxis._major_tick_kw.get('label1On', True), 
                            'title': bool(getattr(ec_ax, '_top_xlabel_on', False))},
                 'bottom': {'spine': _get_spine_visible(ec_ax, 'bottom'), 'ticks': ec_ax.xaxis._major_tick_kw.get('tick2On', True), 
-                           'minor': bool(ec_ax.xaxis._minortickkw.get('tick2On', False)), 
+                           'minor': bool(ec_ax.xaxis._minor_tick_kw.get('tick2On', False)), 
                            'labels': ec_ax.xaxis._major_tick_kw.get('label2On', True), 
                            'title': bool(ec_ax.get_xlabel())},
                 'left':   {'spine': _get_spine_visible(ec_ax, 'left'), 'ticks': ec_ax.yaxis._major_tick_kw.get('tick1On', False), 
-                           'minor': bool(ec_ax.yaxis._minortickkw.get('tick1On', False)), 
+                           'minor': bool(ec_ax.yaxis._minor_tick_kw.get('tick1On', False)), 
                            'labels': ec_ax.yaxis._major_tick_kw.get('label1On', False), 
                            'title': bool(ec_ax.get_ylabel())},
                 'right':  {'spine': _get_spine_visible(ec_ax, 'right'), 'ticks': ec_ax.yaxis._major_tick_kw.get('tick2On', True), 
-                           'minor': bool(ec_ax.yaxis._minortickkw.get('tick2On', False)), 
+                           'minor': bool(ec_ax.yaxis._minor_tick_kw.get('tick2On', False)), 
                            'labels': ec_ax.yaxis._major_tick_kw.get('label2On', True), 
                            'title': bool(ec_ax.get_ylabel())},
             }
@@ -615,8 +624,8 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
             })
             if len(state_history) > 40:
                 state_history.pop(0)
-        except Exception:
-            pass
+        except Exception as e:
+            print(f"Warning: snapshot failed: {e}")
     def _restore():
         if not state_history:
             print("No undo history."); return
@@ -1055,15 +1064,16 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                 print(f"Save failed: {e}")
             print_menu(); continue
         if cmd == 'h':
-            _snapshot("height")
             print(f"Current height: {ax_h_in:.2f} in")
             val = input("New height (inches): ").strip()
-            try:
-                new_h = max(0.25, float(val))
-                ax_h_in = new_h
-                _apply_group_layout_inches(fig, ax, cbar.ax, ec_ax, ax_w_in, ax_h_in, cb_w_in, cb_gap_in, ec_gap_in, ec_w_in)
-            except Exception as e:
-                print(f"Invalid height: {e}")
+            if val:
+                _snapshot("height")
+                try:
+                    new_h = max(0.25, float(val))
+                    ax_h_in = new_h
+                    _apply_group_layout_inches(fig, ax, cbar.ax, ec_ax, ax_w_in, ax_h_in, cb_w_in, cb_gap_in, ec_gap_in, ec_w_in)
+                except Exception as e:
+                    print(f"Invalid height: {e}")
             print_menu()
         elif cmd == 'r':
             _snapshot("reverse")
@@ -1100,7 +1110,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                 if sub == 'q':
                     break
                 if sub == 'f':
-                    _snapshot("font-family")
                     # Common font families with numbered options
                     fonts = ['Arial', 'DejaVu Sans', 'Helvetica', 'Liberation Sans', 
                              'Times New Roman', 'Courier New', 'Verdana', 'Tahoma']
@@ -1111,6 +1120,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                     choice = input("Font family (number or name): ").strip()
                     if not choice:
                         continue
+                    _snapshot("font-family")
                     # Check if it's a number
                     if choice.isdigit():
                         idx = int(choice)
@@ -1125,12 +1135,12 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                         set_fonts(family=choice)
                         print(f"Applied font family: {choice}")
                 elif sub == 's':
-                    _snapshot("font-size")
                     # Show current size and accept direct input
                     cur_size = plt.rcParams.get('font.size', None)
                     choice = input(f"Font size (current: {cur_size}): ").strip()
                     if not choice:
                         continue
+                    _snapshot("font-size")
                     try:
                         sz = float(choice)
                         if sz > 0:
@@ -1143,7 +1153,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
             print_menu()
         elif cmd == 'l':
             # Line widths submenu for both operando and EC panes
-            _snapshot("line-widths")
             print("Line widths: set frame (spines) and tick widths for both operando and EC")
             print("Enter frame/tick width (e.g., '1.5' or 'f t' for frame/tick separately)")
             print("Format examples:")
@@ -1156,6 +1165,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                 print_menu()
                 continue
             
+            _snapshot("line-widths")
             try:
                 parts = inp.split()
                 if len(parts) == 1:
@@ -1283,7 +1293,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                         axis.yaxis.set_major_locator(MaxNLocator(nbins='auto', steps=[1, 2, 5], min_n_ticks=4))
                 except Exception:
                     pass
-            _snapshot("toggle-ticks")
             while True:
                 print("Choose pane: o=operando, e=ec, q=back")
                 pane = input("ot> ").strip().lower()
@@ -1543,6 +1552,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                         if side == 'right' and key == 'minor':
                             ts['mry'] = bool(wasd['right']['minor'])
                     if changed:
+                        _snapshot("toggle-ticks")
                         _apply_wasd_axis(target, wasd)
                         try:
                             target._saved_tick_state = dict(ts)
@@ -1554,10 +1564,10 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                             fig.canvas.draw_idle()
             print_menu()
         elif cmd == 'ox':
-            _snapshot("operando-xrange")
             cur = ax.get_xlim(); print(f"Current operando X: {cur[0]:.4g} {cur[1]:.4g}")
             line = input("New X range (min max, blank=cancel): ").strip()
             if line:
+                _snapshot("operando-xrange")
                 try:
                     lo, hi = map(float, line.split())
                     ax.set_xlim(lo, hi)
@@ -1568,10 +1578,10 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                     print(f"Invalid range: {e}")
             print_menu()
         elif cmd == 'oy':
-            _snapshot("operando-yrange")
             cur = ax.get_ylim(); print(f"Current operando Y: {cur[0]:.4g} {cur[1]:.4g}")
             line = input("New Y range (min max, blank=cancel): ").strip()
             if line:
+                _snapshot("operando-yrange")
                 try:
                     lo, hi = map(float, line.split())
                     ax.set_ylim(lo, hi)
@@ -1582,7 +1592,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                     print(f"Invalid range: {e}")
             print_menu()
         elif cmd == 'oz':
-            _snapshot("operando-intensity-range")
             try:
                 cur = im.get_clim()
                 print(f"Current normalized intensity range: {cur[0]:.4g} {cur[1]:.4g}")
@@ -1590,6 +1599,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                 print("Could not retrieve current intensity range")
             line = input("New intensity range (min max, blank=cancel): ").strip()
             if line:
+                _snapshot("operando-intensity-range")
                 try:
                     lo, hi = map(float, line.split())
                     im.set_clim(lo, hi)
@@ -1603,26 +1613,28 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                     print(f"Invalid range: {e}")
             print_menu()
         elif cmd in ('ow'):
-            _snapshot("operando-width")
             print(f"Current operando width: {ax_w_in:.2f} in")
             val = input("New width (inches): ").strip()
-            try:
-                new_w = max(0.25, float(val))
-                ax_w_in = new_w
-                _apply_group_layout_inches(fig, ax, cbar.ax, ec_ax, ax_w_in, ax_h_in, cb_w_in, cb_gap_in, ec_gap_in, ec_w_in)
-            except Exception as e:
-                print(f"Invalid width: {e}")
+            if val:
+                _snapshot("operando-width")
+                try:
+                    new_w = max(0.25, float(val))
+                    ax_w_in = new_w
+                    _apply_group_layout_inches(fig, ax, cbar.ax, ec_ax, ax_w_in, ax_h_in, cb_w_in, cb_gap_in, ec_gap_in, ec_w_in)
+                except Exception as e:
+                    print(f"Invalid width: {e}")
             print_menu()
         elif cmd == 'ew':
-            _snapshot("ec-width")
             print(f"Current EC width: {ec_w_in:.2f} in")
             val = input("New EC width (inches): ").strip()
-            try:
-                new_w = max(0.25, float(val))
-                ec_w_in = new_w
-                _apply_group_layout_inches(fig, ax, cbar.ax, ec_ax, ax_w_in, ax_h_in, cb_w_in, cb_gap_in, ec_gap_in, ec_w_in)
-            except Exception as e:
-                print(f"Invalid EC width: {e}")
+            if val:
+                _snapshot("ec-width")
+                try:
+                    new_w = max(0.25, float(val))
+                    ec_w_in = new_w
+                    _apply_group_layout_inches(fig, ax, cbar.ax, ec_ax, ax_w_in, ax_h_in, cb_w_in, cb_gap_in, ec_gap_in, ec_w_in)
+                except Exception as e:
+                    print(f"Invalid EC width: {e}")
             print_menu()
         elif cmd == 'oc':
             # Change operando colormap (perceptually uniform suggestions)
@@ -1909,7 +1921,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
             # Load a .bpcfg style and apply
             # Applies style properties from commands: oc, ow, ew, h, el, t, l, f, g, r
             try:
-                _snapshot("import-style")
                 try:
                     _bpcfg_files = sorted([f for f in os.listdir(os.getcwd()) if f.lower().endswith('.bpcfg')])
                 except Exception:
@@ -1921,6 +1932,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                 inp = input("Enter number to open or filename (.bpcfg): ").strip()
                 if not inp:
                     print_menu(); continue
+                _snapshot("import-style")
                 if inp.isdigit() and _bpcfg_files:
                     _idx = int(inp)
                     if 1 <= _idx <= len(_bpcfg_files):
@@ -2233,10 +2245,10 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                     if sub == 'q':
                         break
                     if sub == 'x':
-                        _snapshot("rename-op-x")
                         cur = ax.get_xlabel() or ''
                         lab = input(f"New operando X label (blank=cancel, current='{cur}'): ").strip()
                         if lab:
+                            _snapshot("rename-op-x")
                             try:
                                 ax.set_xlabel(lab)
                                 ax._custom_labels['x'] = lab
@@ -2246,10 +2258,10 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                             except Exception:
                                 pass
                     elif sub == 'y':
-                        _snapshot("rename-op-y")
                         cur = ax.get_ylabel() or ''
                         lab = input(f"New operando Y label (blank=cancel, current='{cur}'): ").strip()
                         if lab:
+                            _snapshot("rename-op-y")
                             try:
                                 ax.set_ylabel(lab)
                                 ax._custom_labels['y'] = lab
@@ -2278,10 +2290,10 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                     if sub == 'q':
                         break
                     if sub == 'x':
-                        _snapshot("rename-ec-x")
                         cur = ec_ax.get_xlabel() or ''
                         lab = input(f"New EC X label (blank=cancel, current='{cur}'): ").strip()
                         if lab:
+                            _snapshot("rename-ec-x")
                             try:
                                 ec_ax.set_xlabel(lab)
                                 ec_ax._custom_labels['x'] = lab
@@ -2290,10 +2302,10 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                             except Exception:
                                 pass
                     elif sub == 'y':
-                        _snapshot("rename-ec-y")
                         cur = ec_ax.get_ylabel() or ''
                         lab = input(f"New EC Y label (blank=cancel, current='{cur}'): ").strip()
                         if lab:
+                            _snapshot("rename-ec-y")
                             try:
                                 ec_ax.set_ylabel(lab)
                                 # Store against current mode
@@ -2331,22 +2343,22 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                     if sub == 'q':
                         break
                     if sub == 'c':
-                        _snapshot("ec-line-color")
                         cur = ln.get_color()
                         val = input(f"Color (name or hex, current={cur}, blank=cancel): ").strip()
                         if not val:
                             continue
+                        _snapshot("ec-line-color")
                         try:
                             ln.set_color(val)
                             fig.canvas.draw_idle()
                         except Exception as e:
                             print(f"Invalid color: {e}")
                     elif sub == 'l':
-                        _snapshot("ec-line-width")
                         cur = ln.get_linewidth()
                         val = input(f"Line width (current={cur}, blank=cancel): ").strip()
                         if not val:
                             continue
+                        _snapshot("ec-line-width")
                         try:
                             lw = float(val)
                             if lw > 0:
@@ -2362,10 +2374,10 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                 print(f"EC line styling failed: {e}")
             print_menu()
         elif cmd == 'et':
-            _snapshot("ec-time-range")
             cur = ec_ax.get_ylim(); print(f"Current EC time range (Y): {cur[0]:.4g} {cur[1]:.4g}")
             line = input("New time range (min max, blank=cancel): ").strip()
             if line:
+                _snapshot("ec-time-range")
                 try:
                     lo, hi = map(float, line.split())
                     ec_ax.set_ylim(lo, hi)
@@ -2438,7 +2450,6 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                 if not sub or sub == 'q':
                     print_menu(); continue
                 if sub == 'n':
-                    _snapshot("ey->ions")
                     # Get or update parameters; allow reuse of previous values
                     params = getattr(ec_ax, '_ion_params', {"mass_mg": None, "cap_per_ion_mAh_g": None, "start_ions": None, "material": "cathode"})
                     mass_mg = params.get('mass_mg')
@@ -2469,6 +2480,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
                         if material is None:
                             material = 'cathode'
                         ec_ax._ion_params = {"mass_mg": mass_mg, "cap_per_ion_mAh_g": cap_per_ion, "start_ions": start_ions, "material": material}
+                    _snapshot("ey->ions")
                     import numpy as np
                     t = np.asarray(time_h, float)
                     i_mA = np.asarray(current_mA, float)
@@ -2734,6 +2746,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax):
             print("Canvas: only figure size will change; panel widths/gaps are not altered.")
             line = input("New canvas size 'W H' (blank=cancel): ").strip()
             if line:
+                _snapshot("canvas-size")
                 try:
                     parts = line.split()
                     if len(parts) == 2:

{batplot-1.1.7 → batplot-1.2.0}/batplot/style.py

@@ -166,6 +166,46 @@ def export_style_config(
         bbox = ax.get_position()
         frame_w_in = bbox.width * fw
         frame_h_in = bbox.height * fh
+        
+        # Build WASD state (20 parameters: 4 sides × 5 properties each)
+        def _get_spine_visible(which: str) -> bool:
+            sp = ax.spines.get(which)
+            try:
+                return bool(sp.get_visible()) if sp is not None else False
+            except Exception:
+                return False
+        
+        wasd_state = {
+            'top':    {
+                'spine': _get_spine_visible('top'),
+                'ticks': bool(tick_state.get('t_ticks', tick_state.get('tx', False))),
+                'minor': bool(tick_state.get('mtx', False)),
+                'labels': bool(tick_state.get('t_labels', tick_state.get('tx', False))),
+                'title': bool(getattr(ax, '_top_xlabel_on', False))
+            },
+            'bottom': {
+                'spine': _get_spine_visible('bottom'),
+                'ticks': bool(tick_state.get('b_ticks', tick_state.get('bx', True))),
+                'minor': bool(tick_state.get('mbx', False)),
+                'labels': bool(tick_state.get('b_labels', tick_state.get('bx', True))),
+                'title': bool(ax.get_xlabel())
+            },
+            'left':   {
+                'spine': _get_spine_visible('left'),
+                'ticks': bool(tick_state.get('l_ticks', tick_state.get('ly', True))),
+                'minor': bool(tick_state.get('mly', False)),
+                'labels': bool(tick_state.get('l_labels', tick_state.get('ly', True))),
+                'title': bool(ax.get_ylabel())
+            },
+            'right':  {
+                'spine': _get_spine_visible('right'),
+                'ticks': bool(tick_state.get('r_ticks', tick_state.get('ry', False))),
+                'minor': bool(tick_state.get('mry', False)),
+                'labels': bool(tick_state.get('r_labels', tick_state.get('ry', False))),
+                'title': bool(getattr(ax, '_right_ylabel_on', False))
+            },
+        }
+        
         cfg = {
             "figure": {
                 "size": [fw, fh],
@@ -184,12 +224,12 @@ def export_style_config(
                 "family_chain": plt.rcParams.get("font.sans-serif"),
             },
             "ticks": {
-                "visibility": tick_state.copy(),
                 "x_major_width": axis_tick_width(ax.xaxis, "major"),
                 "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"),
             },
+            "wasd_state": wasd_state,
             "spines": {
                 name: {
                     "linewidth": spn.get_linewidth(),
@@ -403,17 +443,88 @@ def apply_style_config(
 
         # Tick visibility + widths
         ticks_cfg = cfg.get("ticks", {})
-        vis_cfg = ticks_cfg.get("visibility", {})
-        changed_visibility = False
-        for k, v in vis_cfg.items():
-            if k in tick_state and isinstance(v, bool):
-                tick_state[k] = v
-                changed_visibility = True
-        if changed_visibility:
+        
+        # Try wasd_state first (version 2), fall back to visibility dict (version 1)
+        wasd = cfg.get("wasd_state", {})
+        if wasd:
+            # Apply WASD state (20 parameters)
             try:
-                _ui_update_tick_visibility(ax, tick_state)
+                # Apply spines from wasd
+                for side in ('top', 'bottom', 'left', 'right'):
+                    side_cfg = wasd.get(side, {})
+                    if 'spine' in side_cfg and side in ax.spines:
+                        ax.spines[side].set_visible(bool(side_cfg['spine']))
+                
+                # Apply ticks and labels
+                top_cfg = wasd.get('top', {})
+                bot_cfg = wasd.get('bottom', {})
+                left_cfg = wasd.get('left', {})
+                right_cfg = wasd.get('right', {})
+                
+                ax.tick_params(axis='x',
+                              top=bool(top_cfg.get('ticks', False)),
+                              bottom=bool(bot_cfg.get('ticks', True)),
+                              labeltop=bool(top_cfg.get('labels', False)),
+                              labelbottom=bool(bot_cfg.get('labels', True)))
+                ax.tick_params(axis='y',
+                              left=bool(left_cfg.get('ticks', True)),
+                              right=bool(right_cfg.get('ticks', False)),
+                              labelleft=bool(left_cfg.get('labels', True)),
+                              labelright=bool(right_cfg.get('labels', False)))
+                
+                # Apply minor ticks
+                if top_cfg.get('minor') or bot_cfg.get('minor'):
+                    from matplotlib.ticker import AutoMinorLocator, NullFormatter
+                    ax.xaxis.set_minor_locator(AutoMinorLocator())
+                    ax.xaxis.set_minor_formatter(NullFormatter())
+                ax.tick_params(axis='x', which='minor',
+                              top=bool(top_cfg.get('minor', False)),
+                              bottom=bool(bot_cfg.get('minor', False)),
+                              labeltop=False, labelbottom=False)
+                
+                if left_cfg.get('minor') or right_cfg.get('minor'):
+                    from matplotlib.ticker import AutoMinorLocator, NullFormatter
+                    ax.yaxis.set_minor_locator(AutoMinorLocator())
+                    ax.yaxis.set_minor_formatter(NullFormatter())
+                ax.tick_params(axis='y', which='minor',
+                              left=bool(left_cfg.get('minor', False)),
+                              right=bool(right_cfg.get('minor', False)),
+                              labelleft=False, labelright=False)
+                
+                # Apply titles
+                ax._top_xlabel_on = bool(top_cfg.get('title', False))
+                ax._right_ylabel_on = bool(right_cfg.get('title', False))
+                
+                # Update tick_state for consistency
+                tick_state['t_ticks'] = bool(top_cfg.get('ticks', False))
+                tick_state['t_labels'] = bool(top_cfg.get('labels', False))
+                tick_state['b_ticks'] = bool(bot_cfg.get('ticks', True))
+                tick_state['b_labels'] = bool(bot_cfg.get('labels', True))
+                tick_state['l_ticks'] = bool(left_cfg.get('ticks', True))
+                tick_state['l_labels'] = bool(left_cfg.get('labels', True))
+                tick_state['r_ticks'] = bool(right_cfg.get('ticks', False))
+                tick_state['r_labels'] = bool(right_cfg.get('labels', False))
+                tick_state['mtx'] = bool(top_cfg.get('minor', False))
+                tick_state['mbx'] = bool(bot_cfg.get('minor', False))
+                tick_state['mly'] = bool(left_cfg.get('minor', False))
+                tick_state['mry'] = bool(right_cfg.get('minor', False))
+                
             except Exception as e:
-                print(f"[DEBUG] Exception updating tick visibility: {e}")
+                print(f"Warning: Could not apply WASD tick visibility: {e}")
+        else:
+            # Fall back to old visibility dict
+            vis_cfg = ticks_cfg.get("visibility", {})
+            changed_visibility = False
+            for k, v in vis_cfg.items():
+                if k in tick_state and isinstance(v, bool):
+                    tick_state[k] = v
+                    changed_visibility = True
+            if changed_visibility:
+                try:
+                    _ui_update_tick_visibility(ax, tick_state)
+                except Exception as e:
+                    print(f"[DEBUG] Exception updating tick visibility: {e}")
+
 
         xmaj = ticks_cfg.get("x_major_width")
         xminr = ticks_cfg.get("x_minor_width")

{batplot-1.1.7 → batplot-1.2.0}/batplot/ui.py

@@ -250,7 +250,7 @@ def position_bottom_xlabel(ax, fig, tick_state: Dict[str, bool]):
                     pass
             return
         # Otherwise choose pad based on current tick label visibility
-        pad = 14 if bool(tick_state.get('b_labels', tick_state.get('bx', False))) else 6
+        pad = 8 if bool(tick_state.get('b_labels', tick_state.get('bx', False))) else 6
         try:
             ax.xaxis.labelpad = pad
         except Exception:
@@ -280,7 +280,7 @@ def position_left_ylabel(ax, fig, tick_state: Dict[str, bool]):
                 except Exception:
                     pass
             return
-        pad = 14 if bool(tick_state.get('l_labels', tick_state.get('ly', False))) else 6
+        pad = 8 if bool(tick_state.get('l_labels', tick_state.get('ly', False))) else 6
         try:
             ax.yaxis.labelpad = pad
         except Exception:

{batplot-1.1.7 → batplot-1.2.0}/batplot.egg-info/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "batplot"
-version = "1.1.7"
+version = "1.2.0"
 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.1.7/batplot/cli.py

@@ -1,34 +0,0 @@
-"""CLI entry for batplot.
-
-Clean entry point that delegates to mode handlers without import-time side effects.
-"""
-
-from __future__ import annotations
-
-import sys
-from typing import Optional
-
-def main(argv: Optional[list] = None) -> int:
-	"""Main CLI entry point for batplot.
-	
-	Args:
-		argv: Optional command line arguments (defaults to sys.argv)
-		
-	Returns:
-		Exit code (0 for success, non-zero for error)
-	"""
-	# Import here to avoid side effects at module import time
-	if argv is not None:
-		# Temporarily replace sys.argv for argument parsing
-		old_argv = sys.argv
-		sys.argv = ['batplot'] + list(argv)
-		
-	try:
-		# Import the main batplot function (now refactored to be safe)
-		from .batplot import batplot_main
-		return batplot_main()
-	finally:
-		if argv is not None:
-			sys.argv = old_argv
-
-__all__ = ["main"]