batplot 1.8.36__tar.gz → 1.8.38__tar.gz

{batplot-1.8.36/batplot.egg-info → batplot-1.8.38}/PKG-INFO

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

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

{batplot-1.8.36 → batplot-1.8.38}/batplot/batch.py

@@ -703,8 +703,11 @@ def batch_process(directory: str, args):
                     if ext and ext not in args._batch_warned_extensions and ext not in known_axis_ext:
                         args._batch_warned_extensions.add(ext)
                         print(f"  Note: Reading '{ext}' files as 2-column (x, y) data with x-axis = {args.xaxis}")
+                elif getattr(args, 'wl', None) is not None:
+                    # .txt / generic text: --wl implies XRD Q conversion (matches main batplot.py)
+                    axis_mode = 'Q'
                 else:
-                    raise ValueError(f"Unknown file type: {fname}. Use --xaxis [Q|2theta|r|k|energy|rft] or batplot --help for help.")
+                    raise ValueError(f"Unknown file type: {fname}. Use --xaxis [Q|2theta|r|k|energy|rft], or --wl for XRD Q, or batplot --help for help.")
 
             # Convert to Q if needed
             if axis_mode == 'Q' and ext not in ('.qye', '.gr', '.nor'):

{batplot-1.8.36 → batplot-1.8.38}/batplot/batplot.py

@@ -3733,12 +3733,17 @@ def batplot_main() -> int:  # type: ignore
         elif any_chir:
             axis_mode = "rft"
         elif any_txt:
-            # .txt is generic, require --xaxis
+            # .txt is generic: need --xaxis unless XRD context is clear from --wl or file:wl (same as .xy without ext hint).
             if args.xaxis:
                 # Normalize case: 'q' or 'Q' → 'Q' (uppercase), everything else lowercase
                 axis_mode = "Q" if args.xaxis.upper() == "Q" else args.xaxis.lower()
+            elif getattr(args, 'wl', None) is not None or any_lambda:
+                axis_mode = "Q"
             else:
-                raise ValueError("Unknown file type. Use: batplot file.txt --xaxis [Q|2theta|r|k|energy|rft] or batplot --help for help.")
+                raise ValueError(
+                    "Unknown file type for .txt. Add --xaxis [Q|2theta|r|k|energy|rft], or use --wl for XRD Q conversion, "
+                    "or batplot --help."
+                )
         elif any_lambda or any_cif or any_xrd_vendor:
             # XRD vendor formats (.raw, .brml, .xrdml, .rasx) are 2theta; CIF is Q; file:wl implies Q domain
             if args.xaxis and args.xaxis.lower() in ("2theta","two_theta","tth"):

{batplot-1.8.36 → batplot-1.8.38}/batplot/data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.8.38] - 2026-04-03
+- Bug fixes
+
+
+## [1.8.37] - 2026-03-31
+- Bug fixes
+
+
 ## [1.8.36] - 2026-03-30
 - Bug fixes
 

{batplot-1.8.36 → batplot-1.8.38}/batplot/interactive.py

@@ -91,10 +91,12 @@ class _FilterIMKWarning:
         self.original_stderr.flush()
 
 
-def _safe_input(prompt: str = "") -> str:
+def _safe_input(prompt: str = "", *, cancel_on_interrupt: bool = True) -> str:
     """Wrapper around input() that suppresses macOS IMKCFRunLoopWakeUpReliable warnings.
-    
-    This is a harmless macOS system message that appears when using input() in terminals.
+
+    On **Ctrl+C** (or EOF on stdin), returns ``""`` by default so prompts behave like cancel
+    and the interactive menu keeps running instead of exiting with a traceback.
+    Set ``cancel_on_interrupt=False`` to re-raise (e.g. tests).
     """
     # Filter stderr to hide macOS IMK warnings while preserving other errors
     original_stderr = sys.stderr
@@ -102,7 +104,21 @@ def _safe_input(prompt: str = "") -> str:
     try:
         result = input(prompt)
         return result
-    except (KeyboardInterrupt, EOFError):
+    except KeyboardInterrupt:
+        if cancel_on_interrupt:
+            try:
+                print()
+            except Exception:
+                pass
+            return ""
+        raise
+    except EOFError:
+        if cancel_on_interrupt:
+            try:
+                print()
+            except Exception:
+                pass
+            return ""
         raise
     finally:
         sys.stderr = original_stderr

{batplot-1.8.36 → batplot-1.8.38/batplot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: batplot
-Version: 1.8.36
+Version: 1.8.38
 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.8.36 → batplot-1.8.38}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "batplot"
-version = "1.8.36"
+version = "1.8.38"
 description = "Interactive plotting tool for material science (1D plot) and electrochemistry (GC, CV, dQ/dV, CPC, operando) with batch processing"
 authors = [
     { name = "Tian Dai", email = "tianda@uio.no" }