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

batplot/cpc_interactive.py

@@ -96,7 +96,7 @@ from .color_utils import resolve_color_token, color_block, palette_preview, mana
 
 
 def _legend_no_frame(ax, *args, **kwargs):
-    # Compact legend defaults and labelcolor matching marker/line color
+    # Compact legend defaults
     kwargs.setdefault('frameon', False)
     kwargs.setdefault('handlelength', 1.0)
     kwargs.setdefault('handletextpad', 0.35)
@@ -104,8 +104,8 @@ def _legend_no_frame(ax, *args, **kwargs):
     kwargs.setdefault('borderaxespad', 0.5)
     kwargs.setdefault('borderpad', 0.3)
     kwargs.setdefault('columnspacing', 0.6)
-    # Let matplotlib color legend text from line/marker colors
-    kwargs.setdefault('labelcolor', 'linecolor')
+    # Don't use labelcolor='linecolor' by default as it causes issues 
+    # with scatter plots that have facecolor='none' (hollow markers)
     leg = ax.legend(*args, **kwargs)
     if leg is not None:
         try:
@@ -267,7 +267,7 @@ def _generate_similar_color(base_color):
             return base_color
 
 
-def _print_menu():
+def _print_menu(fig=None):
     col1 = [
         " f: font",
         " l: line",
@@ -284,6 +284,7 @@ def _print_menu():
         "r: rename",
         "x: x range",
         "y: y ranges",
+        "ie: invert efficiency",
     ]
     col3 = [
         "p: print(export) style/geom",
@@ -293,6 +294,30 @@ def _print_menu():
         "b: undo",
         "q: quit",
     ]
+
+    # Conditional shortcuts that depend on figure state
+    # 1) Hide multi-file-only commands (v) when we know we're in single-file mode
+    if fig is not None:
+        try:
+            is_multi = bool(getattr(fig, '_cpc_is_multi_file', False))
+        except Exception:
+            is_multi = True
+        if not is_multi:
+            # Remove "v: show/hide files" in single-file mode
+            col1 = [item for item in col1 if not item.strip().startswith("v:")]
+
+    # 2) Conditional overwrite shortcuts under (Options) if figure is available
+    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")
     w1 = max(18, *(len(s) for s in col1))
     w2 = max(18, *(len(s) for s in col2))
     w3 = max(12, *(len(s) for s in col3))
@@ -413,6 +438,21 @@ def _get_geometry_snapshot(ax, ax2) -> Dict:
     return geom
 
 
+def _is_hollow_marker(artist) -> bool:
+    """Check if a scatter artist has hollow markers (facecolor='none' or transparent)."""
+    try:
+        if hasattr(artist, 'get_facecolors'):
+            face_arr = artist.get_facecolors()
+            if face_arr is not None and len(face_arr):
+                # Check if facecolor is fully transparent (alpha == 0)
+                fc = face_arr[0]
+                if len(fc) >= 4 and fc[3] == 0:
+                    return True
+    except Exception:
+        pass
+    return False
+
+
 def _style_snapshot(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_data=None) -> Dict:
     try:
         fig_w, fig_h = map(float, fig.get_size_inches())
@@ -420,18 +460,37 @@ def _style_snapshot(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_data=Non
         fig_w = fig_h = None
 
     def _color_of(artist) -> Optional[str]:
+        """Return a representative color for a scatter/artist.
+        
+        For hollow markers (facecolor='none'), fall back to edgecolor so that
+        style snapshots still capture the intended color.
+        """
         try:
+            # Prefer explicit color if available
             if hasattr(artist, 'get_color'):
                 c = artist.get_color()
-                # scatter returns array sometimes; pick first
                 if isinstance(c, (list, tuple)) and c and not isinstance(c, str):
                     return c[0]
                 return c
+            # Fall back to facecolors / edgecolors for scatter
+            face_arr = None
+            edge_arr = None
             if hasattr(artist, 'get_facecolors'):
-                arr = artist.get_facecolors()
-                if arr is not None and len(arr):
-                    from matplotlib.colors import to_hex
-                    return to_hex(arr[0])
+                face_arr = artist.get_facecolors()
+            if hasattr(artist, 'get_edgecolors'):
+                edge_arr = artist.get_edgecolors()
+            from matplotlib.colors import to_hex
+            # If facecolor is 'none' or empty, use edgecolor instead
+            if face_arr is not None and len(face_arr):
+                # Some backends use fully transparent facecolor for 'none'
+                fc = face_arr[0]
+                try:
+                    if fc[3] > 0:
+                        return to_hex(fc)
+                except Exception:
+                    return to_hex(fc)
+            if edge_arr is not None and len(edge_arr):
+                return to_hex(edge_arr[0])
         except Exception:
             pass
         return None
@@ -621,12 +680,14 @@ def _style_snapshot(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_data=Non
                 'marker': getattr(sc_charge, 'get_marker', lambda: 'o')(),
                 'markersize': float(getattr(sc_charge, 'get_sizes', lambda: [32])()[0]) if hasattr(sc_charge, 'get_sizes') else 32.0,
                 'alpha': float(sc_charge.get_alpha()) if sc_charge.get_alpha() is not None else 1.0,
+                'hollow': _is_hollow_marker(sc_charge),
             },
             'discharge': {
                 'color': _color_of(sc_discharge),
                 'marker': getattr(sc_discharge, 'get_marker', lambda: 's')(),
                 'markersize': float(getattr(sc_discharge, 'get_sizes', lambda: [32])()[0]) if hasattr(sc_discharge, 'get_sizes') else 32.0,
                 'alpha': float(sc_discharge.get_alpha()) if sc_discharge.get_alpha() is not None else 1.0,
+                'hollow': _is_hollow_marker(sc_discharge),
             },
             'efficiency': {
                 'color': (sc_eff.get_facecolors()[0].tolist() if hasattr(sc_eff, 'get_facecolors') and len(sc_eff.get_facecolors()) else '#2ca02c'),
@@ -634,6 +695,7 @@ def _style_snapshot(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_data=Non
                 'markersize': float(getattr(sc_eff, 'get_sizes', lambda: [40])()[0]) if hasattr(sc_eff, 'get_sizes') else 40.0,
                 'alpha': float(sc_eff.get_alpha()) if sc_eff.get_alpha() is not None else 1.0,
                 'visible': bool(getattr(sc_eff, 'get_visible', lambda: True)()),
+                'hollow': _is_hollow_marker(sc_eff),
             }
         }
     }
@@ -650,10 +712,13 @@ def _style_snapshot(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_data=Non
                 'visible': f.get('visible', True),
                 'charge_color': _color_of(sc_chg),
                 'charge_marker': getattr(sc_chg, 'get_marker', lambda: 'o')() if sc_chg else 'o',
+                'charge_hollow': _is_hollow_marker(sc_chg) if sc_chg else False,
                 'discharge_color': _color_of(sc_dchg),
                 'discharge_marker': getattr(sc_dchg, 'get_marker', lambda: 's')() if sc_dchg else 's',
+                'discharge_hollow': _is_hollow_marker(sc_dchg) if sc_dchg else False,
                 'efficiency_color': _color_of(sc_eff),
                 'efficiency_marker': getattr(sc_eff, 'get_marker', lambda: '^')() if sc_eff else '^',
+                'efficiency_hollow': _is_hollow_marker(sc_eff) if sc_eff else False,
             }
             # Save legend labels
             try:
@@ -692,6 +757,11 @@ def _apply_style(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, cfg: Dict, file_
         file_data: Optional list of file dicts for multi-file mode
     """
     is_multi_file = file_data is not None and len(file_data) > 1
+    # Store multi-file flag on figure so the menu can hide/show multi-file commands correctly
+    try:
+        fig._cpc_is_multi_file = bool(is_multi_file)
+    except Exception:
+        pass
     
     # Save current labelpad values BEFORE any style changes
     saved_xlabelpad = None
@@ -844,7 +914,12 @@ def _apply_style(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, cfg: Dict, file_
             # Single file mode: apply to provided artists only
             if ch:
                 if ch.get('color') is not None:
-                    sc_charge.set_color(ch['color'])
+                    # Apply color respecting hollow marker style
+                    if ch.get('hollow', False):
+                        sc_charge.set_facecolors('none')
+                        sc_charge.set_edgecolors(ch['color'])
+                    else:
+                        sc_charge.set_color(ch['color'])
                 if ch.get('marker') is not None and hasattr(sc_charge, 'set_marker'):
                     sc_charge.set_marker(ch['marker'])
                 if ch.get('markersize') is not None and hasattr(sc_charge, 'set_sizes'):
@@ -853,7 +928,12 @@ def _apply_style(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, cfg: Dict, file_
                     sc_charge.set_alpha(float(ch['alpha']))
             if dh:
                 if dh.get('color') is not None:
-                    sc_discharge.set_color(dh['color'])
+                    # Apply color respecting hollow marker style
+                    if dh.get('hollow', False):
+                        sc_discharge.set_facecolors('none')
+                        sc_discharge.set_edgecolors(dh['color'])
+                    else:
+                        sc_discharge.set_color(dh['color'])
                 if dh.get('marker') is not None and hasattr(sc_discharge, 'set_marker'):
                     sc_discharge.set_marker(dh['marker'])
                 if dh.get('markersize') is not None and hasattr(sc_discharge, 'set_sizes'):
@@ -863,7 +943,12 @@ def _apply_style(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, cfg: Dict, file_
             if ef:
                 if ef.get('color') is not None:
                     try:
-                        sc_eff.set_color(ef['color'])
+                        # Apply color respecting hollow marker style
+                        if ef.get('hollow', False):
+                            sc_eff.set_facecolors('none')
+                            sc_eff.set_edgecolors(ef['color'])
+                        else:
+                            sc_eff.set_color(ef['color'])
                     except Exception:
                         pass
                 if ef.get('marker') is not None and hasattr(sc_eff, 'set_marker'):
@@ -878,6 +963,16 @@ def _apply_style(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, cfg: Dict, file_
                         ax2.yaxis.label.set_visible(bool(ef['visible']))
                     except Exception:
                         pass
+            # Restore legend labels for single-file mode
+            try:
+                if 'label' in ch and hasattr(sc_charge, 'set_label'):
+                    sc_charge.set_label(ch['label'])
+                if 'label' in dh and hasattr(sc_discharge, 'set_label'):
+                    sc_discharge.set_label(dh['label'])
+                if 'label' in ef and hasattr(sc_eff, 'set_label'):
+                    sc_eff.set_label(ef['label'])
+            except Exception:
+                pass
     except Exception:
         pass
     # Apply legend state (h command)
@@ -1163,40 +1258,40 @@ def _apply_style(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, cfg: Dict, file_
                 for i, f_info in enumerate(multi_files):
                     if i < len(file_data):
                         f = file_data[i]
-                        # Restore colors FIRST (before labels)
+                        # Restore colors FIRST (before labels), respecting hollow marker style
                         if 'charge_color' in f_info and f.get('sc_charge'):
                             try:
                                 col = f_info['charge_color']
-                                f['sc_charge'].set_color(col)
+                                is_hollow = f_info.get('charge_hollow', False)
+                                if is_hollow:
+                                    f['sc_charge'].set_facecolors('none')
+                                    f['sc_charge'].set_edgecolors(col)
+                                else:
+                                    f['sc_charge'].set_color(col)
                                 f['color'] = col
-                                # Force update of facecolors for scatter plots
-                                if hasattr(f['sc_charge'], 'set_facecolors'):
-                                    from matplotlib.colors import to_rgba
-                                    rgba = to_rgba(col)
-                                    f['sc_charge'].set_facecolors(rgba)
                             except Exception:
                                 pass
                         if 'discharge_color' in f_info and f.get('sc_discharge'):
                             try:
                                 col = f_info['discharge_color']
-                                f['sc_discharge'].set_color(col)
-                                # Force update of facecolors for scatter plots
-                                if hasattr(f['sc_discharge'], 'set_facecolors'):
-                                    from matplotlib.colors import to_rgba
-                                    rgba = to_rgba(col)
-                                    f['sc_discharge'].set_facecolors(rgba)
+                                is_hollow = f_info.get('discharge_hollow', False)
+                                if is_hollow:
+                                    f['sc_discharge'].set_facecolors('none')
+                                    f['sc_discharge'].set_edgecolors(col)
+                                else:
+                                    f['sc_discharge'].set_color(col)
                             except Exception:
                                 pass
                         if 'efficiency_color' in f_info and f.get('sc_eff'):
                             try:
                                 col = f_info['efficiency_color']
-                                f['sc_eff'].set_color(col)
+                                is_hollow = f_info.get('efficiency_hollow', False)
+                                if is_hollow:
+                                    f['sc_eff'].set_facecolors('none')
+                                    f['sc_eff'].set_edgecolors(col)
+                                else:
+                                    f['sc_eff'].set_color(col)
                                 f['eff_color'] = col
-                                # Force update of facecolors for scatter plots
-                                if hasattr(f['sc_eff'], 'set_facecolors'):
-                                    from matplotlib.colors import to_rgba
-                                    rgba = to_rgba(col)
-                                    f['sc_eff'].set_facecolors(rgba)
                             except Exception:
                                 pass
                         # Restore legend labels
@@ -1350,8 +1445,6 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
     # If file_data is provided, we're in multi-file mode.
     # If not provided, we create a single-file structure for backward compatibility.
     # ====================================================================
-    is_multi_file = file_data is not None and len(file_data) > 1
-    
     if file_data is None:
         # Backward compatibility: create file_data structure from single file
         # This allows the function to work with old code that passes individual artists
@@ -1376,12 +1469,18 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
             'sc_eff': sc_eff,            # Efficiency scatter artist
             'visible': True               # File is visible by default
         }]
-    
     # Track which file is currently selected for editing (in multi-file mode)
     current_file_idx = 0  # Index of currently selected file (0 = first file)
     
     # Collect file paths for session saving (if available)
     file_paths = _collect_file_paths(file_data)
+
+    # Multi-file flag: now that file_data is finalized
+    is_multi_file = file_data is not None and len(file_data) > 1
+    try:
+        fig._cpc_is_multi_file = bool(is_multi_file)
+    except Exception:
+        pass
     
     # ====================================================================
     # TICK STATE MANAGEMENT
@@ -1619,7 +1718,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
     except Exception:
         pass
 
-    _print_menu()
+    _print_menu(fig)
     
     while True:
         try:
@@ -1640,7 +1739,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                     _print_file_list(file_data, current_file_idx)
                     choice = _safe_input(f"Toggle visibility for file (1-{len(file_data)}), 'a' for all, or q=cancel: ").strip()
                     if choice.lower() == 'q':
-                        _print_menu()
+                        _print_menu(fig)
                         _print_file_list(file_data, current_file_idx)
                         continue
                     
@@ -1665,48 +1764,17 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                             f['sc_eff'].set_visible(new_vis)
                         else:
                             print("Invalid file number.")
+
+                    _rebuild_legend(ax, ax2, file_data, preserve_position=True)
+                    fig.canvas.draw_idle()
                 else:
-                    # Single file mode: toggle efficiency
-                    push_state("visibility-eff")
-                    # Capture current legend position BEFORE toggling visibility
-                    try:
-                        if not hasattr(fig, '_cpc_legend_xy_in') or getattr(fig, '_cpc_legend_xy_in') is None:
-                            leg0 = ax.get_legend()
-                            if leg0 is not None and leg0.get_visible():
-                                try:
-                                    # Ensure renderer exists
-                                    try:
-                                        renderer = fig.canvas.get_renderer()
-                                    except Exception:
-                                        fig.canvas.draw()
-                                        renderer = fig.canvas.get_renderer()
-                                    bb = leg0.get_window_extent(renderer=renderer)
-                                    cx = 0.5 * (bb.x0 + bb.x1)
-                                    cy = 0.5 * (bb.y0 + bb.y1)
-                                    fx, fy = fig.transFigure.inverted().transform((cx, cy))
-                                    fw, fh = fig.get_size_inches()
-                                    offset = ((fx - 0.5) * fw, (fy - 0.5) * fh)
-                                    offset = _sanitize_legend_offset(offset)
-                                    if offset is not None:
-                                        fig._cpc_legend_xy_in = offset
-                                except Exception:
-                                    pass
-                    except Exception:
-                        pass
-                    vis = sc_eff.get_visible()
-                    sc_eff.set_visible(not vis)
-                    try:
-                        ax2.yaxis.label.set_visible(not vis)
-                    except Exception:
-                        pass
-                
-                _rebuild_legend(ax, ax2, file_data, preserve_position=True)
-                fig.canvas.draw_idle()
+                    # Single file mode: v is not meaningful (no per-file visibility)
+                    print("File visibility (v) is only available in multi-file CPC mode.")
             except ValueError:
                 print("Invalid input.")
             except Exception as e:
                 print(f"Visibility toggle failed: {e}")
-            _print_menu()
+            _print_menu(fig)
             if is_multi_file:
                 _print_file_list(file_data, current_file_idx)
             continue
@@ -1719,10 +1787,10 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
             if confirm == 'y':
                 break
             else:
-                _print_menu(); continue
+                _print_menu(fig); continue
         elif key == 'b':
             restore_state()
-            _print_menu(); continue
+            _print_menu(fig); continue
         elif key == 'c':
             # Colors submenu: ly (left Y series) and ry (right Y efficiency), with user colors and palettes
             try:
@@ -1837,18 +1905,19 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                                     continue
                                 discharge_col = _generate_similar_color(charge_col)
                                 try:
-                                    f['sc_charge'].set_color(charge_col)
-                                    f['sc_discharge'].set_color(discharge_col)
                                     f['color'] = charge_col
-                                    # Force update of facecolors for scatter plots
+                                    # Chg: filled square; DChg: unfilled (hollow) square
                                     if hasattr(f['sc_charge'], 'set_facecolors'):
                                         from matplotlib.colors import to_rgba
-                                        rgba = to_rgba(charge_col)
-                                        f['sc_charge'].set_facecolors(rgba)
+                                        f['sc_charge'].set_color(charge_col)
+                                        f['sc_charge'].set_facecolors(to_rgba(charge_col))
+                                    else:
+                                        f['sc_charge'].set_color(charge_col)
                                     if hasattr(f['sc_discharge'], 'set_facecolors'):
-                                        from matplotlib.colors import to_rgba
-                                        rgba = to_rgba(discharge_col)
-                                        f['sc_discharge'].set_facecolors(rgba)
+                                        f['sc_discharge'].set_facecolors('none')
+                                        f['sc_discharge'].set_edgecolors(discharge_col)
+                                    else:
+                                        f['sc_discharge'].set_color(discharge_col)
                                 except Exception as e:
                                     print(f"Error setting color: {e}")
                                     pass
@@ -1885,18 +1954,19 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                                         continue
                                     discharge_col = _generate_similar_color(charge_col)
                                     try:
-                                        file_data[file_idx]['sc_charge'].set_color(charge_col)
-                                        file_data[file_idx]['sc_discharge'].set_color(discharge_col)
                                         file_data[file_idx]['color'] = charge_col
-                                        # Force update of facecolors for scatter plots
+                                        # Chg: filled square; DChg: unfilled (hollow) square
                                         if hasattr(file_data[file_idx]['sc_charge'], 'set_facecolors'):
                                             from matplotlib.colors import to_rgba
-                                            rgba = to_rgba(charge_col)
-                                            file_data[file_idx]['sc_charge'].set_facecolors(rgba)
+                                            file_data[file_idx]['sc_charge'].set_color(charge_col)
+                                            file_data[file_idx]['sc_charge'].set_facecolors(to_rgba(charge_col))
+                                        else:
+                                            file_data[file_idx]['sc_charge'].set_color(charge_col)
                                         if hasattr(file_data[file_idx]['sc_discharge'], 'set_facecolors'):
-                                            from matplotlib.colors import to_rgba
-                                            rgba = to_rgba(discharge_col)
-                                            file_data[file_idx]['sc_discharge'].set_facecolors(rgba)
+                                            file_data[file_idx]['sc_discharge'].set_facecolors('none')
+                                            file_data[file_idx]['sc_discharge'].set_edgecolors(discharge_col)
+                                        else:
+                                            file_data[file_idx]['sc_discharge'].set_color(discharge_col)
                                     except Exception:
                                         pass
                             _apply_manual_entries(tokens)
@@ -2007,7 +2077,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                         print("Unknown option.")
             except Exception as e:
                 print(f"Error in colors menu: {e}")
-            _print_menu()
+            _print_menu(fig)
             if is_multi_file:
                 _print_file_list(file_data, current_file_idx)
             continue
@@ -2070,7 +2140,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                     fig.canvas.draw()
             except Exception as e:
                 print(f"Error in spine color menu: {e}")
-            _print_menu()
+            _print_menu(fig)
             if is_multi_file:
                 _print_file_list(file_data, current_file_idx)
             continue
@@ -2078,7 +2148,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
             try:
                 base_path = choose_save_path(file_paths, purpose="figure export")
                 if not base_path:
-                    _print_menu()
+                    _print_menu(fig)
                     continue
                 print(f"\nChosen path: {base_path}")
                 # List existing figure files from Figures/ subdirectory
@@ -2101,19 +2171,19 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                 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(); continue
+                    _print_menu(fig); continue
                 
                 # Check for 'o' option
                 if fname.lower() == 'o':
                     if not last_figure_path:
                         print("No previous export found.")
-                        _print_menu(); continue
+                        _print_menu(fig); continue
                     if not os.path.exists(last_figure_path):
                         print(f"Previous export file not found: {last_figure_path}")
-                        _print_menu(); continue
+                        _print_menu(fig); continue
                     yn = _safe_input(f"Overwrite '{os.path.basename(last_figure_path)}'? (y/n): ").strip().lower()
                     if yn != 'y':
-                        _print_menu(); continue
+                        _print_menu(fig); continue
                     target = last_figure_path
                 # Check if user selected a number
                 elif fname.isdigit() and files:
@@ -2126,7 +2196,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                         target = file_list[idx-1][1]  # Full path from list
                     else:
                         print("Invalid number.")
-                        _print_menu(); continue
+                        _print_menu(fig); continue
                 else:
                     root, ext = os.path.splitext(fname)
                     if ext == '':
@@ -2139,7 +2209,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                     if os.path.exists(target):
                         yn = _safe_input(f"'{os.path.basename(target)}' exists. Overwrite? (y/n): ").strip().lower()
                         if yn != 'y':
-                            _print_menu(); continue
+                            _print_menu(fig); continue
                 if target:
                     # Ensure exact case is preserved (important for macOS case-insensitive filesystem)
                     from .utils import ensure_exact_case_filename
@@ -2258,7 +2328,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                                 pass
             except Exception as e:
                 print(f"Export failed: {e}")
-            _print_menu(); continue
+            _print_menu(fig); continue
         elif key == 's':
             # Save CPC session (.pkl) with all data and styles
             try:
@@ -2317,7 +2387,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                     pass
                 folder = choose_save_path(file_paths, purpose="CPC session save")
                 if not folder:
-                    _print_menu(); continue
+                    _print_menu(fig); continue
                 print(f"\nChosen path: {folder}")
                 try:
                     files = sorted([f for f in os.listdir(folder) if f.lower().endswith('.pkl')])
@@ -2339,18 +2409,18 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                     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(); continue
+                    _print_menu(fig); continue
                 if choice.lower() == 'o':
                     # Overwrite last saved session
                     if not last_session_path:
                         print("No previous save found.")
-                        _print_menu(); continue
+                        _print_menu(fig); continue
                     if not os.path.exists(last_session_path):
                         print(f"Previous save file not found: {last_session_path}")
-                        _print_menu(); continue
+                        _print_menu(fig); continue
                     yn = _safe_input(f"Overwrite '{os.path.basename(last_session_path)}'? (y/n): ").strip().lower()
                     if yn != 'y':
-                        _print_menu(); continue
+                        _print_menu(fig); continue
                     dump_cpc_session(last_session_path, fig=fig, ax=ax, ax2=ax2, sc_charge=sc_charge, sc_discharge=sc_discharge, sc_eff=sc_eff, file_data=file_data, skip_confirm=True)
                     print(f"Overwritten session to {last_session_path}")
                     _print_menu(); continue
@@ -2367,7 +2437,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                         _print_menu(); continue
                     else:
                         print("Invalid number.")
-                        _print_menu(); continue
+                        _print_menu(fig); continue
                 if choice.lower() != 'o':
                     name = choice
                     root, ext = os.path.splitext(name)
@@ -2377,12 +2447,12 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                     if os.path.exists(target):
                         yn = _safe_input(f"'{os.path.basename(target)}' exists. Overwrite? (y/n): ").strip().lower()
                         if yn != 'y':
-                            _print_menu(); continue
+                            _print_menu(fig); continue
                     dump_cpc_session(target, fig=fig, ax=ax, ax2=ax2, sc_charge=sc_charge, sc_discharge=sc_discharge, sc_eff=sc_eff, file_data=file_data, skip_confirm=True)
                     fig._last_session_save_path = target
             except Exception as e:
                 print(f"Save failed: {e}")
-            _print_menu(); continue
+            _print_menu(fig); continue
         elif key == 'p':
             try:
                 style_menu_active = True
@@ -2670,12 +2740,12 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                         print("Unknown choice.")
             except Exception as e:
                 print(f"Error in style submenu: {e}")
-            _print_menu(); continue
+            _print_menu(fig); continue
         elif key == 'i':
             try:
                 path = choose_style_file(file_paths, purpose="style import")
                 if not path:
-                    _print_menu(); continue
+                    _print_menu(fig); continue
                 push_state("import-style")
                 with open(path, 'r', encoding='utf-8') as f:
                     cfg = json.load(f)
@@ -2683,7 +2753,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                 # Check file type
                 kind = cfg.get('kind', '')
                 if kind not in ('cpc_style', 'cpc_style_geom'):
-                    print("Not a CPC style file."); _print_menu(); continue
+                    print("Not a CPC style file."); _print_menu(fig); continue
 
                 # Enforce compatibility between style/geom ro state and current figure ro state
                 file_ro = bool(cfg.get('ro_active', False))
@@ -2694,7 +2764,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                     else:
                         print("Warning: Style/geometry file was saved without --ro; current plot was created with --ro.")
                     print("Not applying CPC style/geometry to avoid corrupting axis orientation.")
-                    _print_menu(); continue
+                    _print_menu(fig); continue
                 
                 has_geometry = (kind == 'cpc_style_geom' and 'geometry' in cfg)
                 
@@ -2724,7 +2794,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                         
             except Exception as e:
                 print(f"Error importing style: {e}")
-            _print_menu(); continue
+            _print_menu(fig); continue
         elif key == 'ry':
             # Toggle efficiency visibility on the right axis
             try:
@@ -2833,7 +2903,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                 fig.canvas.draw_idle()
             except Exception:
                 pass
-            _print_menu(); continue
+            _print_menu(fig); continue
         elif key == 'h':
             # Legend submenu: toggle visibility, set position in inches relative to canvas center (0,0)
             try:
@@ -2886,15 +2956,15 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                                 # Ensure a legend exists at the stored position
                                 H, L = _visible_handles_labels(ax, ax2)
                                 if H:
-                                    offset = _sanitize_legend_offset(getattr(fig, '_cpc_legend_xy_in', None))
-                                    if offset is not None:
-                                        fig._cpc_legend_xy_in = offset
-                                        _apply_legend_position()
-                                    else:
-                                        _legend_no_frame(ax, H, L, loc='best', borderaxespad=1.0)
+                                    # Always use _rebuild_legend for consistency
+                                    _rebuild_legend(ax, ax2, file_data, preserve_position=True)
+                                else:
+                                    print("No visible legend items found.")
                             fig.canvas.draw_idle()
-                        except Exception:
-                            pass
+                        except Exception as e:
+                            print(f"Error toggling legend: {e}")
+                            import traceback
+                            traceback.print_exc()
                     elif sub == 'p':
                         # Position submenu with x and y subcommands
                         while True:
@@ -2920,13 +2990,17 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                                         continue
                                     push_state("legend-position")
                                     try:
-                                        fig._cpc_legend_xy_in = (x_in, xy_in[1])
-                                        fig._cpc_legend_xy_in = _sanitize_legend_offset(fig._cpc_legend_xy_in)
-                                        _apply_legend_position()
-                                        fig.canvas.draw_idle()
-                                        print(f"Legend position updated: x={x_in:.2f}, y={xy_in[1]:.2f}")
-                                    except Exception:
-                                        pass
+                                        # Sanitize and store the new position
+                                        new_pos = _sanitize_legend_offset((x_in, xy_in[1]))
+                                        if new_pos is not None:
+                                            fig._cpc_legend_xy_in = new_pos
+                                            _apply_legend_position()
+                                            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:
@@ -2943,13 +3017,17 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                                         continue
                                     push_state("legend-position")
                                     try:
-                                        fig._cpc_legend_xy_in = (xy_in[0], y_in)
-                                        fig._cpc_legend_xy_in = _sanitize_legend_offset(fig._cpc_legend_xy_in)
-                                        _apply_legend_position()
-                                        fig.canvas.draw_idle()
-                                        print(f"Legend position updated: x={xy_in[0]:.2f}, y={y_in:.2f}")
-                                    except Exception:
-                                        pass
+                                        # Sanitize and store the new position
+                                        new_pos = _sanitize_legend_offset((xy_in[0], y_in))
+                                        if new_pos is not None:
+                                            fig._cpc_legend_xy_in = new_pos
+                                            _apply_legend_position()
+                                            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()
@@ -2961,13 +3039,17 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                                     print("Invalid numbers."); continue
                                 push_state("legend-position")
                                 try:
-                                    fig._cpc_legend_xy_in = (x_in, y_in)
-                                    fig._cpc_legend_xy_in = _sanitize_legend_offset(fig._cpc_legend_xy_in)
-                                    _apply_legend_position()
-                                    fig.canvas.draw_idle()
-                                    print(f"Legend position updated: x={x_in:.2f}, y={y_in:.2f}")
-                                except Exception:
-                                    pass
+                                    # Sanitize and store the new position
+                                    new_pos = _sanitize_legend_offset((x_in, y_in))
+                                    if new_pos is not None:
+                                        fig._cpc_legend_xy_in = new_pos
+                                        _apply_legend_position()
+                                        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:
@@ -3206,28 +3288,46 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                 except Exception:
                     e_ms = 40
                 print(f"  charge ms={c_ms}, discharge ms={d_ms}, efficiency ms={e_ms}")
-                spec = _safe_input("Set marker size: 'c <ms>', 'd <ms>', 'e <ms>' (q=cancel): ").strip().lower()
+                spec = _safe_input("Set new marker size for all series (q=cancel): ").strip().lower()
                 if not spec or spec == 'q':
-                    _print_menu(); continue
-                parts = spec.split()
-                if len(parts) != 2:
-                    print("Need two tokens."); _print_menu(); continue
-                role, val = parts[0], parts[1]
+                    _print_menu(fig); continue
                 try:
-                    num = float(val)
+                    num = float(spec)
                     push_state("marker-size")
-                    if role == 'c' and hasattr(sc_charge, 'set_sizes'):
+                    # Apply to current file's artists
+                    if hasattr(sc_charge, 'set_sizes'):
                         sc_charge.set_sizes([num])
-                    elif role == 'd' and hasattr(sc_discharge, 'set_sizes'):
+                    if hasattr(sc_discharge, 'set_sizes'):
                         sc_discharge.set_sizes([num])
-                    elif role == 'e' and hasattr(sc_eff, 'set_sizes'):
+                    if hasattr(sc_eff, 'set_sizes'):
                         sc_eff.set_sizes([num])
+                    # In multi-file mode, also apply to all files' capacity/efficiency
+                    if is_multi_file and file_data:
+                        for f in file_data:
+                            ch = f.get('sc_charge')
+                            dh = f.get('sc_discharge')
+                            ef = f.get('sc_eff')
+                            try:
+                                if ch is not None and hasattr(ch, 'set_sizes'):
+                                    ch.set_sizes([num])
+                            except Exception:
+                                pass
+                            try:
+                                if dh is not None and hasattr(dh, 'set_sizes'):
+                                    dh.set_sizes([num])
+                            except Exception:
+                                pass
+                            try:
+                                if ef is not None and hasattr(ef, 'set_sizes'):
+                                    ef.set_sizes([num])
+                            except Exception:
+                                pass
                     fig.canvas.draw_idle()
                 except Exception:
                     print("Invalid value.")
             except Exception as e:
                 print(f"Error: {e}")
-            _print_menu(); continue
+            _print_menu(fig); continue
         elif key == 't':
             # Unified WASD toggles for spines/ticks/minor/labels/title per side
             # Import UI positioning functions locally to ensure they're accessible in nested functions
@@ -3809,7 +3909,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                             fig.canvas.draw_idle()
             except Exception as e:
                 print(f"Error in WASD tick menu: {e}")
-            _print_menu(); continue
+            _print_menu(fig); continue
         elif key == 'g':
             while True:
                 print("Geometry: p=plot frame, c=canvas, q=back")
@@ -3831,7 +3931,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                         resize_canvas(fig, ax)
                     except Exception as e:
                         print(f"Resize failed: {e}")
-            _print_menu(); continue
+            _print_menu(fig); continue
         elif key == 'r':
             # Rename axis titles
             print("Tip: Use LaTeX/mathtext for special characters:")
@@ -4117,7 +4217,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                             print(f"Error: {e}")
                 else:
                     print("Unknown option.")
-            _print_menu(); continue
+            _print_menu(fig); continue
         elif key == 'x':
             while True:
                 current_xlim = ax.get_xlim()
@@ -4216,7 +4316,7 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                             fig.canvas.draw_idle()
                     except Exception:
                         print("Invalid numbers.")
-            _print_menu(); continue
+            _print_menu(fig); continue
         elif key == 'y':
             while True:
                 print("Y-ranges: ly=left axis, ry=right axis, q=back")
@@ -4422,10 +4522,68 @@ def cpc_interactive_menu(fig, ax, ax2, sc_charge, sc_discharge, sc_eff, file_dat
                             fig.canvas.draw_idle()
                         except Exception:
                             print("Invalid numbers.")
-            _print_menu(); continue
+            _print_menu(fig); continue
+        elif key == 'ie':
+            # Invert coulombic efficiency values around 100% for the current file(s)
+            try:
+                if sc_eff is None or not hasattr(sc_eff, 'get_offsets'):
+                    print("No efficiency data to invert.")
+                    _print_menu(fig); continue
+                if is_multi_file:
+                    _print_file_list(file_data, current_file_idx)
+                    choice = _safe_input(
+                        f"Invert efficiency for file (1-{len(file_data)}), 'a' for all, or q=cancel: "
+                    ).strip().lower()
+                    if not choice or choice == 'q':
+                        _print_menu(fig); continue
+                    targets = []
+                    if choice == 'a':
+                        targets = list(range(len(file_data)))
+                    else:
+                        try:
+                            idx = int(choice) - 1
+                            if 0 <= idx < len(file_data):
+                                targets = [idx]
+                            else:
+                                print("Invalid file number.")
+                                _print_menu(fig); continue
+                        except ValueError:
+                            print("Invalid choice.")
+                            _print_menu(fig); continue
+                    push_state("invert-efficiency")
+                    for idx in targets:
+                        f = file_data[idx]
+                        eff_sc = f.get('sc_eff')
+                        if eff_sc is None or not hasattr(eff_sc, 'get_offsets'):
+                            continue
+                        offsets = eff_sc.get_offsets()
+                        if offsets.size == 0:
+                            continue
+                        xs = offsets[:, 0]
+                        ys = offsets[:, 1]
+                        # Invert around 100% (y -> 100 - y + 100 = 200 - y)
+                        new_ys = 200.0 - ys
+                        eff_sc.set_offsets(list(zip(xs, new_ys)))
+                    fig.canvas.draw_idle()
+                    print("Inverted efficiency for selected file(s).")
+                else:
+                    offsets = sc_eff.get_offsets()
+                    if offsets.size == 0:
+                        print("No efficiency data to invert.")
+                        _print_menu(fig); continue
+                    xs = offsets[:, 0]
+                    ys = offsets[:, 1]
+                    push_state("invert-efficiency")
+                    new_ys = 200.0 - ys
+                    sc_eff.set_offsets(list(zip(xs, new_ys)))
+                    fig.canvas.draw_idle()
+                    print("Inverted efficiency for current dataset.")
+            except Exception as e:
+                print(f"Error in efficiency inversion: {e}")
+            _print_menu(fig); continue
         else:
             print("Unknown key.")
-            _print_menu(); continue
+            _print_menu(fig); continue
 
 
 __all__ = ["cpc_interactive_menu"]