Thomas Ales
52fdcdd9f3
A mis-triggered row cannot be written as it arrived — v6 declares n_frames per row in the header and has no per-row length field, so a short or long row would shift every later row in the file. Until now the only policy was to square it up, which keeps the scan running but leaves the affected row indistinguishable from a good one afterwards: nothing in the file records that it was padded. strict_rows selects the other trade. On any frame-count mismatch the scan stops instead of writing the row, so a data run either produces rows that mean what the header says they mean or fails loudly. Default stays pad, so existing behaviour is unchanged. _warn_frame_delta becomes _check_frame_delta, since it now decides rather than just reports. Both acquisition paths already call it before writing anything for the row (CH1 leads SCAN_CHANNELS, and the burst path checks every row up front), so an abort leaves the file on a whole-row boundary rather than a half-written row — test_strict_row_packing_writes_nothing_for_the_failed_row pins that. Plumbed through QtScanController to a checkbox in the scan panel, persisted in ScanDefaults alongside burst_mode. scan_format.md documents both policies and notes that the choice is not recorded in the file. The row-clipping setup in the padding test is now a _clip_one_row helper, reused by the strict tests. 92 tests passing, ruff clean. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
50 lines
1.7 KiB
Python
50 lines
1.7 KiB
Python
"""Persisted user defaults (ports, scope IP, save directory).
|
|
|
|
One flat JSON file, one dataclass. ``save()`` always writes every field, so
|
|
a partial UI update can never silently drop another field's saved value
|
|
(which is exactly what the old dict-based writer did to helios_port).
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import logging
|
|
from dataclasses import asdict, dataclass, fields
|
|
from pathlib import Path
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
DEFAULTS_PATH = Path(__file__).resolve().parent.parent / "aui_defaults.json"
|
|
|
|
|
|
@dataclass
|
|
class ScanDefaults:
|
|
t3r_port: str = "/dev/ttyUSB0"
|
|
bbd_port: str = "/dev/ttyUSB1"
|
|
oscope_ip: str = "192.168.0.1"
|
|
save_dir: str = str(DEFAULTS_PATH.parent / "scans")
|
|
helios_port: str = "/dev/ttyUSB2"
|
|
burst_mode: bool = False
|
|
strict_rows: bool = False
|
|
|
|
@classmethod
|
|
def load(cls, path: Path = DEFAULTS_PATH) -> "ScanDefaults":
|
|
"""Load defaults, tolerating a missing/corrupt file and unknown keys."""
|
|
if path.exists():
|
|
try:
|
|
with open(path) as f:
|
|
data = json.load(f)
|
|
known = {f.name for f in fields(cls)}
|
|
return cls(**{k: v for k, v in data.items() if k in known})
|
|
except (OSError, ValueError, TypeError) as e:
|
|
logger.warning("Could not load %s (%s); using fallback defaults", path, e)
|
|
inst = cls()
|
|
inst.save(path)
|
|
return inst
|
|
|
|
def save(self, path: Path = DEFAULTS_PATH) -> None:
|
|
try:
|
|
with open(path, "w") as f:
|
|
json.dump(asdict(self), f, indent=2)
|
|
except OSError as e:
|
|
logger.warning("Could not save defaults to %s: %s", path, e)
|