batplot 1.4.1__tar.gz → 1.4.3__tar.gz

{batplot-1.4.1 → batplot-1.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.4.1
+Version: 1.4.3
 Summary: Interactive plotting for XRD, PDF, and XAS data (.xye, .xy, .qye, .dat, .csv, .gr, .nor, .chik, .chir)
 Author-email: Tian Dai <tianda@uio.no>
 License: MIT License
@@ -72,7 +72,7 @@ pip install batplot
 
 ## Quick Start
 
-### XRD / PDF / XAS
+### XRD / PDF / XAS and much more
 
 ```bash
 # Single diffraction pattern in 2theta
@@ -146,7 +146,7 @@ batplot --operando --interactive
 
 | Type | Formats |
 |------|---------|
-| **Electrochemistry** | `.csv` (Neware), `.mpt` (Biologic) |
+| **Electrochemistry** | `.csv` (Neware), `.mpt` (Biologic), `.xlsx` (Landt/Lanhe) CPC only |
 | **XRD / PDF** | `.xye`, `.xy`, `.qye`, `.dat` |
 | **XAS** | `.nor`, `.chik`, `.chir` |
 | **Others** | `user defined` (plot first two columns as x and y) |
@@ -181,4 +181,4 @@ University of Oslo
 
 **GitHub**: https://github.com/tiandai-chem/batplot
 
-**Subscribe for Updates**: Join batplot-lab@kjemi.uio.no for updates, feature announcements, and community feedback
+**Subscribe for Updates**: Join batplot-lab@kjemi.uio.no for updates, feature announcements, and community feedback. If you are not from UiO, send an email to sympa@kjemi.uio.no with the exact subject line with your name: "subscribe batplot-lab@kjemi.uio.no your-name"

{batplot-1.4.1 → batplot-1.4.3}/README.md

@@ -22,7 +22,7 @@ pip install batplot
 
 ## Quick Start
 
-### XRD / PDF / XAS
+### XRD / PDF / XAS and much more
 
 ```bash
 # Single diffraction pattern in 2theta
@@ -96,7 +96,7 @@ batplot --operando --interactive
 
 | Type | Formats |
 |------|---------|
-| **Electrochemistry** | `.csv` (Neware), `.mpt` (Biologic) |
+| **Electrochemistry** | `.csv` (Neware), `.mpt` (Biologic), `.xlsx` (Landt/Lanhe) CPC only |
 | **XRD / PDF** | `.xye`, `.xy`, `.qye`, `.dat` |
 | **XAS** | `.nor`, `.chik`, `.chir` |
 | **Others** | `user defined` (plot first two columns as x and y) |
@@ -131,4 +131,4 @@ University of Oslo
 
 **GitHub**: https://github.com/tiandai-chem/batplot
 
-**Subscribe for Updates**: Join batplot-lab@kjemi.uio.no for updates, feature announcements, and community feedback
+**Subscribe for Updates**: Join batplot-lab@kjemi.uio.no for updates, feature announcements, and community feedback. If you are not from UiO, send an email to sympa@kjemi.uio.no with the exact subject line with your name: "subscribe batplot-lab@kjemi.uio.no your-name"

{batplot-1.4.1 → batplot-1.4.3}/batplot/__init__.py

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

{batplot-1.4.1 → batplot-1.4.3}/batplot/args.py

@@ -104,15 +104,16 @@ def _print_general_help() -> None:
         "  • Batch styling: apply .bps/.bpsg files to all exports (use --all flag)\n"
         "  • Format option: use --format png/pdf/jpg/etc to change export format\n\n"
     
-        "More help:\n"
-        "  batplot -h xy   # XY file plotting guide\n"
-        "  batplot -h ec   # Electrochemistry (GC/dQdV/CV/CPC) guide\n"
-        "  batplot -h op   # Operando guide\n\n"
-        "Contact & Updates:\n"
-        "  Subscribe to batplot-lab@kjemi.uio.no for updates\n"
-        "  (If you are not from UiO, send an email to sympa@kjemi.uio.no with the subject line \"subscribe batplot-lab@kjemi.uio.no your-name\")\n"
-        "  GitHub: https://github.com/tiandai-chem/batplot\n"
-        "  Email: tianda@uio.no\n"
+    "More help:\n"
+    "  batplot -h xy   # XY file plotting guide\n"
+    "  batplot -h ec   # Electrochemistry (GC/dQdV/CV/CPC) guide\n"
+    "  batplot -h op   # Operando guide\n"
+    "  Manual: https://github.com/tiandai-chem/batplot/blob/main/USER_MANUAL.md\n\n"
+    "Contact & Updates:\n"
+    "  Subscribe to batplot-lab@kjemi.uio.no for updates\n"
+    "  (If you are not from UiO, send an email to sympa@kjemi.uio.no with the subject line \"subscribe batplot-lab@kjemi.uio.no your-name\")\n"
+    "  GitHub: https://github.com/tiandai-chem/batplot\n"
+    "  Email: tianda@uio.no\n"
     )
     _print_help(msg)
 
@@ -180,17 +181,20 @@ def _print_ec_help() -> None:
         "Cyclic voltammetry (CV) from .mpt or .txt: plots voltage vs current for each cycle.\n"
         "  batplot --cv file.mpt\n"
         "  batplot --cv file.txt\n\n"
-        "Capacity-per-cycle (CPC) with coulombic efficiency from .csv or .mpt.\n"
+        "Capacity-per-cycle (CPC) with coulombic efficiency from .csv, .xlsx, or .mpt.\n"
         "Supports multiple files with individual color customization:\n"
-        "  batplot --cpc file.csv\n"
-        "  batplot --cpc file.mpt --mass 1.2\n"
-        "  batplot --cpc file1.csv file2.csv file3.mpt --mass 1.2 --interactive\n"
+        "  batplot --cpc file.csv                 # Neware CSV\n"
+        "  batplot --cpc file.xlsx                # Landt/Lanhe Excel (Chinese tester)\n"
+        "  batplot --cpc file.mpt --mass 1.2      # Biologic MPT\n"
+        "  batplot --cpc file1.csv file2.xlsx file3.mpt --mass 1.2 --interactive\n\n"
+        "Excel support: Landt/Lanhe (蓝电/蓝河) .xlsx files with Chinese headers:\n"
+        "  Expected structure: Row 1=filename, Row 2=headers, Row 3+=data\n"
         "Batch mode: Process all files and export to Figures/ subdirectory (default: .svg).\n"
         "  batplot --gc --all --mass 7.0          # All .mpt/.csv files (.mpt requires --mass)\n"
         "  batplot --gc --all --mass 7 --format png  # Export as .png instead of .svg\n"
         "  batplot --cv --all                     # All .mpt/.txt files (CV mode)\n"
         "  batplot --dqdv --all                   # All .csv files (dQdV mode)\n"
-        "  batplot --cpc --all --mass 5.4         # All .mpt/.csv files (.mpt requires --mass)\n"
+        "  batplot --cpc --all --mass 5.4         # All .mpt/.csv/.xlsx (.mpt requires --mass)\n"
         "  batplot --gc /path/to/folder --mass 6  # Process specific directory\n\n"
         "Batch mode with style/geometry: Apply .bps/.bpsg files to all batch exports.\n"
         "  batplot --all --gc style.bps --mass 7  # Apply style to all GC plots\n"

{batplot-1.4.1 → batplot-1.4.3}/batplot/batch.py

@@ -344,6 +344,11 @@ def batch_process(directory: str, args):
                 # Transparent background for SVG exports
                 _, _ext = os.path.splitext(target)
                 if _ext.lower() == '.svg':
+                    # Fix for Affinity Designer/Photo compatibility issues
+                    # Use 'none' to embed fonts as text (not paths) - prevents phantom labels
+                    # Set hashsalt to empty to avoid duplicate text elements
+                    plt.rcParams['svg.fonttype'] = 'none'
+                    plt.rcParams['svg.hashsalt'] = None
                     try:
                         _fig_fc = fig_b.get_facecolor()
                     except Exception:

{batplot-1.4.1 → batplot-1.4.3}/batplot/batplot.py

@@ -538,6 +538,11 @@ def batplot_main() -> int:
                 # Transparent background for SVG exports
                 _, _ext = _os.path.splitext(outname)
                 if _ext.lower() == '.svg':
+                    # Fix for Affinity Designer/Photo compatibility issues
+                    # Use 'none' to embed fonts as text (not paths) - prevents phantom labels
+                    # Set hashsalt to empty to avoid duplicate text elements
+                    _plt.rcParams['svg.fonttype'] = 'none'
+                    _plt.rcParams['svg.hashsalt'] = None
                     try:
                         _fig_fc = fig.get_facecolor()
                     except Exception:
@@ -625,7 +630,7 @@ def batplot_main() -> int:
         import numpy as _np
 
         if len(args.files) < 1:
-            print("CPC mode: provide at least one file (.csv or .mpt).")
+            print("CPC mode: provide at least one file (.csv, .xlsx, or .mpt).")
             exit(1)
         
         # Process multiple files
@@ -651,7 +656,7 @@ def batplot_main() -> int:
             file_basename = _os.path.basename(ec_file)
             
             try:
-                if ext == '.csv':
+                if ext in ['.csv', '.xlsx', '.xls']:
                     cap_x, voltage, cycles, chg_mask, dchg_mask = read_ec_csv_file(ec_file, prefer_specific=True)
                     cyc = _np.array(cycles, dtype=int)
                     unique_cycles = _np.unique(cyc)
@@ -683,7 +688,7 @@ def batplot_main() -> int:
                         continue
                     cyc_nums, cap_charge, cap_discharge, eff = read_mpt_file(ec_file, mode='cpc', mass_mg=mass_mg)
                 else:
-                    print(f"Skipped {file_basename}: unsupported format (must be .csv or .mpt)")
+                    print(f"Skipped {file_basename}: unsupported format (must be .csv, .xlsx, or .mpt)")
                     continue
                 
                 # Assign colors: distinct hue for each file

{batplot-1.4.1 → batplot-1.4.3}/batplot/operando.py

@@ -211,33 +211,98 @@ def plot_operando_folder(folder: str, args) -> Tuple[plt.Figure, plt.Axes, Dict[
     if has_ec:
         try:
             ec_path = mpt_files[0]
-            # Read time series from .mpt (now returns labels too)
-            result = read_mpt_file(str(ec_path), mode='time')
             
-            # Check if we got labels (5 elements) or old format (3 elements)
-            if len(result) == 5:
-                x_data, y_data, current_mA, x_label, y_label = result
-                # For EC-Lab files: x_label='Time (h)', y_label='Voltage (V)'
-                # EC-Lab returns time in seconds, needs conversion to hours
-                # operando plots with voltage on X-axis and time on Y-axis
-                if x_label == 'Time (h)' and y_label == 'Voltage (V)':
-                    # EC-Lab file: convert time to hours and swap axes
-                    time_h = np.asarray(x_data, float) / 3600.0
-                    voltage_v = np.asarray(y_data, float)
-                    x_data = voltage_v
-                    y_data = time_h
-                    x_label = 'Voltage (V)'
-                    y_label = 'Time (h)'
-                else:
-                    # Simple file: use raw data as-is, keep original labels
-                    x_data = np.asarray(x_data, float)
-                    y_data = np.asarray(y_data, float)
+            # Check if user specified custom columns via --readcolmpt
+            readcol_mpt = None
+            if hasattr(args, 'readcol_by_ext') and '.mpt' in args.readcol_by_ext:
+                readcol_mpt = args.readcol_by_ext['.mpt']
+            
+            if readcol_mpt:
+                # User explicitly specified columns - respect their choice
+                data = robust_loadtxt_skipheader(str(ec_path))
+                if data.ndim == 1:
+                    data = data.reshape(1, -1)
+                if data.shape[1] < 2:
+                    raise ValueError(f"MPT file {ec_path.name} has insufficient columns")
+                
+                # Apply column selection (1-indexed -> 0-indexed)
+                x_col, y_col = readcol_mpt
+                x_col_idx = x_col - 1
+                y_col_idx = y_col - 1
+                if x_col_idx < 0 or x_col_idx >= data.shape[1]:
+                    raise ValueError(f"X column {x_col} out of range in {ec_path.name} (has {data.shape[1]} columns)")
+                if y_col_idx < 0 or y_col_idx >= data.shape[1]:
+                    raise ValueError(f"Y column {y_col} out of range in {ec_path.name} (has {data.shape[1]} columns)")
+                
+                x_data = data[:, x_col_idx]
+                y_data = data[:, y_col_idx]
+                current_mA = None
+                # User-specified: plot exactly as specified (X on x-axis, Y on y-axis)
+                x_label = f'Column {x_col}'
+                y_label = f'Column {y_col}'
             else:
-                # Old format compatibility (shouldn't happen anymore)
-                x_data, y_data, current_mA = result
-                x_data = np.asarray(y_data, float)
-                y_data = np.asarray(x_data, float) / 3600.0
-                x_label, y_label = 'Voltage (V)', 'Time (h)'
+                # Auto-detect format: Read time series from .mpt
+                result = read_mpt_file(str(ec_path), mode='time')
+                
+                # Check if we got labels (5 elements) or old format (3 elements)
+                if len(result) == 5:
+                    x_data, y_data, current_mA, x_label, y_label = result
+                    # For EC-Lab files: x_label='Time (h)', y_label='Voltage (V)'
+                    # For simple files: x_label could be 'Time(h)', 'time', etc.
+                    # EC-Lab returns time in seconds, needs conversion to hours
+                    # operando plots with voltage on X-axis and time on Y-axis
+                    
+                    # Check if labels indicate time/voltage data (flexible matching)
+                    x_lower = x_label.lower().replace(' ', '').replace('_', '')
+                    y_lower = y_label.lower().replace(' ', '').replace('_', '')
+                    has_time_in_x = 'time' in x_lower
+                    has_voltage_in_x = 'voltage' in x_lower or 'ewe' in x_lower
+                    has_time_in_y = 'time' in y_lower
+                    has_voltage_in_y = 'voltage' in y_lower or 'ewe' in y_lower
+                    
+                    is_time_voltage = (has_time_in_x or has_time_in_y) and (has_voltage_in_x or has_voltage_in_y)
+                    
+                    if x_label == 'Time (h)' and y_label == 'Voltage (V)':
+                        # EC-Lab file: convert time to hours and swap axes
+                        time_h = np.asarray(x_data, float) / 3600.0
+                        voltage_v = np.asarray(y_data, float)
+                        x_data = voltage_v
+                        y_data = time_h
+                        x_label = 'Voltage (V)'
+                        y_label = 'Time (h)'
+                    elif is_time_voltage:
+                        # Simple file with time/voltage columns
+                        # Determine which column is which, then arrange: voltage on X, time on Y
+                        if has_time_in_x and has_voltage_in_y:
+                            # Columns are: Time, Voltage -> swap to Voltage, Time
+                            time_h = np.asarray(x_data, float)
+                            voltage_v = np.asarray(y_data, float)
+                            x_data = voltage_v
+                            y_data = time_h
+                            x_label = 'Voltage (V)'
+                            y_label = 'Time (h)'
+                        elif has_voltage_in_x and has_time_in_y:
+                            # Columns are: Voltage, Time -> already correct order
+                            voltage_v = np.asarray(x_data, float)
+                            time_h = np.asarray(y_data, float)
+                            x_data = voltage_v
+                            y_data = time_h
+                            x_label = 'Voltage (V)'
+                            y_label = 'Time (h)'
+                        else:
+                            # Ambiguous or both in same column - default behavior
+                            x_data = np.asarray(x_data, float)
+                            y_data = np.asarray(y_data, float)
+                    else:
+                        # Generic file: use raw data as-is, keep original labels
+                        x_data = np.asarray(x_data, float)
+                        y_data = np.asarray(y_data, float)
+                else:
+                    # Old format compatibility (shouldn't happen anymore)
+                    x_data, y_data, current_mA = result
+                    x_data = np.asarray(y_data, float)
+                    y_data = np.asarray(x_data, float) / 3600.0
+                    x_label, y_label = 'Voltage (V)', 'Time (h)'
             
             # Add the EC axes on the right
             ec_ax = fig.add_subplot(gs[0, 1])

{batplot-1.4.1 → batplot-1.4.3}/batplot/readers.py

@@ -6,6 +6,53 @@ import numpy as np
 from typing import Tuple
 
 
+def read_excel_to_csv_like(fname: str, header_row: int = 2, data_start_row: int = 3) -> Tuple[list, list]:
+    """Read Excel file and convert to CSV-like structure for batplot.
+    
+    This is designed for Chinese cycler data Excel files where:
+    - Row 1: File/sample name
+    - Row 2: Column headers
+    - Row 3+: Data
+    
+    Args:
+        fname: Path to Excel file (.xlsx)
+        header_row: Row number containing headers (1-indexed, default=2)
+        data_start_row: First row containing data (1-indexed, default=3)
+    
+    Returns:
+        Tuple of (header_list, rows_list) compatible with CSV processing
+    """
+    try:
+        import openpyxl
+    except ImportError:
+        raise ImportError("openpyxl is required to read Excel files. Install with: pip install openpyxl")
+    
+    wb = openpyxl.load_workbook(fname, read_only=True, data_only=True)
+    ws = wb.active
+    
+    # Read header row
+    header = []
+    for cell in ws[header_row]:
+        header.append(str(cell.value) if cell.value is not None else '')
+    
+    # Read data rows
+    rows = []
+    for row in ws.iter_rows(min_row=data_start_row, values_only=True):
+        # Convert row to list of strings (handle None, datetime, etc.)
+        row_data = []
+        for val in row:
+            if val is None:
+                row_data.append('')
+            elif isinstance(val, (int, float)):
+                row_data.append(str(val))
+            else:
+                row_data.append(str(val))
+        rows.append(row_data)
+    
+    wb.close()
+    return header, rows
+
+
 def read_csv_file(fname: str):
     for delim in [",", ";", "\t"]:
         try:
@@ -583,7 +630,7 @@ def read_biologic_txt_file(fname: str, mode: str = 'cv') -> Tuple[np.ndarray, np
 
 
 def read_ec_csv_file(fname: str, prefer_specific: bool = True) -> Tuple[np.ndarray, np.ndarray, np.ndarray, np.ndarray, np.ndarray]:
-    """Read a cycler-exported CSV (e.g., Neware-like) and extract arrays for GC plotting.
+    """Read a cycler-exported CSV or Excel file (e.g., Neware-like) and extract arrays for GC plotting.
 
     The CSV is expected to have a two-line header where the second header line starts
     with an empty first cell. Columns of interest include:
@@ -594,8 +641,13 @@ def read_ec_csv_file(fname: str, prefer_specific: bool = True) -> Tuple[np.ndarr
           * absolute: 'Capacity(mAh)' and optionally split 'Chg. Cap.(mAh)' / 'DChg. Cap.(mAh)'
           * specific: 'Spec. Cap.(mAh/g)', 'Chg. Spec. Cap.(mAh/g)', 'DChg. Spec. Cap.(mAh/g)'
 
+    Excel files (.xlsx) are supported and expected to have:
+      - Row 1: File/sample name (ignored)
+      - Row 2: Column headers (Chinese or English)
+      - Row 3+: Data
+
     Args:
-        fname: Path to the CSV file.
+        fname: Path to the CSV or Excel file.
         prefer_specific: If True, will use specific capacities (mAh g⁻¹) if available; otherwise
                          uses absolute capacities (mAh) when present.
 
@@ -612,26 +664,54 @@ def read_ec_csv_file(fname: str, prefer_specific: bool = True) -> Tuple[np.ndarr
         discharge_mask: boolean mask indicating discharging segments (inverse of charge_mask)
     """
     import csv
-
-    # Read first two rows to compose header
-    with open(fname, newline='', encoding='utf-8', errors='ignore') as f:
-        r = csv.reader(f)
-        try:
-            r1 = next(r)
-            r2 = next(r)
-        except StopIteration:
-            raise ValueError(f"CSV '{fname}' is empty or missing header rows")
-        # If second line begins with an empty first cell, treat it as a continuation of header.
-        if len(r2) > 0 and (r2[0] == '' or str(r2[0]).strip() == ''):
-            header = [c.strip() for c in r1] + [c.strip() for c in r2[1:]]
-            rows = list(r)
-        else:
-            # Single-line header: r2 is the first data row; include it back in rows
-            header = [c.strip() for c in r1]
-            rows = [r2] + list(r)
+    import os
+    
+    # Check if file is Excel
+    _, ext = os.path.splitext(fname)
+    if ext.lower() in ['.xlsx', '.xls']:
+        # Read Excel file
+        header, rows = read_excel_to_csv_like(fname)
+    else:
+        # Read first two rows to compose header from CSV
+        with open(fname, newline='', encoding='utf-8', errors='ignore') as f:
+            r = csv.reader(f)
+            try:
+                r1 = next(r)
+                r2 = next(r)
+            except StopIteration:
+                raise ValueError(f"CSV '{fname}' is empty or missing header rows")
+            # If second line begins with an empty first cell, treat it as a continuation of header.
+            if len(r2) > 0 and (r2[0] == '' or str(r2[0]).strip() == ''):
+                header = [c.strip() for c in r1] + [c.strip() for c in r2[1:]]
+                rows = list(r)
+            else:
+                # Single-line header: r2 is the first data row; include it back in rows
+                header = [c.strip() for c in r1]
+                rows = [r2] + list(r)
 
     # Build fast name->index map (case-insensitive match on exact header text)
     name_to_idx = {h: i for i, h in enumerate(header)}
+    
+    # Chinese to English column name mappings
+    chinese_mappings = {
+        '循环序号': 'Cycle Index',
+        '充电比容量/mAh/g': 'Chg. Spec. Cap.(mAh/g)',
+        '放电比容量/mAh/g': 'DChg. Spec. Cap.(mAh/g)',
+        '充电容量/mAh': 'Chg. Cap.(mAh)',
+        '放电容量/mAh': 'DChg. Cap.(mAh)',
+        '效率/%': 'Efficiency(%)',
+        '充电中压/V': 'Voltage(V)',
+        '放电中压/V': 'Voltage(V)',
+        '充电均压/V': 'Voltage(V)',
+        '放电均压/V': 'Voltage(V)',
+    }
+    
+    # Add Chinese mappings to name_to_idx
+    for i, h in enumerate(header):
+        if h in chinese_mappings:
+            eng_name = chinese_mappings[h]
+            if eng_name not in name_to_idx:
+                name_to_idx[eng_name] = i
 
     def _find(name: str):
         return name_to_idx.get(name, None)
@@ -641,9 +721,7 @@ def read_ec_csv_file(fname: str, prefer_specific: bool = True) -> Tuple[np.ndarr
     i_idx = _find('Current(mA)')
     cyc_idx = _find('Cycle Index')
     step_type_idx = _find('Step Type')  # Optional: explicitly indicates charge/discharge
-    if v_idx is None or i_idx is None:
-        raise ValueError("CSV missing required 'Voltage(V)' or 'Current(mA)' columns")
-
+    
     # Capacity columns (absolute preferred unless prefer_specific True)
     cap_abs_idx = _find('Capacity(mAh)')
     cap_abs_chg_idx = _find('Chg. Cap.(mAh)')
@@ -651,6 +729,13 @@ def read_ec_csv_file(fname: str, prefer_specific: bool = True) -> Tuple[np.ndarr
     cap_spec_idx = _find('Spec. Cap.(mAh/g)')
     cap_spec_chg_idx = _find('Chg. Spec. Cap.(mAh/g)')
     cap_spec_dch_idx = _find('DChg. Spec. Cap.(mAh/g)')
+    
+    # Check if this is a summary file (has capacity columns but no voltage/current)
+    has_capacity_cols = any([cap_abs_chg_idx, cap_abs_dch_idx, cap_spec_chg_idx, cap_spec_dch_idx])
+    is_summary_file = has_capacity_cols and (v_idx is None or i_idx is None)
+    
+    if not is_summary_file and (v_idx is None or i_idx is None):
+        raise ValueError("CSV missing required 'Voltage(V)' or 'Current(mA)' columns")
 
     use_specific = False
     # Decide which flavor to use
@@ -664,16 +749,72 @@ def read_ec_csv_file(fname: str, prefer_specific: bool = True) -> Tuple[np.ndarr
 
     # Prepare arrays
     n = len(rows)
-    voltage = np.empty(n, dtype=float)
-    current = np.empty(n, dtype=float)
-    cycles = np.ones(n, dtype=int)
-    cap_x = np.full(n, np.nan, dtype=float)
-
+    
     def _to_float(val: str) -> float:
         try:
             return float(val.strip()) if isinstance(val, str) else float(val)
         except Exception:
             return np.nan
+    
+    # Special handling for summary files (charge/discharge capacities per cycle, no point-by-point data)
+    if is_summary_file:
+        # For summary files, create synthetic points: one charge point and one discharge point per cycle
+        voltage = []
+        current = []
+        cycles = []
+        cap_x = []
+        is_charge_list = []
+        
+        for k, row in enumerate(rows):
+            if len(row) < len(header):
+                row = row + [''] * (len(header) - len(row))
+            
+            # Get cycle number
+            cycle_num = 1
+            if cyc_idx is not None:
+                cval = _to_float(row[cyc_idx])
+                cycle_num = int(cval) if not np.isnan(cval) and cval > 0 else 1
+            
+            # Get charge and discharge capacities
+            if use_specific:
+                cap_chg = _to_float(row[cap_spec_chg_idx]) if cap_spec_chg_idx is not None else 0
+                cap_dch = _to_float(row[cap_spec_dch_idx]) if cap_spec_dch_idx is not None else 0
+            else:
+                cap_chg = _to_float(row[cap_abs_chg_idx]) if cap_abs_chg_idx is not None else 0
+                cap_dch = _to_float(row[cap_abs_dch_idx]) if cap_abs_dch_idx is not None else 0
+            
+            # Create charge point
+            if cap_chg > 0 and not np.isnan(cap_chg):
+                voltage.append(3.5)  # Synthetic voltage
+                current.append(0.1)  # Synthetic current
+                cycles.append(cycle_num)
+                cap_x.append(cap_chg)
+                is_charge_list.append(True)
+            
+            # Create discharge point
+            if cap_dch > 0 and not np.isnan(cap_dch):
+                voltage.append(2.5)  # Synthetic voltage
+                current.append(-0.1)  # Synthetic current
+                cycles.append(cycle_num)
+                cap_x.append(cap_dch)
+                is_charge_list.append(False)
+        
+        voltage = np.array(voltage, dtype=float)
+        current = np.array(current, dtype=float)
+        cycles = np.array(cycles, dtype=int)
+        cap_x = np.array(cap_x, dtype=float)
+        is_charge = np.array(is_charge_list, dtype=bool)
+        
+        charge_mask = is_charge
+        discharge_mask = ~is_charge
+        
+        return (cap_x, voltage, cycles, charge_mask, discharge_mask)
+    
+    # Normal processing for point-by-point data
+    voltage = np.empty(n, dtype=float)
+    current = np.empty(n, dtype=float)
+    cycles = np.ones(n, dtype=int)
+    cap_x = np.full(n, np.nan, dtype=float)
 
     for k, row in enumerate(rows):
         # Ensure row has enough columns

{batplot-1.4.1 → batplot-1.4.3}/batplot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.4.1
+Version: 1.4.3
 Summary: Interactive plotting for XRD, PDF, and XAS data (.xye, .xy, .qye, .dat, .csv, .gr, .nor, .chik, .chir)
 Author-email: Tian Dai <tianda@uio.no>
 License: MIT License
@@ -72,7 +72,7 @@ pip install batplot
 
 ## Quick Start
 
-### XRD / PDF / XAS
+### XRD / PDF / XAS and much more
 
 ```bash
 # Single diffraction pattern in 2theta
@@ -146,7 +146,7 @@ batplot --operando --interactive
 
 | Type | Formats |
 |------|---------|
-| **Electrochemistry** | `.csv` (Neware), `.mpt` (Biologic) |
+| **Electrochemistry** | `.csv` (Neware), `.mpt` (Biologic), `.xlsx` (Landt/Lanhe) CPC only |
 | **XRD / PDF** | `.xye`, `.xy`, `.qye`, `.dat` |
 | **XAS** | `.nor`, `.chik`, `.chir` |
 | **Others** | `user defined` (plot first two columns as x and y) |
@@ -181,4 +181,4 @@ University of Oslo
 
 **GitHub**: https://github.com/tiandai-chem/batplot
 
-**Subscribe for Updates**: Join batplot-lab@kjemi.uio.no for updates, feature announcements, and community feedback
+**Subscribe for Updates**: Join batplot-lab@kjemi.uio.no for updates, feature announcements, and community feedback. If you are not from UiO, send an email to sympa@kjemi.uio.no with the exact subject line with your name: "subscribe batplot-lab@kjemi.uio.no your-name"

{batplot-1.4.1 → batplot-1.4.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "batplot"
-version = "1.4.1"
+version = "1.4.3"
 description = "Interactive plotting for XRD, PDF, and XAS data (.xye, .xy, .qye, .dat, .csv, .gr, .nor, .chik, .chir)"
 authors = [
     { name = "Tian Dai", email = "tianda@uio.no" }