batplot 1.7.22__py3-none-any.whl → 1.7.24__py3-none-any.whl

batplot/interactive.py

@@ -866,10 +866,11 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
         )
 
     # NEW: export current style to .bpcfg
-    def export_style_config(filename, base_path=None):
+    def export_style_config(filename, base_path=None, overwrite_path=None):
         cts = getattr(_bp, 'cif_tick_series', None) if _bp is not None else None
         show_titles = bool(getattr(_bp, 'show_cif_titles', True)) if _bp is not None else True
-        return _bp_export_style_config(
+        from .style import export_style_config as _export_style_config
+        return _export_style_config(
             filename,
             fig,
             ax,
@@ -883,6 +884,7 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
             label_text_objects,
             base_path,
             show_cif_titles=show_titles,
+            overwrite_path=overwrite_path,
         )
 
     # NEW: apply imported style config (restricted application)
@@ -1467,6 +1469,17 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
             else:
                 continue
         elif key == 'z':  # toggle hkl labels on CIF ticks (non-blocking)
+            # Check if CIF files exist before allowing this command
+            has_cif = False
+            try:
+                has_cif = any(f.split(':')[0].lower().endswith('.cif') for f in args.files)
+                if not has_cif and _bp is not None:
+                    has_cif = bool(getattr(_bp, 'cif_tick_series', None))
+            except Exception:
+                pass
+            if not has_cif:
+                print("Unknown option.")
+                continue
             try:
                 # Flip visibility flag in batplot module
                 cur = bool(getattr(_bp, 'show_cif_hkl', False)) if _bp is not None else False
@@ -1546,6 +1559,17 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                 print(f"Error in legend submenu: {e}")
             continue
         elif key == 'j':  # toggle CIF title labels (filename labels)
+            # Check if CIF files exist before allowing this command
+            has_cif = False
+            try:
+                has_cif = any(f.split(':')[0].lower().endswith('.cif') for f in args.files)
+                if not has_cif and _bp is not None:
+                    has_cif = bool(getattr(_bp, 'cif_tick_series', None))
+            except Exception:
+                pass
+            if not has_cif:
+                print("Unknown option.")
+                continue
             try:
                 # Preserve both x and y-axis limits to prevent movement
                 prev_xlim = ax.get_xlim()
@@ -1609,11 +1633,47 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                             print(f"  {i}: {f}  ({timestamp})")
                         else:
                             print(f"  {i}: {f}")
-                prompt = "Enter new filename (no ext needed) or number to overwrite (q=cancel): "
+                last_session_path = getattr(fig, '_last_session_save_path', None)
+                if last_session_path:
+                    prompt = "Enter new filename (no ext needed), number to overwrite, or o to overwrite last (q=cancel): "
+                else:
+                    prompt = "Enter new filename (no ext needed) or number to overwrite (q=cancel): "
                 choice = input(prompt).strip()
                 if not choice or choice.lower() == 'q':
                     print("Canceled.")
                     continue
+                if choice.lower() == 'o':
+                    # Overwrite last saved session
+                    if not last_session_path:
+                        print("No previous save found.")
+                        continue
+                    if not os.path.exists(last_session_path):
+                        print(f"Previous save file not found: {last_session_path}")
+                        continue
+                    yn = input(f"Overwrite '{os.path.basename(last_session_path)}'? (y/n): ").strip().lower()
+                    if yn != 'y':
+                        continue
+                    _bp_dump_session(
+                        last_session_path,
+                        fig=fig,
+                        ax=ax,
+                        x_data_list=x_data_list,
+                        y_data_list=y_data_list,
+                        orig_y=orig_y,
+                        offsets_list=offsets_list,
+                        labels=labels,
+                        delta=delta,
+                        args=args,
+                        tick_state=tick_state,
+                        cif_tick_series=(getattr(_bp, 'cif_tick_series', None) if _bp is not None else None),
+                        cif_hkl_map=(getattr(_bp, 'cif_hkl_map', None) if _bp is not None else None),
+                        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=True,
+                    )
+                    print(f"Overwritten session to {last_session_path}")
+                    continue
                 target_path = None
                 # Overwrite by number
                 if choice.isdigit() and files:
@@ -1626,10 +1686,32 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                             continue
                         target_path = os.path.join(folder, name)
                         skip_confirm = True  # Already confirmed above
+                        _bp_dump_session(
+                            target_path,
+                            fig=fig,
+                            ax=ax,
+                            x_data_list=x_data_list,
+                            y_data_list=y_data_list,
+                            orig_y=orig_y,
+                            offsets_list=offsets_list,
+                            labels=labels,
+                            delta=delta,
+                            args=args,
+                            tick_state=tick_state,
+                            cif_tick_series=(getattr(_bp, 'cif_tick_series', None) if _bp is not None else None),
+                            cif_hkl_map=(getattr(_bp, 'cif_hkl_map', None) if _bp is not None else None),
+                            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}")
+                        fig._last_session_save_path = target_path
+                        continue
                     else:
                         print("Invalid number.")
                         continue
-                else:
+                if choice.lower() != 'o':
                     # New name, allow relative or absolute
                     name = choice
                     root, ext = os.path.splitext(name)
@@ -1643,27 +1725,28 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                             print("Canceled.")
                             continue
                         skip_confirm = True  # Already confirmed
-                # Delegate to session dumper
-                _bp_dump_session(
-                    target_path,
-                    fig=fig,
-                    ax=ax,
-                    x_data_list=x_data_list,
-                    y_data_list=y_data_list,
-                    orig_y=orig_y,
-                    offsets_list=offsets_list,
-                    labels=labels,
-                    delta=delta,
-                    args=args,
-                    tick_state=tick_state,
-                    cif_tick_series=(getattr(_bp, 'cif_tick_series', None) if _bp is not None else None),
-                    cif_hkl_map=(getattr(_bp, 'cif_hkl_map', None) if _bp is not None else None),
-                    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}")
+                    # Delegate to session dumper
+                    _bp_dump_session(
+                        target_path,
+                        fig=fig,
+                        ax=ax,
+                        x_data_list=x_data_list,
+                        y_data_list=y_data_list,
+                        orig_y=orig_y,
+                        offsets_list=offsets_list,
+                        labels=labels,
+                        delta=delta,
+                        args=args,
+                        tick_state=tick_state,
+                        cif_tick_series=(getattr(_bp, 'cif_tick_series', None) if _bp is not None else None),
+                        cif_hkl_map=(getattr(_bp, 'cif_hkl_map', None) if _bp is not None else None),
+                        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}")
+                    fig._last_session_save_path = target_path
             except Exception as e:
                 print(f"Error saving session: {e}")
             continue
@@ -3493,11 +3576,32 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                                 print(f"  {_i}: {fname}  ({timestamp})")
                             else:
                                 print(f"  {_i}: {fname}")
-                    sub = input(colorize_prompt("Style submenu: (e=export, q=return, r=refresh): ")).strip().lower()
+                    last_style_path = getattr(fig, '_last_style_export_path', None)
+                    if last_style_path:
+                        sub = input(colorize_prompt("Style submenu: (e=export, o=overwrite last, q=return, r=refresh): ")).strip().lower()
+                    else:
+                        sub = input(colorize_prompt("Style submenu: (e=export, q=return, r=refresh): ")).strip().lower()
                     if sub == 'q':
                         break
                     if sub == 'r' or sub == '':
                         continue
+                    if sub == 'o':
+                        # Overwrite last exported style file
+                        if not last_style_path:
+                            print("No previous export found.")
+                            continue
+                        if not os.path.exists(last_style_path):
+                            print(f"Previous export file not found: {last_style_path}")
+                            continue
+                        yn = input(f"Overwrite '{os.path.basename(last_style_path)}'? (y/n): ").strip().lower()
+                        if yn != 'y':
+                            continue
+                        # Call export_style_config with overwrite_path to skip dialog
+                        exported_path = export_style_config(None, base_path=None, overwrite_path=last_style_path)
+                        if exported_path:
+                            fig._last_style_export_path = exported_path
+                        style_menu_active = False
+                        break
                     if sub == 'e':
                         save_base = choose_save_path(source_file_paths, purpose="style export")
                         if not save_base:
@@ -3505,7 +3609,9 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                             continue
                         print(f"\nChosen path: {save_base}")
                         # Call export_style_config which handles the entire export dialog
-                        export_style_config(None, base_path=save_base)  # filename parameter ignored
+                        exported_path = export_style_config(None, base_path=save_base)  # filename parameter ignored
+                        if exported_path:
+                            fig._last_style_export_path = exported_path
                         style_menu_active = False  # Exit style submenu and return to main menu
                         break
                     else:
@@ -3543,14 +3649,33 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                         else:
                             print(f"  {i}: {fname}")
                 
-                filename = input("Enter filename (default SVG if no extension) or number to overwrite (q=cancel): ").strip()
+                last_figure_path = getattr(fig, '_last_figure_export_path', None)
+                if last_figure_path:
+                    filename = input("Enter filename (default SVG if no extension), number to overwrite, or o to overwrite last (q=cancel): ").strip()
+                else:
+                    filename = input("Enter filename (default SVG if no extension) or number to overwrite (q=cancel): ").strip()
                 if not filename or filename.lower() == 'q':
                     print("Canceled.")
                     continue
                 
+                already_confirmed = False  # Initialize for new filename case
+                # Check for 'o' option
+                if filename.lower() == 'o':
+                    if not last_figure_path:
+                        print("No previous export found.")
+                        continue
+                    if not os.path.exists(last_figure_path):
+                        print(f"Previous export file not found: {last_figure_path}")
+                        continue
+                    yn = input(f"Overwrite '{os.path.basename(last_figure_path)}'? (y/n): ").strip().lower()
+                    if yn != 'y':
+                        print("Canceled.")
+                        continue
+                    export_target = last_figure_path
+                    already_confirmed = True
                 # Check if user selected a number
-                already_confirmed = False
-                if filename.isdigit() and files:
+                elif filename.isdigit() and files:
+                    already_confirmed = False
                     idx = int(filename)
                     if 1 <= idx <= len(files):
                         name = files[idx-1]
@@ -3617,6 +3742,7 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                         else:
                             fig.savefig(export_target, dpi=300)
                         print(f"Figure saved to {export_target}")
+                        fig._last_figure_export_path = export_target
                         for i, txt in enumerate(label_text_objects):
                             txt.set_text(f"{i+1}: {labels[i]}")
                         fig.canvas.draw()