batplot 1.8.4__py3-none-any.whl → 1.8.11__py3-none-any.whl

batplot/data/USER_MANUAL.md

@@ -167,6 +167,55 @@ batplot data.xye:0.25:1.54 --xaxis 2theta --interactive
 # Multiple files with different wavelengths
 batplot file1.xye:1.5406 file2.xye:0.7093 pattern.cif:1.5406 --xaxis 2theta
 # Each file uses its own wavelength; CIF ticks use 1.5406 Å
+
+## Data Conversion (`--convert`)
+
+The `--convert` flag allows you to convert XRD data files between different representations and export them to a new `converted` subfolder. This is useful for batch conversion of files without opening them in the interactive plotter.
+
+### Conversion Modes
+
+1. **Wavelength-to-wavelength conversion**:
+   - Convert 2θ values from one wavelength to another
+   - Syntax: `batplot file.xye --convert <wavelength1> <wavelength2>`
+   - Example: `batplot file.xye --convert 1.54 0.25`
+     - Converts 2θ values measured with λ=1.54 Å to equivalent 2θ values for λ=0.25 Å
+     - Process: 2θ(λ=1.54) → Q → 2θ(λ=0.25)
+
+2. **Wavelength-to-Q conversion**:
+   - Convert 2θ values (with given wavelength) to Q space
+   - Syntax: `batplot file.xye --convert <wavelength> q`
+   - Example: `batplot file.xye --convert 1.54 q`
+     - Converts 2θ values measured with λ=1.54 Å to Q space
+     - Output file: `converted/file.qye`
+
+3. **Q-to-wavelength conversion**:
+   - Convert Q space values to 2θ (with given wavelength)
+   - Syntax: `batplot file.qye --convert q <wavelength>`
+   - Example: `batplot file.qye --convert q 1.54`
+     - Converts Q values to 2θ values for λ=1.54 Å
+     - Output file: `converted/file.xy`
+
+### Output Location
+
+All converted files are saved in a `converted` subfolder within the directory containing the input files. The original file names are preserved, but extensions may change:
+- Q-space files: `.qye` extension
+- 2θ files: `.xy` or original extension
+
+### Examples
+
+```bash
+# Convert 2θ from Cu Kα (1.54 Å) to Mo Kα (0.709 Å)
+batplot pattern.xye --convert 1.54 0.709
+
+# Convert 2θ to Q space
+batplot pattern.xye --convert 1.54 q
+
+# Convert Q to 2θ
+batplot pattern.qye --convert q 1.54
+
+# Convert multiple files
+batplot file1.xye file2.xye --convert 1.54 0.25
+```
 ```
 
 **Note:** When using dual wavelength conversion, the crosshair (press `n` in interactive mode) will automatically display both the original 2theta (calculated from λ₁) and the current 2theta (displayed axis, calculated from λ₂), along with Q and d-spacing values.

batplot/electrochem_interactive.py

@@ -374,7 +374,7 @@ def _apply_stored_smooth_settings(cycle_lines: Dict[int, Dict[str, Optional[obje
                     ln._smooth_applied = True
 
 
-def _print_menu(n_cycles: int, is_dqdv: bool = False):
+def _print_menu(n_cycles: int, is_dqdv: bool = False, fig=None):
     # Three-column menu similar to operando: Styles | Geometries | Options
     # Use dynamic column widths for clean alignment.
     col1 = [
@@ -405,6 +405,19 @@ def _print_menu(n_cycles: int, is_dqdv: bool = False):
         "b: undo",
         "q: quit",
     ]
+
+    # Conditional overwrite shortcuts under (Options)
+    if fig is not None:
+        last_session = getattr(fig, "_last_session_save_path", None)
+        last_style = getattr(fig, "_last_style_export_path", None)
+        last_figure = getattr(fig, "_last_figure_export_path", None)
+        if last_session:
+            col3.append("os: overwrite session")
+        if last_style:
+            col3.append("ops: overwrite style")
+            col3.append("opsg: overwrite style+geom")
+        if last_figure:
+            col3.append("oe: overwrite figure")
     # Compute widths (min width prevents overly narrow columns)
     w1 = max(len("(Styles)"), *(len(s) for s in col1), 18)
     w2 = max(len("(Geometries)"), *(len(s) for s in col2), 12)
@@ -1640,7 +1653,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             print("Undo: restored previous state.")
         except Exception as e:
             print(f"Undo failed: {e}")
-    _print_menu(len(all_cycles), is_dqdv)
+    _print_menu(len(all_cycles), is_dqdv, fig)
     while True:
         try:
             key = _safe_input("Press a key: ").strip().lower()
@@ -1657,18 +1670,18 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             if confirm == 'y':
                 break
             else:
-                _print_menu(len(all_cycles), is_dqdv)
+                _print_menu(len(all_cycles), is_dqdv, fig)
                 continue
         elif key == 'b':
             restore_state()
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'e':
             # Export current figure to a file; default extension .svg if missing
             try:
                 base_path = choose_save_path(source_paths, purpose="figure export")
                 if not base_path:
-                    _print_menu(len(all_cycles), is_dqdv)
+                    _print_menu(len(all_cycles), is_dqdv, fig)
                     continue
                 # List existing figure files in Figures/ subdirectory
                 fig_extensions = ('.svg', '.png', '.jpg', '.jpeg', '.pdf', '.eps', '.tif', '.tiff')
@@ -1690,7 +1703,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 else:
                     fname = _safe_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)
+                    _print_menu(len(all_cycles), is_dqdv, fig)
                     continue
                 
                 already_confirmed = False  # Initialize for new filename case
@@ -1698,15 +1711,15 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 if fname.lower() == 'o':
                     if not last_figure_path:
                         print("No previous export found.")
-                        _print_menu(len(all_cycles), is_dqdv)
+                        _print_menu(len(all_cycles), is_dqdv, fig)
                         continue
                     if not os.path.exists(last_figure_path):
                         print(f"Previous export file not found: {last_figure_path}")
-                        _print_menu(len(all_cycles), is_dqdv)
+                        _print_menu(len(all_cycles), is_dqdv, fig)
                         continue
                     yn = _safe_input(f"Overwrite '{os.path.basename(last_figure_path)}'? (y/n): ").strip().lower()
                     if yn != 'y':
-                        _print_menu(len(all_cycles), is_dqdv)
+                        _print_menu(len(all_cycles), is_dqdv, fig)
                         continue
                     target = last_figure_path
                     already_confirmed = True
@@ -1718,13 +1731,13 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         name = files[idx-1]
                         yn = _safe_input(f"Overwrite '{name}'? (y/n): ").strip().lower()
                         if yn != 'y':
-                            _print_menu(len(all_cycles), is_dqdv)
+                            _print_menu(len(all_cycles), is_dqdv, fig)
                             continue
                         target = file_list[idx-1][1]  # Full path from list
                         already_confirmed = True
                     else:
                         print("Invalid number.")
-                        _print_menu(len(all_cycles), is_dqdv)
+                        _print_menu(len(all_cycles), is_dqdv, fig)
                         continue
                 else:
                     root, ext = os.path.splitext(fname)
@@ -1807,7 +1820,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     print(f"Export failed: {e}")
             except Exception as e:
                 print(f"Export failed: {e}")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'h':
             # Legend submenu: toggle visibility and move legend in inches relative to canvas center
@@ -1896,18 +1909,27 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                                         continue
                                     push_state("legend-position")
                                     try:
-                                        fig._ec_legend_xy_in = _sanitize_legend_offset(fig, (x_in, xy_in[1]))
-                                        # If legend visible, reposition now
-                                        leg = ax.get_legend()
-                                        if leg is not None and leg.get_visible():
-                                            if not _apply_legend_position(fig, ax):
-                                                handles, labels = _visible_legend_entries(ax)
-                                                if handles:
-                                                    _legend_no_frame(ax, handles, labels, loc='best', borderaxespad=1.0)
-                                        fig.canvas.draw_idle()
-                                        print(f"Legend position updated: x={x_in:.2f}, y={xy_in[1]:.2f}")
-                                    except Exception:
-                                        pass
+                                        # Store title before updating position
+                                        _store_legend_title(fig, ax)
+                                        # Sanitize and store the new position
+                                        new_pos = _sanitize_legend_offset(fig, (x_in, xy_in[1]))
+                                        if new_pos is not None:
+                                            fig._ec_legend_xy_in = new_pos
+                                            # If legend visible, reposition now
+                                            leg = ax.get_legend()
+                                            if leg is not None and leg.get_visible():
+                                                if not _apply_legend_position(fig, ax):
+                                                    # Fallback: rebuild with title preserved
+                                                    handles, labels = _visible_legend_entries(ax)
+                                                    if handles:
+                                                        legend_title = _get_legend_title(fig)
+                                                        _legend_no_frame(ax, handles, labels, loc='best', borderaxespad=1.0, title=legend_title)
+                                            fig.canvas.draw_idle()
+                                            print(f"Legend position updated: x={new_pos[0]:.2f}, y={new_pos[1]:.2f}")
+                                        else:
+                                            print(f"Invalid position: x={x_in:.2f} is out of bounds. Position not updated.")
+                                    except Exception as e:
+                                        print(f"Error updating legend position: {e}")
                             elif pos_cmd == 'y':
                                 # Y only: stay in loop
                                 while True:
@@ -1923,18 +1945,27 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                                         continue
                                     push_state("legend-position")
                                     try:
-                                        fig._ec_legend_xy_in = _sanitize_legend_offset(fig, (xy_in[0], y_in))
-                                        # If legend visible, reposition now
-                                        leg = ax.get_legend()
-                                        if leg is not None and leg.get_visible():
-                                            if not _apply_legend_position(fig, ax):
-                                                handles, labels = _visible_legend_entries(ax)
-                                                if handles:
-                                                    _legend_no_frame(ax, handles, labels, loc='best', borderaxespad=1.0)
-                                        fig.canvas.draw_idle()
-                                        print(f"Legend position updated: x={xy_in[0]:.2f}, y={y_in:.2f}")
-                                    except Exception:
-                                        pass
+                                        # Store title before updating position
+                                        _store_legend_title(fig, ax)
+                                        # Sanitize and store the new position
+                                        new_pos = _sanitize_legend_offset(fig, (xy_in[0], y_in))
+                                        if new_pos is not None:
+                                            fig._ec_legend_xy_in = new_pos
+                                            # If legend visible, reposition now
+                                            leg = ax.get_legend()
+                                            if leg is not None and leg.get_visible():
+                                                if not _apply_legend_position(fig, ax):
+                                                    # Fallback: rebuild with title preserved
+                                                    handles, labels = _visible_legend_entries(ax)
+                                                    if handles:
+                                                        legend_title = _get_legend_title(fig)
+                                                        _legend_no_frame(ax, handles, labels, loc='best', borderaxespad=1.0, title=legend_title)
+                                            fig.canvas.draw_idle()
+                                            print(f"Legend position updated: x={new_pos[0]:.2f}, y={new_pos[1]:.2f}")
+                                        else:
+                                            print(f"Invalid position: y={y_in:.2f} is out of bounds. Position not updated.")
+                                    except Exception as e:
+                                        print(f"Error updating legend position: {e}")
                             else:
                                 # Try to parse as "x y" format
                                 parts = pos_cmd.replace(',', ' ').split()
@@ -1946,23 +1977,32 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                                     print("Invalid numbers."); continue
                                 push_state("legend-position")
                                 try:
-                                    fig._ec_legend_xy_in = _sanitize_legend_offset(fig, (x_in, y_in))
-                                    # If legend visible, reposition now
-                                    leg = ax.get_legend()
-                                    if leg is not None and leg.get_visible():
-                                        if not _apply_legend_position(fig, ax):
-                                            handles, labels = _visible_legend_entries(ax)
-                                            if handles:
-                                                _legend_no_frame(ax, handles, labels, loc='best', borderaxespad=1.0)
-                                    fig.canvas.draw_idle()
-                                    print(f"Legend position updated: x={x_in:.2f}, y={y_in:.2f}")
-                                except Exception:
-                                    pass
+                                    # Store title before updating position
+                                    _store_legend_title(fig, ax)
+                                    # Sanitize and store the new position
+                                    new_pos = _sanitize_legend_offset(fig, (x_in, y_in))
+                                    if new_pos is not None:
+                                        fig._ec_legend_xy_in = new_pos
+                                        # If legend visible, reposition now
+                                        leg = ax.get_legend()
+                                        if leg is not None and leg.get_visible():
+                                            if not _apply_legend_position(fig, ax):
+                                                # Fallback: rebuild with title preserved
+                                                handles, labels = _visible_legend_entries(ax)
+                                                if handles:
+                                                    legend_title = _get_legend_title(fig)
+                                                    _legend_no_frame(ax, handles, labels, loc='best', borderaxespad=1.0, title=legend_title)
+                                        fig.canvas.draw_idle()
+                                        print(f"Legend position updated: x={new_pos[0]:.2f}, y={new_pos[1]:.2f}")
+                                    else:
+                                        print(f"Invalid position: x={x_in:.2f}, y={y_in:.2f} is out of bounds. Position not updated.")
+                                except Exception as e:
+                                    print(f"Error updating legend position: {e}")
                     else:
                         print("Unknown option.")
             except Exception:
                 pass
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'p':
             # Print/export style or style+geometry
@@ -2070,14 +2110,14 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         print("Unknown choice.")
             except Exception as e:
                 print(f"Error in style submenu: {e}")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'i':
             # Import style from .bps/.bpsg/.bpcfg
             try:
                 path = choose_style_file(source_paths, purpose="style import")
                 if not path:
-                    _print_menu(len(all_cycles), is_dqdv)
+                    _print_menu(len(all_cycles), is_dqdv, fig)
                     continue
                 push_state("import-style")
                 with open(path, 'r', encoding='utf-8') as f:
@@ -2087,7 +2127,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 kind = cfg.get('kind', '')
                 if kind not in ('ec_style', 'ec_style_geom'):
                     print("Not an EC style file.")
-                    _print_menu(len(all_cycles), is_dqdv)
+                    _print_menu(len(all_cycles), is_dqdv, fig)
                     continue
 
                 # Enforce compatibility between style/geom ro state and current figure ro state
@@ -2099,7 +2139,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     else:
                         print("Warning: EC style/geometry file was saved without --ro; current plot was created with --ro.")
                     print("Not applying EC style/geometry to avoid corrupting axis orientation.")
-                    _print_menu(len(all_cycles), is_dqdv)
+                    _print_menu(len(all_cycles), is_dqdv, fig)
                     continue
                 
                 has_geometry = (kind == 'ec_style_geom' and 'geometry' in cfg)
@@ -2436,7 +2476,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
 
             except Exception as e:
                 print(f"Error importing style: {e}")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'l':
             # Line widths submenu: curves vs frame/ticks
@@ -2664,7 +2704,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         print("Unknown option.")
             except Exception as e:
                 print(f"Error in line submenu: {e}")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'k':
             # Spine colors (w=top, a=left, s=bottom, d=right)
@@ -2722,7 +2762,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     fig.canvas.draw()
             except Exception as e:
                 print(f"Error in spine color menu: {e}")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'r':
             # Rename axis labels
@@ -2792,7 +2832,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         fig.canvas.draw_idle()
             except Exception as e:
                 print(f"Error renaming axes: {e}")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 't':
             # Unified WASD: w/a/s/d x 1..5 => spine, ticks, minor, labels, title
@@ -2988,7 +3028,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                             fig.canvas.draw_idle()
             except Exception as e:
                 print(f"Error in WASD tick visibility menu: {e}")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 's':
             try:
@@ -2996,7 +3036,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 last_session_path = getattr(fig, '_last_session_save_path', None)
                 folder = choose_save_path(source_paths, purpose="EC session save")
                 if not folder:
-                    _print_menu(len(all_cycles), is_dqdv); continue
+                    _print_menu(len(all_cycles), is_dqdv, fig); continue
                 print(f"\nChosen path: {folder}")
                 try:
                     files = sorted([f for f in os.listdir(folder) if f.lower().endswith('.pkl')])
@@ -3017,35 +3057,35 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     prompt = "Enter new filename (no ext needed) or number to overwrite (q=cancel): "
                 choice = _safe_input(prompt).strip()
                 if not choice or choice.lower() == 'q':
-                    _print_menu(len(all_cycles), is_dqdv); continue
+                    _print_menu(len(all_cycles), is_dqdv, fig); continue
                 if choice.lower() == 'o':
                     # Overwrite last saved session
                     if not last_session_path:
                         print("No previous save found.")
-                        _print_menu(len(all_cycles), is_dqdv); continue
+                        _print_menu(len(all_cycles), is_dqdv, fig); continue
                     if not os.path.exists(last_session_path):
                         print(f"Previous save file not found: {last_session_path}")
-                        _print_menu(len(all_cycles), is_dqdv); continue
+                        _print_menu(len(all_cycles), is_dqdv, fig); continue
                     yn = _safe_input(f"Overwrite '{os.path.basename(last_session_path)}'? (y/n): ").strip().lower()
                     if yn != 'y':
-                        _print_menu(len(all_cycles), is_dqdv); continue
+                        _print_menu(len(all_cycles), is_dqdv, fig); continue
                     dump_ec_session(last_session_path, fig=fig, ax=ax, cycle_lines=cycle_lines, skip_confirm=True)
                     print(f"Overwritten session to {last_session_path}")
-                    _print_menu(len(all_cycles), is_dqdv); continue
+                    _print_menu(len(all_cycles), is_dqdv, fig); continue
                 if choice.isdigit() and files:
                     idx = int(choice)
                     if 1 <= idx <= len(files):
                         name = files[idx-1]
                         yn = _safe_input(f"Overwrite '{name}'? (y/n): ").strip().lower()
                         if yn != 'y':
-                            _print_menu(len(all_cycles), is_dqdv); continue
+                            _print_menu(len(all_cycles), is_dqdv, fig); continue
                         target = os.path.join(folder, name)
                         dump_ec_session(target, fig=fig, ax=ax, cycle_lines=cycle_lines, skip_confirm=True)
                         fig._last_session_save_path = target
-                        _print_menu(len(all_cycles), is_dqdv); continue
+                        _print_menu(len(all_cycles), is_dqdv, fig); continue
                     else:
                         print("Invalid number.")
-                        _print_menu(len(all_cycles), is_dqdv); continue
+                        _print_menu(len(all_cycles), is_dqdv, fig); continue
                 if choice.lower() != 'o':
                     name = choice
                     root, ext = os.path.splitext(name)
@@ -3055,12 +3095,12 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     if os.path.exists(target):
                         yn = _safe_input(f"'{os.path.basename(target)}' exists. Overwrite? (y/n): ").strip().lower()
                         if yn != 'y':
-                            _print_menu(len(all_cycles), is_dqdv); continue
+                            _print_menu(len(all_cycles), is_dqdv, fig); continue
                 dump_ec_session(target, fig=fig, ax=ax, cycle_lines=cycle_lines, skip_confirm=True)
                 fig._last_session_save_path = target
             except Exception as e:
                 print(f"Save failed: {e}")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'c':
             # Show current palette if one is applied (this is informational only)
@@ -3096,7 +3136,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                 continue
             if line.lower() == 'u':
                 manage_user_colors(fig)
-                _print_menu(len(all_cycles), is_dqdv)
+                _print_menu(len(all_cycles), is_dqdv, fig)
                 continue
             tokens = line.replace(',', ' ').split()
             mode, cycles, mapping, palette, use_all = _parse_cycle_tokens(tokens, fig)
@@ -3225,13 +3265,13 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             if ignored:
                 print("Ignored cycles:", ", ".join(str(c) for c in ignored))
             # Show the menu again after completing the command
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'a':
             # X-axis submenu: number-of-ions vs capacity (not available in dQdV mode)
             if is_dqdv:
                 print("Capacity/ion conversion is not available in dQ/dV mode.")
-                _print_menu(len(all_cycles), is_dqdv)
+                _print_menu(len(all_cycles), is_dqdv, fig)
                 continue
             # X-axis submenu: number-of-ions vs capacity
             while True:
@@ -3372,7 +3412,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                             fig.canvas.draw()
                         except Exception:
                             fig.canvas.draw_idle()
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'f':
             # Font submenu with numbered options
@@ -3443,7 +3483,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                             print("Size must be positive.")
                     except Exception:
                         print("Invalid size.")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'x':
             # X-axis: set limits only
@@ -3527,7 +3567,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     fig.canvas.draw()
                 except Exception:
                     print("Invalid limits, ignored.")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'y':
             # Y-axis: set limits only
@@ -3611,7 +3651,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     fig.canvas.draw()
                 except Exception:
                     print("Invalid limits, ignored.")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'g':
             # Geometry submenu: plot frame vs canvas (scales moved to separate keys)
@@ -3640,13 +3680,13 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     fig.canvas.draw()
                 except Exception:
                     fig.canvas.draw_idle()
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         elif key == 'sm':
             # dQ/dV smoothing utilities (only available in dQdV mode)
             if not is_dqdv:
                 print("Smoothing is only available in dQ/dV mode.")
-                _print_menu(len(all_cycles), is_dqdv)
+                _print_menu(len(all_cycles), is_dqdv, fig)
                 continue
             while True:
                 print("\n\033[1mdQ/dV Data Filtering (Neware method)\033[0m")
@@ -4006,11 +4046,11 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                         print("Invalid number.")
                     continue
                 print("Unknown command. Use a/o/r/q.")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
             continue
         else:
             print("Unknown command.")
-            _print_menu(len(all_cycles), is_dqdv)
+            _print_menu(len(all_cycles), is_dqdv, fig)
 
 
 def _get_geometry_snapshot(fig, ax) -> Dict: