batplot 1.7.25__tar.gz → 1.7.27__tar.gz

{batplot-1.7.25/batplot.egg-info → batplot-1.7.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.7.25
+Version: 1.7.27
 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 → batplot-1.7.27}/batplot/__init__.py

@@ -1,5 +1,5 @@
 """batplot: Interactive plotting for battery data visualization."""
 
-__version__ = "1.7.25"
+__version__ = "1.7.27"
 
 __all__ = ["__version__"]

{batplot-1.7.25 → batplot-1.7.27}/batplot/batplot.py

@@ -76,9 +76,32 @@ except ImportError:
     operando_ec_interactive_menu = None
 
 try:
-    from .cpc_interactive import cpc_interactive_menu
+    from .cpc_interactive import cpc_interactive_menu, _generate_similar_color
 except ImportError:
     cpc_interactive_menu = None
+    # Fallback function if import fails
+    def _generate_similar_color(base_color):
+        """Generate a similar but distinguishable color for discharge from charge color."""
+        try:
+            from matplotlib.colors import to_rgb, rgb_to_hsv, hsv_to_rgb
+            rgb = to_rgb(base_color)
+            hsv = rgb_to_hsv(rgb)
+            h, s, v = hsv
+            h_new = (h + 0.04) % 1.0
+            s_new = max(0.3, s * 0.85)
+            v_new = max(0.4, v * 0.9)
+            rgb_new = hsv_to_rgb([h_new, s_new, v_new])
+            # Convert numpy array to tuple to avoid truth value ambiguity
+            if hasattr(rgb_new, 'tolist'):
+                return tuple(rgb_new.tolist())
+            return tuple(rgb_new)
+        except Exception:
+            try:
+                from matplotlib.colors import to_rgb
+                rgb = to_rgb(base_color)
+                return tuple(max(0, c * 0.7) for c in rgb)
+            except Exception:
+                return base_color
 
 # Global state variables (used by interactive menus and style system)
 keep_canvas_fixed = False
@@ -1040,20 +1063,23 @@ def batplot_main() -> int:
         
         # Process multiple files
         file_data = []  # List of dicts with file info and data
-        # Use perceptually-uniform palettes for capacity (viridis) and efficiency (plasma)
+        # Use tab10 for capacity and viridis for efficiency
         import matplotlib.cm as cm
         import matplotlib.colors as mcolors
         n_files = len(data_files)
         
-        capacity_cmap = cm.get_cmap('viridis')
-        efficiency_cmap = cm.get_cmap('plasma')
+        # Use tab10 hardcoded colors for capacity (matching interactive menu)
+        default_tab10_colors = ['#1f77b4', '#ff7f0e', '#2ca02c', '#d62728', '#9467bd',
+                               '#8c564b', '#e377c2', '#7f7f7f', '#bcbd22', '#17becf']
         if n_files <= 1:
-            cap_positions = [0.55]
-            eff_positions = [0.35]
+            capacity_colors = [default_tab10_colors[0]]
+            eff_positions = [0.55]
         else:
-            cap_positions = np.linspace(0.15, 0.85, n_files)
-            eff_positions = np.linspace(0.2, 0.9, n_files)
-        capacity_colors = [mcolors.rgb2hex(capacity_cmap(pos)[:3]) for pos in cap_positions]
+            capacity_colors = [default_tab10_colors[i % len(default_tab10_colors)] for i in range(n_files)]
+            eff_positions = np.linspace(0.08, 0.88, n_files)
+        
+        # Use viridis for efficiency
+        efficiency_cmap = cm.get_cmap('viridis')
         efficiency_colors = [mcolors.rgb2hex(efficiency_cmap(pos)[:3]) for pos in eff_positions]
         
         for file_idx, ec_file in enumerate(data_files):
@@ -1137,6 +1163,8 @@ def batplot_main() -> int:
                 # Assign colors: distinct hue for each file
                 capacity_color = capacity_colors[file_idx % len(capacity_colors)]
                 efficiency_color = efficiency_colors[file_idx % len(efficiency_colors)]
+                # Generate discharge color using the same function as interactive menu
+                discharge_color = _generate_similar_color(capacity_color)
                 
                 file_data.append({
                     'filename': file_basename,
@@ -1146,6 +1174,7 @@ def batplot_main() -> int:
                     'cap_discharge': cap_discharge,
                     'eff': eff,
                     'color': capacity_color,
+                    'discharge_color': discharge_color,
                     'eff_color': efficiency_color,
                     'visible': True
                 })
@@ -1187,15 +1216,11 @@ def batplot_main() -> int:
                 label_dch = f'{label} (Dch)'
                 label_eff = f'{label} (Eff)'
             
-            # Use slightly different shades for charge/discharge from same file
-            from matplotlib.colors import to_rgb, rgb_to_hsv, hsv_to_rgb
-            rgb = to_rgb(color)
-            # Discharge: shift hue slightly and reduce brightness for clear distinction
-            hsv = rgb_to_hsv(rgb)
-            h, s, v = hsv
-            h_new = (h - 0.05) % 1.0  # Shift hue slightly (more red/brown)
-            v_new = max(0.3, v * 0.75)  # Darker but not too dark
-            discharge_color = hsv_to_rgb([h_new, s, v_new])
+            # Use stored discharge color if available, otherwise generate it
+            if 'discharge_color' in file_info and file_info['discharge_color'] is not None:
+                discharge_color = file_info['discharge_color']
+            else:
+                discharge_color = _generate_similar_color(color)
             
             sc_charge = ax.scatter(cyc_nums, cap_charge, color=color, label=label_chg, 
                                   s=32, zorder=3, alpha=0.8, marker='o')
@@ -1216,10 +1241,24 @@ def batplot_main() -> int:
         try:
             h1, l1 = ax.get_legend_handles_labels()
             h2, l2 = ax2.get_legend_handles_labels()
-            leg = ax.legend(h1 + h2, l1 + l2, loc='best', borderaxespad=1.0)
+            combined_handles = h1 + h2
+            leg = ax.legend(
+                combined_handles, l1 + l2,
+                loc='best',
+                frameon=False,
+                handlelength=1.0,
+                handletextpad=0.35,
+                labelspacing=0.25,
+                borderaxespad=0.5,
+                borderpad=0.3,
+                columnspacing=0.6,
+                labelcolor='linecolor',
+            )
             if leg is not None:
                 try:
                     leg.set_frame_on(False)
+                    leg.set_edgecolor('none')
+                    leg.set_facecolor('none')
                 except Exception:
                     pass
         except Exception:
@@ -1278,15 +1317,7 @@ def batplot_main() -> int:
                     pass
                 plt.show(block=False)
                 try:
-                    # Pass file_data for multi-file support, but keep backward compatibility
-                    if len(file_data) == 1:
-                        # Single file: use original signature
-                        cpc_interactive_menu(fig, ax, ax2, 
-                                           file_data[0]['sc_charge'], 
-                                           file_data[0]['sc_discharge'], 
-                                           file_data[0]['sc_eff'])
-                    else:
-                        # Multiple files: pass file_data list
+                    # Always pass file_data so filename is available
                         cpc_interactive_menu(fig, ax, ax2, 
                                            file_data[0]['sc_charge'], 
                                            file_data[0]['sc_discharge'], 
@@ -2129,7 +2160,7 @@ def batplot_main() -> int:
         # Rebuild label texts
         for i, lab in enumerate(labels_list):
             txt = ax.text(1.0, 1.0, f"{i+1}: {lab}", ha='right', va='top', transform=ax.transAxes,
-                          fontsize=plt.rcParams.get('font.size', 12))
+                          fontsize=plt.rcParams.get('font.size', 16))
             label_text_objects.append(txt)
         # Restore curve names visibility
         try:
@@ -2311,7 +2342,7 @@ def batplot_main() -> int:
                         if show_titles_local:
                             label_text = f" {lab}"
                             txt = ax.text(prev_xlim[0], y_line+0.005*yr, label_text,
-                                          ha='left', va='bottom', fontsize=max(8,int(0.55*plt.rcParams.get('font.size',12))), color=color)
+                                          ha='left', va='bottom', fontsize=max(8,int(0.55*plt.rcParams.get('font.size',16))), color=color)
                             new_art.append(txt)
                     ax._cif_tick_art = new_art
                     # Restore both x and y-axis limits to prevent movement
@@ -2939,7 +2970,7 @@ def batplot_main() -> int:
     # ---------------- Initial label creation (REPLACED BLOCK) ----------------
     # Remove the old simple per-curve placement loop and use:
     label_text_objects = []
-    tick_fs = sample_tick.get_fontsize() if sample_tick else plt.rcParams.get('font.size', 12)
+    tick_fs = sample_tick.get_fontsize() if sample_tick else plt.rcParams.get('font.size', 16)
     # get_fontname() may not exist on some backends; use family from rcParams if missing
     try:
         tick_fn = sample_tick.get_fontname() if sample_tick else plt.rcParams.get('font.sans-serif', ['DejaVu Sans'])[0]

{batplot-1.7.25 → batplot-1.7.27}/batplot/color_utils.py

@@ -246,12 +246,19 @@ def palette_preview(name: str, steps: int = 8) -> str:
     if steps < 1:
         steps = 1
     
-    # Sample colors at evenly spaced positions along the colormap
-    # Position ranges from 0.0 (start) to 1.0 (end)
-    samples = [
-        mcolors.to_hex(cmap(i / max(steps - 1, 1)))  # Convert to hex color code
-        for i in range(steps)
-    ]
+    # Special handling for tab10 to use hardcoded colors (matching EC and CPC interactive)
+    if name.lower() == 'tab10':
+        default_tab10_colors = ['#1f77b4', '#ff7f0e', '#2ca02c', '#d62728', '#9467bd',
+                               '#8c564b', '#e377c2', '#7f7f7f', '#bcbd22', '#17becf']
+        # Use first 'steps' colors from tab10
+        samples = [default_tab10_colors[i % len(default_tab10_colors)] for i in range(steps)]
+    else:
+        # Sample colors at evenly spaced positions along the colormap
+        # Position ranges from 0.0 (start) to 1.0 (end)
+        samples = [
+            mcolors.to_hex(cmap(i / max(steps - 1, 1)))  # Convert to hex color code
+            for i in range(steps)
+        ]
     
     # Convert color codes to visual blocks and return as string
     return color_bar(samples)