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

batplot/electrochem_interactive.py

@@ -2641,7 +2641,7 @@ def electrochem_interactive_menu(fig, ax, cycle_lines: Dict[int, Dict[str, Optio
             try:
                 print("Tip: Use LaTeX/mathtext for special characters:")
                 print("  Subscript: H$_2$O → H₂O  |  Superscript: m$^2$ → m²")
-                print("  Greek: $\\alpha$, $\\beta$  |  Angstrom: $\\AA$ → Å")
+                print("  Bullet: $\\bullet$ → •   |  Greek: $\\alpha$, $\\beta$  |  Angstrom: $\\AA$ → Å")
                 while True:
                     print("Rename axis: x, y, both, q=back")
                     sub = input("Rename> ").strip().lower()

batplot/interactive.py

@@ -2179,7 +2179,7 @@ def interactive_menu(fig, ax, y_data_list, x_data_list, labels, orig_y,
                     if mode == 'c':
                         print("Tip: Use LaTeX/mathtext for special characters:")
                         print("  Subscript: H$_2$O → H₂O  |  Superscript: m$^2$ → m²")
-                        print("  Greek: $\\alpha$, $\\beta$  |  Angstrom: $\\AA$ → Å")
+                        print("  Bullet: $\\bullet$ → •   |  Greek: $\\alpha$, $\\beta$  |  Angstrom: $\\AA$ → Å")
                         idx_in = input("Curve number to rename (q=cancel): ").strip()
                         if not idx_in or idx_in.lower() == 'q':
                             print("Canceled.")

batplot/operando_ec_interactive.py

@@ -4465,7 +4465,7 @@ def operando_ec_interactive_menu(fig, ax, im, cbar, ec_ax, file_paths=None):
                 print("Rename Operando Axes: x=rename X label, y=rename Y label, q=back")
                 print("Tip: Use LaTeX/mathtext for special characters:")
                 print("  Subscript: H$_2$O → H₂O  |  Superscript: m$^2$ → m²")
-                print("  Greek: $\\alpha$, $\\beta$  |  Angstrom: $\\AA$ → Å")
+                print("  Bullet: $\\bullet$ → •   |  Greek: $\\alpha$, $\\beta$  |  Angstrom: $\\AA$ → Å")
                 while True:
                     sub = input("or> ").strip().lower()
                     if not sub:

batplot/session.py

@@ -2408,6 +2408,30 @@ def dump_cpc_session(
         if file_data and isinstance(file_data, list) and len(file_data) > 0:
             multi_files = []
             for f in file_data:
+                def _marker_of(sc, default_val):
+                    try:
+                        m = getattr(sc, 'get_marker', lambda: default_val)()
+                        if m is None:
+                            return default_val
+                        return m
+                    except Exception:
+                        return default_val
+                def _alpha_of(sc, default_val=None):
+                    try:
+                        a = sc.get_alpha()
+                        return float(a) if a is not None else default_val
+                    except Exception:
+                        return default_val
+                def _visible_of(sc, default_val=True):
+                    try:
+                        return bool(sc.get_visible())
+                    except Exception:
+                        return default_val
+                def _label_of(sc, default_val=""):
+                    try:
+                        return sc.get_label() or default_val
+                    except Exception:
+                        return default_val
                 file_info = {
                     'filename': f.get('filename', 'unknown'),
                     'visible': f.get('visible', True),
@@ -2415,16 +2439,31 @@ def dump_cpc_session(
                         'x': _np.array(_scatter_xy(f.get('sc_charge', sc_charge))[0]),
                         'y': _np.array(_scatter_xy(f.get('sc_charge', sc_charge))[1]),
                         'color': _color_of(f.get('sc_charge')),
+                        'size': _size_of(f.get('sc_charge'), 32.0),
+                        'alpha': _alpha_of(f.get('sc_charge')),
+                        'marker': _marker_of(f.get('sc_charge'), 'o'),
+                        'label': _label_of(f.get('sc_charge'), 'Charge capacity'),
+                        'visible': _visible_of(f.get('sc_charge')),
                     },
                     'discharge': {
                         'x': _np.array(_scatter_xy(f.get('sc_discharge', sc_discharge))[0]),
                         'y': _np.array(_scatter_xy(f.get('sc_discharge', sc_discharge))[1]),
                         'color': _color_of(f.get('sc_discharge')),
+                        'size': _size_of(f.get('sc_discharge'), 32.0),
+                        'alpha': _alpha_of(f.get('sc_discharge')),
+                        'marker': _marker_of(f.get('sc_discharge'), 's'),
+                        'label': _label_of(f.get('sc_discharge'), 'Discharge capacity'),
+                        'visible': _visible_of(f.get('sc_discharge')),
                     },
                     'efficiency': {
                         'x': _np.array(_scatter_xy(f.get('sc_eff', sc_eff))[0]),
                         'y': _np.array(_scatter_xy(f.get('sc_eff', sc_eff))[1]),
                         'color': _color_of(f.get('sc_eff')),
+                        'size': _size_of(f.get('sc_eff'), 40.0),
+                        'alpha': _alpha_of(f.get('sc_eff')),
+                        'marker': _marker_of(f.get('sc_eff'), '^'),
+                        'label': _label_of(f.get('sc_eff'), 'Coulombic efficiency'),
+                        'visible': _visible_of(f.get('sc_eff')),
                     }
                 }
                 multi_files.append(file_info)
@@ -2445,9 +2484,9 @@ def dump_cpc_session(
 
 
 def load_cpc_session(filename: str):
-    """Load a CPC session and reconstruct fig, axes, and scatter artists.
+    """Load a CPC session and reconstruct fig, axes, scatter artists, and file_data.
 
-    Returns: (fig, ax, ax2, sc_charge, sc_discharge, sc_eff)
+    Returns: (fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_data)
     """
     try:
         with open(filename, 'rb') as f:
@@ -2534,12 +2573,47 @@ def load_cpc_session(filename: str):
             except Exception:
                 pass
             return sc
-        sc_charge = _mk_sc(ax, ch, 'o')
-        sc_discharge = _mk_sc(ax, dh, 'o')
-        # efficiency on ax2 with triangles
-        if 'marker' not in ef:
-            ef['marker'] = '^'
-        sc_eff = _mk_sc(ax2, ef, '^')
+        # If multi_files exist, rebuild all files and pick the first as primary
+        multi_files = sess.get('multi_files')
+        file_data = []
+        if multi_files and isinstance(multi_files, list) and len(multi_files) > 0:
+            for idx, finfo in enumerate(multi_files):
+                ch_info = finfo.get('charge', {})
+                dh_info = finfo.get('discharge', {})
+                ef_info = finfo.get('efficiency', {})
+                sc_ch = _mk_sc(ax, ch_info, ch_info.get('marker', 'o') or 'o')
+                sc_dh = _mk_sc(ax, dh_info, dh_info.get('marker', 's') or 's')
+                eff_marker = ef_info.get('marker', '^') or '^'
+                sc_ef = _mk_sc(ax2, ef_info, eff_marker)
+                # Respect overall file visibility
+                try:
+                    vis_file = bool(finfo.get('visible', True))
+                except Exception:
+                    vis_file = True
+                for sc_tmp in (sc_ch, sc_dh, sc_ef):
+                    try:
+                        sc_tmp.set_visible(sc_tmp.get_visible() and vis_file)
+                    except Exception:
+                        pass
+                file_data.append({
+                    'filename': finfo.get('filename', f'File {idx+1}'),
+                    'visible': vis_file,
+                    'sc_charge': sc_ch,
+                    'sc_discharge': sc_dh,
+                    'sc_eff': sc_ef,
+                })
+            # Use the first file as primary artists for interactive menu
+            sc_charge = file_data[0]['sc_charge']
+            sc_discharge = file_data[0]['sc_discharge']
+            sc_eff = file_data[0]['sc_eff']
+        else:
+            # No multi-file info: fall back to single-file series
+            sc_charge = _mk_sc(ax, ch, 'o')
+            sc_discharge = _mk_sc(ax, dh, 's')
+            if 'marker' not in ef:
+                ef['marker'] = '^'
+            sc_eff = _mk_sc(ax2, ef, '^')
+            file_data = None
         
         # Restore spines state (version 2+)
         try:
@@ -2693,6 +2767,16 @@ def load_cpc_session(filename: str):
                     ax2.tick_params(axis='y',
                                     right=wasd_state['right'].get('ticks', True),
                                     labelright=wasd_state['right'].get('labels', True))
+                # Axis title visibility
+                try:
+                    if 'bottom' in wasd_state:
+                        ax.xaxis.label.set_visible(bool(wasd_state['bottom'].get('title', True)))
+                    if 'left' in wasd_state:
+                        ax.yaxis.label.set_visible(bool(wasd_state['left'].get('title', True)))
+                    if 'right' in wasd_state:
+                        ax2.yaxis.label.set_visible(bool(wasd_state['right'].get('title', True)))
+                except Exception:
+                    pass
                 
                 # Minor ticks
                 if wasd_state.get('top', {}).get('minor') or wasd_state.get('bottom', {}).get('minor'):
@@ -2767,26 +2851,46 @@ def load_cpc_session(filename: str):
         try:
             handles1, labels1 = ax.get_legend_handles_labels()
             handles2, labels2 = ax2.get_legend_handles_labels()
-            if handles1 or handles2:
-                leg_meta = sess.get('legend', {})
-                xy_in = leg_meta.get('xy_in')
+            # Filter visible handles only
+            H, L = [], []
+            for h, l in list(zip(handles1, labels1)) + list(zip(handles2, labels2)):
+                try:
+                    if hasattr(h, 'get_visible') and not h.get_visible():
+                        continue
+                except Exception:
+                    pass
+                H.append(h); L.append(l)
+            leg_meta = sess.get('legend', {})
+            xy_in = leg_meta.get('xy_in')
+            vis = bool(leg_meta.get('visible', True))
+            if H and vis:
                 if xy_in is not None:
                     fw, fh = fig.get_size_inches()
                     fx = 0.5 + float(xy_in[0]) / float(fw)
                     fy = 0.5 + float(xy_in[1]) / float(fh)
-                    ax.legend(handles1 + handles2, labels1 + labels2, loc='center', bbox_to_anchor=(fx, fy), bbox_transform=fig.transFigure, borderaxespad=1.0)
+                    leg = ax.legend(H, L, loc='center', bbox_to_anchor=(fx, fy), bbox_transform=fig.transFigure, borderaxespad=1.0)
                     # 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:
-                    ax.legend(handles1 + handles2, labels1 + labels2, loc='best', borderaxespad=1.0)
-                # Apply visibility
-                vis = bool(leg_meta.get('visible', True))
+                    leg = ax.legend(H, L, loc='best', borderaxespad=1.0)
+                # Always hide legend frame to match interactive export behavior
+                try:
+                    if leg is not None:
+                        leg.set_frame_on(False)
+                except Exception:
+                    pass
+            else:
+                try:
+                    fig._cpc_legend_xy_in = (float(xy_in[0]), float(xy_in[1])) if xy_in is not None else None
+                except Exception:
+                    pass
+                # ensure legend hidden
                 leg = ax.get_legend()
                 if leg is not None:
-                    leg.set_visible(vis)
+                    leg.set_visible(False)
         except Exception:
             pass
         try:
@@ -2796,7 +2900,7 @@ def load_cpc_session(filename: str):
                 fig.canvas.draw_idle()
             except Exception:
                 pass
-        return fig, ax, ax2, sc_charge, sc_discharge, sc_eff
+        return fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_data
     except Exception as e:
         import traceback
         print(f"Error loading CPC session: {e}")

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.7.24
+Version: 1.7.25
 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.24.dist-info → batplot-1.7.25.dist-info}/RECORD

@@ -1,28 +1,28 @@
-batplot/__init__.py,sha256=vcxX_RWa2zNjGw0VeGmJHavkp3EFX9_6FzqOzyahxOI,119
+batplot/__init__.py,sha256=2qXM_ch4J6g2wG6kjsgmtes4tumgb-iIPYbAIvlfOM0,119
 batplot/args.py,sha256=6g1eHVsycDSAenwrXuCTcyuXCy_-30zy1lWtdguBG2s,34983
 batplot/batch.py,sha256=YQ7obCIqLCObwDbM7TXpOBh7g7BO95wZNsa2Fy84c6o,53858
-batplot/batplot.py,sha256=h960XKSmJ825DqI99Xnyomg_gaB0aFDUIKxkovm8BPQ,170691
+batplot/batplot.py,sha256=8cSAOZphoecINZMpYuetq-rrSyg_zmRfV08VtvX4_B8,170723
 batplot/cif.py,sha256=JfHwNf3SHrcpALc_F5NjJmQ3lg71MBRSaIUJjGYPTx8,30120
 batplot/cli.py,sha256=ScDb2je8VQ0mz_z0SLCHEigiTuFPY5pb1snnzCouKms,5828
 batplot/color_utils.py,sha256=ow2ElqjIWFLRdrnLwQvrnfa3w3IEB0FodPFdoDQR_Dc,19990
 batplot/config.py,sha256=6nGY7fKN4T5KZUGQS2ArUBgEkLAL0j37XwG5SCVQgKA,6420
 batplot/converters.py,sha256=rR2WMPM0nR5E3eZI3gWbaJf_AfbdQx3urVSbJmZXNzo,8237
-batplot/cpc_interactive.py,sha256=zeMIoPt8fNEi-PcxkMf2PnU7k8owoU6SUfsruohIAsM,195690
-batplot/electrochem_interactive.py,sha256=ig9I-bQelTIRxSdXMppdA9RBqrR9vJ1lbkyNtwTC7-A,217226
-batplot/interactive.py,sha256=R9ipqK4ZN5wwe6L1mcvWt1TbmGXwPU87V5jm1BWvgeM,203584
+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/manual.py,sha256=pbRI6G4Pm12pOW8LrOLWWu7IEOtqWN3tRHtgge50LlA,11556
 batplot/modes.py,sha256=qE2OsOQQKhwOWene5zxJeuuewTrZxubtahQuz5je7ok,37252
 batplot/operando.py,sha256=CdTZJa6Cr1wNczFEbwAido2mc7C_h1xxoQ5b045ktSk,28105
-batplot/operando_ec_interactive.py,sha256=wMuWMz96TeJcKp52iUEqsWy6_NTxAagva4NvCALG0GI,293064
+batplot/operando_ec_interactive.py,sha256=a9OpAguBznUf9p642OyIzya-1AQJKWUO4pqjo7JNHEQ,293096
 batplot/plotting.py,sha256=hG2_EdDhF1Qpn1XfZKdCQ5-w_m9gUYFbr804UQ5QjsU,10841
 batplot/readers.py,sha256=kAI0AvYrdfGRZkvADJ4riN96IWtrH24aAoZpBtONTbw,112960
-batplot/session.py,sha256=fuUCRdZ2Trl_RKuFgF_m4BUfplhhzOHJ16vtetLC2T0,126312
+batplot/session.py,sha256=1DxwzxnTD_w9nrUWi-aIsBd_3bgfo4xchQGe0nd71Dg,131533
 batplot/style.py,sha256=ZeRJ15fneSQqCYN_SGap-9Y2J8UkzRxYmf6qLJA6zMo,62058
 batplot/ui.py,sha256=MIY2x_ghCYxjdYhjMUZsMMnQEUBLgrIT37hfPGZf_cs,36320
 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.24.dist-info/licenses/LICENSE,sha256=2PAnHeCiTfgI7aKZLWr0G56HI9fGKQ0CEbQ02H-yExQ,1065
+batplot-1.7.25.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.24.dist-info/METADATA,sha256=dJA_9A2XGrZlSltD6KplJokAvn02C88tY4LYxc9A1mg,7407
-batplot-1.7.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-batplot-1.7.24.dist-info/entry_points.txt,sha256=73GgH3Zs-qGIvgiyQLgGsSW-ryOwPPKHveOW6TDIR5Q,82
-batplot-1.7.24.dist-info/top_level.txt,sha256=CgqK4RpsYnUFAcqO4bLOnEhCoPY4IPEGLPkiDlzLIxg,39
-batplot-1.7.24.dist-info/RECORD,,
+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,,