batplot 1.8.36__tar.gz → 1.8.37__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {batplot-1.8.36/batplot.egg-info → batplot-1.8.37}/PKG-INFO +1 -1
- {batplot-1.8.36 → batplot-1.8.37}/batplot/__init__.py +1 -1
- {batplot-1.8.36 → batplot-1.8.37}/batplot/batch.py +4 -1
- {batplot-1.8.36 → batplot-1.8.37}/batplot/batplot.py +7 -2
- {batplot-1.8.36 → batplot-1.8.37}/batplot/data/CHANGELOG.md +4 -0
- {batplot-1.8.36 → batplot-1.8.37/batplot.egg-info}/PKG-INFO +1 -1
- {batplot-1.8.36 → batplot-1.8.37}/pyproject.toml +1 -1
- {batplot-1.8.36 → batplot-1.8.37}/LICENSE +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/MANIFEST.in +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/NOTICE +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/README.md +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/args.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/canvas_interactive.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/cif.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/cli.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/color_utils.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/config.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/converters.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/cpc_interactive.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/data/USER_MANUAL.md +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/dev_upgrade.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/electrochem_interactive.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/interactive.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/manual.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/modes.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/operando.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/operando_ec_interactive.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/plotting.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/readers.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/session.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/showcol.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/style.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/ui.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/utils.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot/version_check.py +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot.egg-info/SOURCES.txt +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot.egg-info/dependency_links.txt +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot.egg-info/entry_points.txt +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot.egg-info/requires.txt +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/batplot.egg-info/top_level.txt +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/setup.cfg +0 -0
- {batplot-1.8.36 → batplot-1.8.37}/setup.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: batplot
|
|
3
|
-
Version: 1.8.
|
|
3
|
+
Version: 1.8.37
|
|
4
4
|
Summary: Interactive plotting tool for material science (1D plot) and electrochemistry (GC, CV, dQ/dV, CPC, operando) with batch processing
|
|
5
5
|
Author-email: Tian Dai <tianda@uio.no>
|
|
6
6
|
License: MIT License
|
|
@@ -703,8 +703,11 @@ def batch_process(directory: str, args):
|
|
|
703
703
|
if ext and ext not in args._batch_warned_extensions and ext not in known_axis_ext:
|
|
704
704
|
args._batch_warned_extensions.add(ext)
|
|
705
705
|
print(f" Note: Reading '{ext}' files as 2-column (x, y) data with x-axis = {args.xaxis}")
|
|
706
|
+
elif getattr(args, 'wl', None) is not None:
|
|
707
|
+
# .txt / generic text: --wl implies XRD Q conversion (matches main batplot.py)
|
|
708
|
+
axis_mode = 'Q'
|
|
706
709
|
else:
|
|
707
|
-
raise ValueError(f"Unknown file type: {fname}. Use --xaxis [Q|2theta|r|k|energy|rft] or batplot --help for help.")
|
|
710
|
+
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.")
|
|
708
711
|
|
|
709
712
|
# Convert to Q if needed
|
|
710
713
|
if axis_mode == 'Q' and ext not in ('.qye', '.gr', '.nor'):
|
|
@@ -3733,12 +3733,17 @@ def batplot_main() -> int: # type: ignore
|
|
|
3733
3733
|
elif any_chir:
|
|
3734
3734
|
axis_mode = "rft"
|
|
3735
3735
|
elif any_txt:
|
|
3736
|
-
# .txt is generic
|
|
3736
|
+
# .txt is generic: need --xaxis unless XRD context is clear from --wl or file:wl (same as .xy without ext hint).
|
|
3737
3737
|
if args.xaxis:
|
|
3738
3738
|
# Normalize case: 'q' or 'Q' → 'Q' (uppercase), everything else lowercase
|
|
3739
3739
|
axis_mode = "Q" if args.xaxis.upper() == "Q" else args.xaxis.lower()
|
|
3740
|
+
elif getattr(args, 'wl', None) is not None or any_lambda:
|
|
3741
|
+
axis_mode = "Q"
|
|
3740
3742
|
else:
|
|
3741
|
-
raise ValueError(
|
|
3743
|
+
raise ValueError(
|
|
3744
|
+
"Unknown file type for .txt. Add --xaxis [Q|2theta|r|k|energy|rft], or use --wl for XRD Q conversion, "
|
|
3745
|
+
"or batplot --help."
|
|
3746
|
+
)
|
|
3742
3747
|
elif any_lambda or any_cif or any_xrd_vendor:
|
|
3743
3748
|
# XRD vendor formats (.raw, .brml, .xrdml, .rasx) are 2theta; CIF is Q; file:wl implies Q domain
|
|
3744
3749
|
if args.xaxis and args.xaxis.lower() in ("2theta","two_theta","tth"):
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: batplot
|
|
3
|
-
Version: 1.8.
|
|
3
|
+
Version: 1.8.37
|
|
4
4
|
Summary: Interactive plotting tool for material science (1D plot) and electrochemistry (GC, CV, dQ/dV, CPC, operando) with batch processing
|
|
5
5
|
Author-email: Tian Dai <tianda@uio.no>
|
|
6
6
|
License: MIT License
|
|
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "batplot"
|
|
7
|
-
version = "1.8.
|
|
7
|
+
version = "1.8.37"
|
|
8
8
|
description = "Interactive plotting tool for material science (1D plot) and electrochemistry (GC, CV, dQ/dV, CPC, operando) with batch processing"
|
|
9
9
|
authors = [
|
|
10
10
|
{ name = "Tian Dai", email = "tianda@uio.no" }
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|