batplot 1.7.25__py3-none-any.whl → 1.7.26__py3-none-any.whl

batplot/electrochem_interactive.py

@@ -1684,6 +1684,13 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     if not already_confirmed and os.path.exists(target):
                         target = _confirm_overwrite(target)
                     if target:
+                        # Save current legend position before export (savefig can change layout)
+                        saved_legend_pos = None
+                        try:
+                            saved_legend_pos = getattr(fig, '_ec_legend_xy_in', None)
+                        except Exception:
+                            pass
+                        
                         # If exporting SVG, make background transparent for PowerPoint
                         _, ext2 = os.path.splitext(target)
                         ext2 = ext2.lower()
@@ -1727,6 +1734,15 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                             fig.savefig(target, bbox_inches='tight')
                         print(f"Exported figure to {target}")
                         fig._last_figure_export_path = target
+                        
+                        # Restore legend position after savefig (which may have changed layout)
+                        if saved_legend_pos is not None:
+                            try:
+                                fig._ec_legend_xy_in = saved_legend_pos
+                                _rebuild_legend(ax)
+                                fig.canvas.draw_idle()
+                            except Exception:
+                                pass
                 except Exception as e:
                     print(f"Export failed: {e}")
             except Exception as e:
@@ -3283,8 +3299,10 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             continue
         elif key == 'f':
             # Font submenu with numbered options
+            cur_family = plt.rcParams.get('font.sans-serif', [''])[0]
+            cur_size = plt.rcParams.get('font.size', None)
             while True:
-                print("\nFont menu: f=font family, s=size, q=back")
+                print(f"\nFont menu (current: family='{cur_family}', size={cur_size}): f=font family, s=size, q=back")
                 sub = input("Font> ").strip().lower()
                 if not sub:
                     continue
@@ -3298,7 +3316,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
                     for i, font in enumerate(fonts, 1):
                         print(f"  {i}: {font}")
                     print("Or enter custom font name directly.")
-                    choice = input("Font family (number or name): ").strip()
+                    choice = input(f"Font family (current: '{cur_family}', number or name): ").strip()
                     if not choice:
                         continue
                     # Check if it's a number

batplot/interactive.py

@@ -963,7 +963,7 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
             txt = ax.text(1.0, 1.0, "",
                           ha='right', va='bottom',
                           transform=ax.transAxes,
-                          fontsize=max(9, int(0.6 * plt.rcParams.get('font.size', 12))),
+                          fontsize=max(9, int(0.6 * plt.rcParams.get('font.size', 16))),
                           color='0.15',
                           bbox=dict(boxstyle='round,pad=0.25', fc='white', ec='0.7', alpha=0.8))
 
@@ -3130,15 +3130,18 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
             except Exception as e:
                 print(f"Error setting widths: {e}")
         elif key == 'f':
+            cur_family = plt.rcParams.get('font.sans-serif', [''])[0]
+            cur_size = plt.rcParams.get('font.size', None)
             while True:
-                subkey = input(colorize_prompt("Font submenu (s=size, f=family, q=return): ")).strip().lower()
+                subkey = input(colorize_prompt(f"Font submenu (current: family='{cur_family}', size={cur_size}) - s=size, f=family, q=return: ")).strip().lower()
                 if subkey == 'q':
                     break
                 if subkey == '':
                     continue
                 if subkey == 's':
                     try:
-                        fs = input("Enter new font size (q=cancel): ").strip()
+                        cur_size = plt.rcParams.get('font.size', None)
+                        fs = input(f"Enter new font size (current: {cur_size}, q=cancel): ").strip()
                         if not fs or fs.lower() == 'q':
                             print("Canceled.")
                         else:
@@ -3153,13 +3156,14 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                         print(f"Error changing font size: {e}")
                 elif subkey == 'f':
                     try:
+                        cur_family = plt.rcParams.get('font.sans-serif', [''])[0]
                         print("Common publication fonts:")
                         print("  1) Arial")
                         print("  2) Helvetica")
                         print("  3) Times New Roman")
                         print("  4) STIXGeneral")
                         print("  5) DejaVu Sans")
-                        ft_raw = input("Enter font number or family name (q=cancel): ").strip()
+                        ft_raw = input(f"Enter font number or family name (current: '{cur_family}', q=cancel): ").strip()
                         if not ft_raw or ft_raw.lower() == 'q':
                             print("Canceled.")
                         else:

batplot/operando_ec_interactive.py

@@ -1553,7 +1553,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 # Create text annotations for coordinates
                 coord_text = fig.text(0.02, 0.98, '', transform=fig.transFigure, 
                                      verticalalignment='top', 
-                                     fontsize=max(9, int(0.6 * mpl_plt.rcParams.get('font.size', 12))),
+                                     fontsize=max(9, int(0.6 * mpl_plt.rcParams.get('font.size', 16))),
                                      color='0.15',
                                      bbox=dict(boxstyle='round,pad=0.25', fc='white', ec='0.7', alpha=0.8))
             except Exception as e:

batplot/session.py

@@ -2868,15 +2868,23 @@ def load_cpc_session(filename: str):
                     fw, fh = fig.get_size_inches()
                     fx = 0.5 + float(xy_in[0]) / float(fw)
                     fy = 0.5 + float(xy_in[1]) / float(fh)
-                    leg = ax.legend(H, L, loc='center', bbox_to_anchor=(fx, fy), bbox_transform=fig.transFigure, borderaxespad=1.0)
+                    # Use same spacing parameters as _legend_no_frame for consistent legend appearance
+                    leg = ax.legend(H, L, loc='center', bbox_to_anchor=(fx, fy), bbox_transform=fig.transFigure, 
+                                   handlelength=1.0, handletextpad=0.35, labelspacing=0.25, 
+                                   borderaxespad=0.5, borderpad=0.3, columnspacing=0.6,
+                                   labelcolor='linecolor', frameon=False)
                     # persist inches on fig for interactive menu
                     try:
                         fig._cpc_legend_xy_in = (float(xy_in[0]), float(xy_in[1]))
                     except Exception:
                         pass
                 else:
-                    leg = ax.legend(H, L, loc='best', borderaxespad=1.0)
-                # Always hide legend frame to match interactive export behavior
+                    # Use same spacing parameters as _legend_no_frame for consistent legend appearance
+                    leg = ax.legend(H, L, loc='best', 
+                                   handlelength=1.0, handletextpad=0.35, labelspacing=0.25, 
+                                   borderaxespad=0.5, borderpad=0.3, columnspacing=0.6,
+                                   labelcolor='linecolor', frameon=False)
+                # Ensure legend frame is off (redundant but safe)
                 try:
                     if leg is not None:
                         leg.set_frame_on(False)

batplot/ui.py

@@ -611,7 +611,7 @@ def resize_plot_frame(fig, ax, y_data_list: List, label_text_objects: List, args
             ax_bbox = ax.get_position()
             cur_ax_w_in = ax_bbox.width * fig_w_in
             cur_ax_h_in = ax_bbox.height * fig_h_in
-            print(f"Current canvas (fixed): {fig_w_in:.2f} x {fig_h_in:.2f} in")
+            print(f"Current canvas: {fig_w_in:.2f} x {fig_h_in:.2f} in")
             print(f"Current plot frame:     {cur_ax_w_in:.2f} x {cur_ax_h_in:.2f} in (W x H)")
             try:
                 spec = input("Enter new plot frame size (e.g. '6 4', '6x4', 'w=6 h=4', 'scale=1.2', single width, q=back): ").strip().lower()
@@ -651,16 +651,9 @@ def resize_plot_frame(fig, ax, y_data_list: List, label_text_objects: List, args
                     print("Could not parse specification.")
                     continue
             req_w_in, req_h_in = new_w_in, new_h_in
-            min_margin_frac = 0.05
-            max_w_in = fig_w_in * (1 - 2 * min_margin_frac)
-            max_h_in = fig_h_in * (1 - 2 * min_margin_frac)
-            if new_w_in > max_w_in:
-                print(f"Requested width {new_w_in:.2f} exceeds max {max_w_in:.2f}; clamped.")
-                new_w_in = max_w_in
-            if new_h_in > max_h_in:
-                print(f"Requested height {new_h_in:.2f} exceeds max {max_h_in:.2f}; clamped.")
-                new_h_in = max_h_in
-            min_ax_in = 0.25
+            # Apply exact requested size without any clamping
+            # Only enforce minimum size to prevent division by zero
+            min_ax_in = 0.01
             new_w_in = max(min_ax_in, new_w_in)
             new_h_in = max(min_ax_in, new_h_in)
             tol = 1e-3
@@ -676,33 +669,24 @@ def resize_plot_frame(fig, ax, y_data_list: List, label_text_objects: List, args
                 lm, bm, rm, tm = fig._last_user_margins
                 fig.subplots_adjust(left=lm, bottom=bm, right=rm, top=tm)
                 update_labels_func(ax, y_data_list, label_text_objects, args.stack)
-                if not ensure_text_visibility(fig, ax, label_text_objects, check_only=True):
-                    fig.canvas.draw_idle()
-                    print(f"Plot frame unchanged ({new_w_in:.2f} x {new_h_in:.2f} in); layout preserved.")
-                    continue
+                fig.canvas.draw_idle()
+                print(f"Plot frame unchanged ({new_w_in:.2f} x {new_h_in:.2f} in); layout preserved.")
+                continue
             left = (1 - w_frac) / 2
             right = left + w_frac
             bottom = (1 - h_frac) / 2
             top = bottom + h_frac
-            left = max(min_margin_frac, left)
-            bottom = max(min_margin_frac, bottom)
-            right = min(1 - min_margin_frac, right)
-            top = min(1 - min_margin_frac, top)
-            if right - left < 0.05 or top - bottom < 0.05:
-                print("Requested frame too small after safety clamps; aborting.")
-            else:
-                fig.subplots_adjust(left=left, right=right, bottom=bottom, top=top)
+            # Apply exact size without margin clamping
+            fig.subplots_adjust(left=left, right=right, bottom=bottom, top=top)
             update_labels_func(ax, y_data_list, label_text_objects, args.stack)
-            ensure_text_visibility(fig, ax, label_text_objects)
+            # Store the final size (exactly as requested, no text visibility adjustments)
             sp = fig.subplotpars
-            fig._last_user_axes_inches = (((sp.right - sp.left) * fig_w_in), ((sp.top - sp.bottom) * fig_h_in))
+            fig._last_user_axes_inches = (new_w_in, new_h_in)
             fig._last_user_margins = (sp.left, sp.bottom, sp.right, sp.top)
             final_w_in = (sp.right - sp.left) * fig_w_in
             final_h_in = (sp.top - sp.bottom) * fig_h_in
-            if requesting_full_canvas:
-                print(f"Requested full-canvas frame. Canvas remains {fig_w_in:.2f} x {fig_h_in:.2f} in; frame now {final_w_in:.2f} x {final_h_in:.2f} in (maximum with minimum margins {min_margin_frac*100:.0f}%).")
-            else:
-                print(f"Plot frame set to {final_w_in:.2f} x {final_h_in:.2f} in inside fixed canvas {fig_w_in:.2f} x {fig_h_in:.2f} in.")
+            # Show the requested size (which is what was applied)
+            print(f"Plot frame set to {req_w_in:.2f} x {req_h_in:.2f} in inside canvas {fig_w_in:.2f} x {fig_h_in:.2f} in.")
         except KeyboardInterrupt:
             print("Canceled.")
             return

{batplot-1.7.25.dist-info → batplot-1.7.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.7.25
+Version: 1.7.26
 Summary: Interactive plotting tool for material science (1D plot) and electrochemistry (GC, CV, dQ/dV, CPC, operando) with batch processing
 Author-email: Tian Dai <tianda@uio.no>
 License: MIT License

{batplot-1.7.25.dist-info → batplot-1.7.26.dist-info}/RECORD

@@ -1,28 +1,28 @@
-batplot/__init__.py,sha256=2qXM_ch4J6g2wG6kjsgmtes4tumgb-iIPYbAIvlfOM0,119
+batplot/__init__.py,sha256=l-iAn_Q1KA7sJv2vOZzjjw4K2UWfntwGpQk9Z3lyuRw,119
 batplot/args.py,sha256=6g1eHVsycDSAenwrXuCTcyuXCy_-30zy1lWtdguBG2s,34983
 batplot/batch.py,sha256=YQ7obCIqLCObwDbM7TXpOBh7g7BO95wZNsa2Fy84c6o,53858
-batplot/batplot.py,sha256=8cSAOZphoecINZMpYuetq-rrSyg_zmRfV08VtvX4_B8,170723
+batplot/batplot.py,sha256=40lU1nY1NqeAOpzNG_vLF_L34COKhiA19pMpbvA3SJc,171885
 batplot/cif.py,sha256=JfHwNf3SHrcpALc_F5NjJmQ3lg71MBRSaIUJjGYPTx8,30120
 batplot/cli.py,sha256=ScDb2je8VQ0mz_z0SLCHEigiTuFPY5pb1snnzCouKms,5828
-batplot/color_utils.py,sha256=ow2ElqjIWFLRdrnLwQvrnfa3w3IEB0FodPFdoDQR_Dc,19990
+batplot/color_utils.py,sha256=7InQLVo1XTg7sgAbltM2KeDSFJgr787YEaV9vJbIoWY,20460
 batplot/config.py,sha256=6nGY7fKN4T5KZUGQS2ArUBgEkLAL0j37XwG5SCVQgKA,6420
 batplot/converters.py,sha256=rR2WMPM0nR5E3eZI3gWbaJf_AfbdQx3urVSbJmZXNzo,8237
-batplot/cpc_interactive.py,sha256=90c-Rd9zcLIsL7mBb3gBDw4AnaWd9KnDtln9mhVKhNo,225252
-batplot/electrochem_interactive.py,sha256=S7UmgZAMCD0sRGPW7xRxwOaHV5_vkuwxZSegWJHxJxI,217258
-batplot/interactive.py,sha256=u0rDbxfjL3LHpAPUL3t6zUp94e-fJEA5_ApXTFfHflA,203616
+batplot/cpc_interactive.py,sha256=YGt-TLfO5W_YyUdIInfW6y6bZxQJyfeGX7JGBv1kNbs,232634
+batplot/electrochem_interactive.py,sha256=n_Jc9shH4LIL3r6z3MXnx02ZddMKZoh4dg25hHhfJRw,218297
+batplot/interactive.py,sha256=johjaK8Er1y3rc5Cvg0C3Lv8Cqf2IliOyYrSnSrCzW4,203997
 batplot/manual.py,sha256=pbRI6G4Pm12pOW8LrOLWWu7IEOtqWN3tRHtgge50LlA,11556
 batplot/modes.py,sha256=qE2OsOQQKhwOWene5zxJeuuewTrZxubtahQuz5je7ok,37252
 batplot/operando.py,sha256=CdTZJa6Cr1wNczFEbwAido2mc7C_h1xxoQ5b045ktSk,28105
-batplot/operando_ec_interactive.py,sha256=a9OpAguBznUf9p642OyIzya-1AQJKWUO4pqjo7JNHEQ,293096
+batplot/operando_ec_interactive.py,sha256=BOFj1E7H7b1wW0_pNwYCf7e2E70HemYzl1UjHihxB68,293096
 batplot/plotting.py,sha256=hG2_EdDhF1Qpn1XfZKdCQ5-w_m9gUYFbr804UQ5QjsU,10841
 batplot/readers.py,sha256=kAI0AvYrdfGRZkvADJ4riN96IWtrH24aAoZpBtONTbw,112960
-batplot/session.py,sha256=1DxwzxnTD_w9nrUWi-aIsBd_3bgfo4xchQGe0nd71Dg,131533
+batplot/session.py,sha256=FEWYHu1XUIrWxD3an5m7HB57pHst2CHgJ_brAmCBk38,132199
 batplot/style.py,sha256=ZeRJ15fneSQqCYN_SGap-9Y2J8UkzRxYmf6qLJA6zMo,62058
-batplot/ui.py,sha256=MIY2x_ghCYxjdYhjMUZsMMnQEUBLgrIT37hfPGZf_cs,36320
+batplot/ui.py,sha256=ifpbK74juUzLMCt-sJGVaWtpDb1NMRJzs2YyiwwafzY,35302
 batplot/utils.py,sha256=3dBZALWiCu5c6uc5MBII7n8329BZjieTEw4qithTlow,33939
 batplot/version_check.py,sha256=OG4LuHo5-rSqLLHQo5nWbX9lbNq6NyxRdvVUUcJRBqQ,6219
 batplot/data/USER_MANUAL.md,sha256=VYPvNZt3Fy8Z4Izr2FnQBw9vEaFTPkybhHDnF-OuKws,17694
-batplot-1.7.25.dist-info/licenses/LICENSE,sha256=2PAnHeCiTfgI7aKZLWr0G56HI9fGKQ0CEbQ02H-yExQ,1065
+batplot-1.7.26.dist-info/licenses/LICENSE,sha256=2PAnHeCiTfgI7aKZLWr0G56HI9fGKQ0CEbQ02H-yExQ,1065
 batplot_backup_20251121_223043/__init__.py,sha256=3s2DUQuTbWs65hoN9cQQ8IiJbaFJY8fNxiCpwRBYoOA,118
 batplot_backup_20251121_223043/args.py,sha256=OH-h84QhN-IhMS8sPAsSEqccHD3wpeMgmXa_fqv5xtg,21215
 batplot_backup_20251121_223043/batch.py,sha256=oI7PONJyciHDOqNPq-8fnOQMyn9CpAdVznKaEdsy0ig,48650
@@ -45,8 +45,8 @@ batplot_backup_20251121_223043/style.py,sha256=xg-tj6bEbFUVjjxYMokiLehS4tSfKanLI
 batplot_backup_20251121_223043/ui.py,sha256=K0XZWyiuBRNkFod9mgZyJ9CLN78GR1-hh6EznnIb5S8,31208
 batplot_backup_20251121_223043/utils.py,sha256=jydA0JxsCWWAudXEwSjlxTG17y2F8U6hIAukAzi1P0g,32526
 batplot_backup_20251121_223043/version_check.py,sha256=vlHkGkgUJcD_Z4KZmwonxZvKZh0MwHLaBSxaLPc66AQ,4555
-batplot-1.7.25.dist-info/METADATA,sha256=AyVvcD6JyoG0Bl2AAvNtw0YVI9P6vHZAhqFJQQu-KYM,7407
-batplot-1.7.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-batplot-1.7.25.dist-info/entry_points.txt,sha256=73GgH3Zs-qGIvgiyQLgGsSW-ryOwPPKHveOW6TDIR5Q,82
-batplot-1.7.25.dist-info/top_level.txt,sha256=CgqK4RpsYnUFAcqO4bLOnEhCoPY4IPEGLPkiDlzLIxg,39
-batplot-1.7.25.dist-info/RECORD,,
+batplot-1.7.26.dist-info/METADATA,sha256=nuvFZX39gTf0X-Dxff9jzQur4tLBTpRPuE55CPiYEdA,7407
+batplot-1.7.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+batplot-1.7.26.dist-info/entry_points.txt,sha256=73GgH3Zs-qGIvgiyQLgGsSW-ryOwPPKHveOW6TDIR5Q,82
+batplot-1.7.26.dist-info/top_level.txt,sha256=CgqK4RpsYnUFAcqO4bLOnEhCoPY4IPEGLPkiDlzLIxg,39
+batplot-1.7.26.dist-info/RECORD,,