qplotter 1.6.1__tar.gz → 1.6.2__tar.gz

{qplotter-1.6.1 → qplotter-1.6.2}/CHANGELOG.md

@@ -2,6 +2,45 @@
 
 All notable user-facing changes are recorded here.
 
+## 1.6.2 — Unreleased
+
+This bugfix release improves measurement correctness, live viewing and plot
+lifecycle reliability. The native dependency remains `qplotter-native==1.0.1`.
+
+### Fixed
+
+- Load inferred QCoDeS parameters and missing ancillary array cells, preserving
+  recorded samples across previews, plotting, incremental refresh and raw CSV.
+- Handle singleton and empty array acquisitions consistently, including planned
+  scan shapes, and check expanded memory requirements before allocating them.
+- Preserve extended floating-point and integer precision in derivatives, FFTs,
+  clipping, centering, statistics, heatmaps, previews and CSV exports.
+  Honor finite clipping bounds on float16/float32 measurement arrays.
+- Preserve axis meaning and source ownership during mixed-plot promotion,
+  cut refresh and drag-and-drop; refresh retained sources while paused and
+  cancel pending work when its target window closes.
+- Avoid Qt callback errors when reassigning axes on a clipped trace, and clear
+  obsolete omission warnings when live metadata becomes available again.
+- Honor accepted reader cancellation and delayed helper cancellation without
+  publishing stale results or unnecessarily retiring healthy readers.
+- Refresh live-reader schema descriptions when QCoDeS adds metadata, so newly
+  acquired runs expose their current columns without missing data or query errors.
+- Protect measurement files from diagnostic-log reuse and synthetic generation
+  side effects; report malformed generator inputs and profiling failures cleanly.
+  Retire benchmark plot windows before Qt application teardown.
+- Allow qPlot to start when the diagnostic log path contains a symlink loop.
+
+### Compatibility and validation
+
+- Standard QCoDeS main-database storage remains supported. Runs using the
+  optional separate-per-dataset storage backend are refused before opening
+  their measurement files, since safe multi-file live viewing is not implemented.
+- Main databases, WAL files and rollback journals remain physically read-only.
+  Only the pinned native reader may modify the exact colocated SHM file.
+- Add regression coverage and independently reviewed fixes documented in
+  `BUG_HUNT.md`. No legacy settings migrations are introduced. This draft does
+  not publish a release.
+
 ## 1.6.1
 
 This patch release improves live acquisition viewing and release validation.

{qplotter-1.6.1 → qplotter-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qplotter
-Version: 1.6.1
+Version: 1.6.2
 Summary: PyQt-based viewer for completed and running QCoDeS database experiments
 Author-email: Ben Wordsworth <b.wordsworth@lancaster.ac.uk>, Edward Laird <e.a.laird@lancaster.ac.uk>
 License-Expression: MIT
@@ -84,6 +84,11 @@ selected run's plain detail view without copying the database. Main-database,
 WAL, and rollback-journal handles remain read-only; SQLite may update only the
 exact colocated `-shm` file as transient WAL coordination state.
 
+Measurement viewing supports QCoDeS's standard `sqlite_main_db` storage backend.
+Runs using the optional `sqlite_per_dataset_db` backend can appear in the run
+list, but their measurement actions are refused before opening the separate
+raw-data files. Safe multi-file live viewing is not yet implemented.
+
 Normal `qplot`, `python -m qplot`, and `qplot.run()` launches put the complete
 qPlot process tree behind a shutdown boundary before Qt or reader helpers can
 start. The command-line process is the launcher. A public `qplot.run()` call
@@ -152,7 +157,7 @@ source builds, and release validation.
 ## Install
 
 Install qPlot inside a supported Python virtual environment. This checkout
-prepares the stable application release `1.6.1`, with native `1.0.1`.
+prepares the stable application release `1.6.2`, with native `1.0.1`.
 The installation examples below work after publication; until then, use
 validated local artifacts as described in [Distribution](docs/distribution.md).
 
@@ -183,9 +188,9 @@ For ordinary installation after a stable PyPI release is available:
 python -m pip install --only-binary=:all: qplotter
 ```
 
-To select version 1.6.1 explicitly after publication:
+To select version 1.6.2 explicitly after publication:
 ```console
-python -m pip install --only-binary=:all: qplotter==1.6.1
+python -m pip install --only-binary=:all: qplotter==1.6.2
 ```
 
 Both commands install the full runtime dependency set as wheels, with no C
@@ -207,7 +212,7 @@ installing the new packages:
 
 ```console
 python -m pip uninstall -y qplot qcodes-plotter qcodes-plotter-native qplotter qplotter-native
-python -m pip install --only-binary=:all: qplotter==1.6.1
+python -m pip install --only-binary=:all: qplotter==1.6.2
 python -m pip check
 ```
 

{qplotter-1.6.1 → qplotter-1.6.2}/README.md

@@ -39,6 +39,11 @@ selected run's plain detail view without copying the database. Main-database,
 WAL, and rollback-journal handles remain read-only; SQLite may update only the
 exact colocated `-shm` file as transient WAL coordination state.
 
+Measurement viewing supports QCoDeS's standard `sqlite_main_db` storage backend.
+Runs using the optional `sqlite_per_dataset_db` backend can appear in the run
+list, but their measurement actions are refused before opening the separate
+raw-data files. Safe multi-file live viewing is not yet implemented.
+
 Normal `qplot`, `python -m qplot`, and `qplot.run()` launches put the complete
 qPlot process tree behind a shutdown boundary before Qt or reader helpers can
 start. The command-line process is the launcher. A public `qplot.run()` call
@@ -107,7 +112,7 @@ source builds, and release validation.
 ## Install
 
 Install qPlot inside a supported Python virtual environment. This checkout
-prepares the stable application release `1.6.1`, with native `1.0.1`.
+prepares the stable application release `1.6.2`, with native `1.0.1`.
 The installation examples below work after publication; until then, use
 validated local artifacts as described in [Distribution](docs/distribution.md).
 
@@ -138,9 +143,9 @@ For ordinary installation after a stable PyPI release is available:
 python -m pip install --only-binary=:all: qplotter
 ```
 
-To select version 1.6.1 explicitly after publication:
+To select version 1.6.2 explicitly after publication:
 ```console
-python -m pip install --only-binary=:all: qplotter==1.6.1
+python -m pip install --only-binary=:all: qplotter==1.6.2
 ```
 
 Both commands install the full runtime dependency set as wheels, with no C
@@ -162,7 +167,7 @@ installing the new packages:
 
 ```console
 python -m pip uninstall -y qplot qcodes-plotter qcodes-plotter-native qplotter qplotter-native
-python -m pip install --only-binary=:all: qplotter==1.6.1
+python -m pip install --only-binary=:all: qplotter==1.6.2
 python -m pip check
 ```
 

{qplotter-1.6.1 → qplotter-1.6.2}/docs/demo-data.md

@@ -65,6 +65,13 @@ database and each run, including elapsed times and whether generation completed,
 was cancelled, or failed. These appear alongside QCoDeS's existing
 `Starting experimental run with id:` messages.
 
+Generation requires QCoDeS's `dataset.raw_data_backend` to be `sqlite_main_db`,
+`dataset.export_automatic` to be false, and
+`subscription.default_subscribers` to be empty. Other settings are rejected
+before creating files because they can write outside the selected output.
+qPlot leaves these global settings unchanged and uses an empty private station
+so synthetic measurements do not read parameters from an acquisition station.
+
 Every nonblank CSV row creates one run, named `run_1`, `run_2`, and so on. A 1D
 row sweeps `V_SD`; a 2D row sweeps both `V_SD` and `V_G`. Each measured signal
 is the sum of two sinusoids with independently randomised amplitudes,

{qplotter-1.6.1 → qplotter-1.6.2}/docs/distribution.md

@@ -29,15 +29,15 @@ virtual environment with:
 python -m pip install --only-binary=:all: qplotter
 ```
 
-The current development target is the stable application release `1.6.1`,
+The current development target is the stable application release `1.6.2`,
 with exact native dependency `1.0.1`. Existing candidate tags do not establish
 that publication succeeded. Preparing a PR does not publish either package.
 
-The prepared stable application release is `1.6.1`, with exact native
+The prepared stable application release is `1.6.2`, with exact native
 dependency `1.0.1`. Once published, install that release explicitly:
 
 ```console
-python -m pip install --only-binary=:all: qplotter==1.6.1
+python -m pip install --only-binary=:all: qplotter==1.6.2
 ```
 
 The earlier `native-and-app/v1.6.0b2` candidate did not pass its complete hosted
@@ -59,7 +59,7 @@ wheel paths from this revision's validated artifacts together. For example,
 on Windows x64 (replace the application version when appropriate):
 
 ```console
-python -m pip install --only-binary=:all: dist/qplotter_native-1.0.1-cp311-abi3-win_amd64.whl dist/qplotter-1.6.1-py3-none-any.whl
+python -m pip install --only-binary=:all: dist/qplotter_native-1.0.1-cp311-abi3-win_amd64.whl dist/qplotter-1.6.2-py3-none-any.whl
 ```
 
 Use your platform's native filename on macOS/Linux. Never mix artifacts from
@@ -91,7 +91,7 @@ application names before installing the replacement:
 
 ```console
 python -m pip uninstall -y qplot qcodes-plotter qcodes-plotter-native qplotter qplotter-native
-python -m pip install --only-binary=:all: qplotter==1.6.1
+python -m pip install --only-binary=:all: qplotter==1.6.2
 python -m pip check
 python -c "from importlib.metadata import packages_distributions; p = packages_distributions(); assert set(p['qplot']) == {'qplotter'}; assert set(p['qplot_native']) == {'qplotter-native'}"
 ```
@@ -399,8 +399,8 @@ application version from `pyproject.toml`:
 
 | Tag | Native handling | PyPI uploads |
 | --- | --- | --- |
-| `native-and-app/v1.6.1` | Build/validate native `1.0.1` at this revision, if unpublished | Native wheels first, then application wheel/sdist |
-| `v1.6.1` | Fetch/validate the application's exact published native pin | Application wheel/sdist only |
+| `native-and-app/v1.6.2` | Build/validate native `1.0.1` at this revision, if unpublished | Native wheels first, then application wheel/sdist |
+| `v1.6.2` | Fetch/validate the application's exact published native pin | Application wheel/sdist only |
 
 The workflow calls the entire CI workflow at the tagged revision. Failure of
 any build, static check, source-distribution suite, database-protection suite,
@@ -432,7 +432,7 @@ After application publication and byte verification, `public-installations`
 runs on all four platforms and every advertised CPython version (3.11–3.14).
 Each entry creates two fresh environments outside the original checkout.
 The ordinary path runs `python -m pip install --only-binary=:all:
-qplotter==1.6.1` against the public PyPI index with all runtime dependencies.
+qplotter==1.6.2` against the public PyPI index with all runtime dependencies.
 The editable path fetches the exact tested commit into a fresh checkout and
 installs `.[dev]` with `qplotter-native==1.0.1` resolved from public PyPI.
 Neither path installs a local release wheel; the validated artifacts are only
@@ -491,13 +491,14 @@ and [pending-publisher instructions](https://docs.pypi.org/trusted-publishers/cr
    release version before tagging; never move a published tag. If migrating
    from token publishing, revoke/remove the old upload tokens/secrets.
 
-### Paired release commands
+### Application 1.6.2 release commands
 
-Version 1.6.1 includes native-reader changes, so release native 1.0.1 with
-the paired tag below. Keep the already published native 1.0.0 unchanged.
+Version 1.6.2 contains Python-only changes and retains the published native
+1.0.1 dependency. Use the application-only tag below; published native files
+remain unchanged.
 
 Complete the account setup and merge the reviewed packaging/release changes
-to `main`. With application `1.6.1` and native `1.0.1`, use the configured
+to `main`. With application `1.6.2` and native `1.0.1`, use the configured
 Git remote/credentials:
 
 ```console
@@ -505,22 +506,22 @@ git fetch origin
 git switch main
 git pull --ff-only origin main
 python scripts/validate_distribution.py --check-clean
-git tag -a native-and-app/v1.6.1 -m "qPlot 1.6.1 with native reader 1.0.1"
-git push origin refs/tags/native-and-app/v1.6.1
+git tag -a v1.6.2 -m "qPlot 1.6.2"
+git push origin refs/tags/v1.6.2
 ```
 
 Use the activated project venv for Python; on macOS set
 `MPLCONFIGDIR=/private/tmp/qplot-matplotlib-cache` for Python commands that may
 import Matplotlib. The tag push is the publication trigger. Review its hosted
-CI results, then approve the `pypi-native` environment. Confirm native
-verification succeeds before approving `pypi-application`. The final PyPI
+CI results and confirm verification of the published native dependency
+succeeds before approving `pypi-application`. No native publication is needed. The final PyPI
 verification and all `public-installations` jobs must succeed before announcing the release. No GitHub Release
 object is needed to trigger publication; use the connected GitHub app for any
 subsequent release/PR operations if supported, never `gh`.
 
 ### Later Python-only releases
 
-Update the application version (for example to `1.6.0b4`) and changelog, keep
+Update the application version (for example to `1.6.3`) and changelog, keep
 the exact native/APSW pins when still compatible, and merge the changes. Do
 not change native sources/ABI under an existing native version. Then:
 
@@ -529,8 +530,8 @@ git fetch origin
 git switch main
 git pull --ff-only origin main
 python scripts/validate_distribution.py --check-clean
-git tag -a v1.6.0b4 -m "qPlot 1.6.0b4"
-git push origin refs/tags/v1.6.0b4
+git tag -a v1.6.3 -m "qPlot 1.6.3"
+git push origin refs/tags/v1.6.3
 ```
 
 The native release must already contain all four non-yanked compatible wheels.

{qplotter-1.6.1 → qplotter-1.6.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qplotter"
-version = "1.6.1"
+version = "1.6.2"
 description = "PyQt-based viewer for completed and running QCoDeS database experiments"
 readme = "README.md"
 authors = [{name="Ben Wordsworth", email="b.wordsworth@lancaster.ac.uk"},{name="Edward Laird", email="e.a.laird@lancaster.ac.uk"}]

{qplotter-1.6.1 → qplotter-1.6.2}/scripts/benchmark_plot_launch.py

@@ -27,7 +27,7 @@ def main():
     parser.add_argument("--preceding-stage", choices=("any", "aggregate", "large-summary"), default="any")
     args = parser.parse_args()
 
-    from PyQt6 import QtCore, QtWidgets
+    from PyQt6 import QtCore, QtWidgets, sip
 
     from qplot.configuration.config import config
     from qplot.datahandling import readonly, trusted_heatmap, trusted_plot
@@ -36,6 +36,7 @@ def main():
         _BrokerQueryExecutor,
     )
     from qplot.windows._plot_feedback import PlotWindowFeedbackMixin
+    from qplot.windows._plotWin import plotWidget
     from qplot.windows.main import MainWindow
 
     def source_state():
@@ -143,7 +144,7 @@ def main():
         config.default_file = str(Path(directory) / config.config_file_name)
         window = MainWindow()
         window.show_error = lambda *items: errors.append(items)
-        observer = PaintTimes()
+        observer = PaintTimes(window)
         try:
             window.startupDatabaseTimer.stop()
             window.config.config["user_preference"]["confirm_close"] = False
@@ -208,7 +209,9 @@ def main():
                     "iteration": iteration + 1,
                     "display_ms": (time.perf_counter() - started) * 1000,
                     "paint_ms": [(value - started) * 1000 for value in painted.values()],
-                    "grids": [list(plot.dataGrid.shape) for plot in plots],
+                    "grids": [list(plot.dataGrid.shape) for plot in plots if hasattr(plot, "dataGrid")],
+                    "line_samples": [int(plot.axis_data["y"].size) for plot in plots
+                                     if not hasattr(plot, "dataGrid")],
                     "capture": list(timings),
                     "broker_queries": [{"run_id": run, "phase": phase, **record}
                                        for (run, phase), record in list(phase_times.items())],
@@ -220,13 +223,23 @@ def main():
                 window.close_plot_windows(confirm=False, status=False)
                 wait_for(lambda: not window._plot_workers)
         finally:
-            window.close_plot_windows(confirm=False, status=False)
-            window._cancel_plot_work()
-            window.threadPool.waitForDone(10_000)
-            window.close_database(status=False)
-            window.hide()
-            wait_for(lambda: not window._retired_trusted_read_services,
-                     timeout=20, check_errors=False)
+            # Use the application's bounded shutdown for every worker pool,
+            # preview and broker, including a failed measurement iteration.
+            window.close()
+            wait_for(lambda: window._shutdown_ready, timeout=20, check_errors=False)
+            if window._shutdown_background_work_active():
+                raise RuntimeError("Plot benchmark background work did not stop")
+            # Closed plots are still top-level widgets held by iteration
+            # locals and the paint records. Retire their native ownership
+            # before QApplication's unordered sweep of Python Qt wrappers.
+            # Leave child menus and embedded widgets to their Qt owners.
+            for widget in app.topLevelWidgets():
+                if isinstance(widget, plotWidget) and not sip.isdeleted(widget):
+                    sip.delete(widget)
+            window.deleteLater()
+            app.sendPostedEvents(None, QtCore.QEvent.Type.DeferredDelete)
+            app.processEvents()
+            sip.delete(app)
     after = source_state()
     print(json.dumps({"database_bytes": args.database.stat().st_size,
                       "database_open_ms": open_ms, "run_id": args.run_id,

{qplotter-1.6.1 → qplotter-1.6.2}/scripts/profile_trusted_reads.py

@@ -6,6 +6,8 @@ import json
 import time
 from pathlib import Path
 
+from qcodes.dataset.descriptions.versioning.serialization import from_json_to_current
+
 from qplot.datahandling.trusted_live import TrustedLiveReader
 from qplot.datahandling.trusted_plot import identifier
 
@@ -38,12 +40,19 @@ def main():
     results = []
     reader_type = FullPathReader if args.full_path_checks else TrustedLiveReader
     with reader_type.open(args.database) as reader:
-        table, = reader.query("SELECT result_table_name FROM runs WHERE run_id=?",
-                              (args.run_id,)).rows[0]
+        table, description = reader.query(
+            "SELECT result_table_name, run_description FROM runs WHERE run_id=?",
+            (args.run_id,),
+        ).rows[0]
         table = identifier(table)
         columns = reader.query(f"SELECT * FROM {table} WHERE 0").columns
-        numeric = [identifier(name) for name in columns if name != "id"]
-        # Read all numeric fields, with only a small aggregate crossing the
+        types = {spec.name: spec.type for spec in from_json_to_current(description).interdeps.paramspecs}
+        numeric_parameters = [name for name in columns if types.get(name) == "numeric"]
+        if not numeric_parameters:
+            parser.error(f"Run {args.run_id} has no scalar numeric parameters to profile")
+        numeric = [identifier(name) for name in numeric_parameters]
+        # Array/complex/text values are outside this numeric profiler's scope.
+        # Read declared numeric fields, with only a small aggregate crossing the
         # helper boundary. Match the plot's finite primary-key intervals.
         expressions = ", ".join(f"MIN({name}), MAX({name})" for name in numeric)
         for repeat in range(args.repeats):
@@ -69,6 +78,7 @@ def main():
     if before != after:
         raise AssertionError("Protected source file sizes/timestamps changed")
     print(json.dumps({"run_id": args.run_id, "pages": args.pages, "results": results,
+                      "numeric_parameters": numeric_parameters,
                       "full_path_checks": args.full_path_checks,
                       "protected_file_stats_unchanged": True}, indent=2))
 

qplotter-1.6.2/src/qplot/_build_info.json

@@ -0,0 +1 @@
+{"version": "1.6.2", "commit": "4a0baf68be2b005e25ba802d2fc166a4da38d418", "dirty": false, "released": true}

{qplotter-1.6.1 → qplotter-1.6.2}/src/qplot/_metadata.py

@@ -1,6 +1,7 @@
 import json
 import re
 import subprocess
+import time
 import tomllib
 from importlib.metadata import PackageNotFoundError, distribution, version
 from pathlib import Path
@@ -17,11 +18,14 @@ def package_version():
         return "0+unknown"
 
 
-def _git(root: Path, *arguments: str) -> str:
+def _git(root: Path, *arguments: str, deadline: float) -> str:
     """Read bounded local Git metadata without refreshing the index."""
+    timeout = deadline - time.monotonic()
+    if timeout <= 0:
+        raise subprocess.TimeoutExpired("git", timeout=0)
     return subprocess.run(
         ["git", "--no-optional-locks", "-C", str(root), *arguments],
-        capture_output=True, text=True, check=True, timeout=1,
+        capture_output=True, text=True, check=True, timeout=timeout,
     ).stdout.strip()
 
 
@@ -35,9 +39,14 @@ def checkout_info(root: Path) -> dict:
         if project["name"] != "qplotter":
             return {}
         info = {"version": project["version"], "checkout": True}
-        commit = _git(root, "rev-parse", "HEAD")
-        dirty = bool(_git(root, "status", "--porcelain", "--untracked-files=normal"))
-        tags = _git(root, "tag", "--points-at", "HEAD").splitlines()
+        # Cold Git startup can exceed one second on Windows. Share one budget
+        # across all three reads so startup and About remain bounded.
+        deadline = time.monotonic() + 5
+        commit = _git(root, "rev-parse", "HEAD", deadline=deadline)
+        dirty = bool(_git(
+            root, "status", "--porcelain", "--untracked-files=normal", deadline=deadline,
+        ))
+        tags = _git(root, "tag", "--points-at", "HEAD", deadline=deadline).splitlines()
         release_tags = {f"v{project['version']}", f"native-and-app/v{project['version']}"}
         info.update(commit=commit, dirty=dirty, released=bool(release_tags.intersection(tags)) and not dirty)
         return info

{qplotter-1.6.1 → qplotter-1.6.2}/src/qplot/configuration/config_schema.json

@@ -106,6 +106,11 @@
         "user_preference": {
             "type": "object",
             "properties": {
+                "csv_filename_format": {
+                    "type": "string",
+                    "enum": ["current", "qcodes"],
+                    "default": "current"
+                },
                 "show_source_annotation": {
                     "type": "boolean",
                     "default": true
@@ -132,7 +137,7 @@
                     "type": "integer",
                     "minimum": 1,
                     "maximum": 10,
-                    "default": 2
+                    "default": 3
                 },
                 "theme":{
                     "type": "string",
@@ -302,6 +307,7 @@
                 "confirm_incompatible_axes",
                 "mouse_mode",
                 "copy_plot_image_resolution",
+                "csv_filename_format",
                 "auto_plot",
                 "default_refresh_rate"
             ],

{qplotter-1.6.1 → qplotter-1.6.2}/src/qplot/datahandling/LoadFromDB.py

@@ -68,6 +68,14 @@ def append_shaped_parameter_data_to_existing_arrays(
 
     new_data_1_tree = new_data.get(meas_parameter, {})
 
+    if new_data_1_tree and not new_data_1_tree[meas_parameter].size:
+        # QCoDeS skips an empty column independently when merging unshaped
+        # caches. Empty array outputs can retain singleton setpoints, which
+        # would then be appended without their measurement and misalign the
+        # next refresh. Validate those records and retain zero samples in
+        # every field; the separate read status still counts acquired rows.
+        new_data_1_tree = flatten_record_columns(new_data_1_tree, check_cancelled)
+
     shapes = rundescriber.shapes
     if shapes is not None:
         shape = shapes.get(meas_parameter, None)
@@ -82,7 +90,8 @@ def append_shaped_parameter_data_to_existing_arrays(
         # Object cells count records; shaped cache offsets count samples.
         # Flatten only the new records so QCoDeS' usual padding and offsets
         # still apply, including the same missing-value handling.
-        if any(values.dtype.kind == "O" for values in new_data_1_tree.values()):
+        if (any(values.dtype.kind == "O" for values in new_data_1_tree.values())
+                or len({values.shape for values in new_data_1_tree.values()}) > 1):
             new_data_1_tree = flatten_record_columns(new_data_1_tree, check_cancelled)
         private_data = {}
         for name, values in existing_data_1_tree.items():
@@ -191,6 +200,7 @@ def load_param_data_from_db(
     end: int | None = None,
     *,
     check_cancelled=_check_noop,
+    max_decode_bytes=None,
 ):
     # Data fetch
     updated_read_status: dict[str, int] = dict(read_status)
@@ -205,6 +215,9 @@ def load_param_data_from_db(
         start=start,
         end=end,
         check_cancelled=check_cancelled,
+        max_decode_bytes=max_decode_bytes,
+        existing_data=existing_data.get(meas_parameter, {}),
+        written_count=write_status.get(meas_parameter),
     )
     new_data_dict[meas_parameter] = new_data
     updated_read_status[meas_parameter] = start + n_rows_read - 1

{qplotter-1.6.1 → qplotter-1.6.2}/src/qplot/datahandling/_trusted_live_helper.py

@@ -193,15 +193,19 @@ def _control_loop(control_receive: Connection, state: _ChildControlState) -> Non
                     _interrupt_active_locked(state)
                     continue
                 if (
-                    state.last_completed_generation == envelope.generation
+                    state.last_completed_generation is not None
+                    and envelope.generation <= state.last_completed_generation
                     and cancellation_is_new
                 ):
                     # The operation may finish after the parent decides to
                     # cancel but before this control thread receives that
                     # exact-generation frame.  It may even arrive after the
-                    # following operation starts because commands and control
-                    # use separate pipes.  Accept it once as a no-op; never
-                    # interrupt the newer generation.
+                    # following operations finish because commands and control
+                    # use separate pipes. Commands are contiguous, and the
+                    # cancellation high watermark starts at this incarnation's
+                    # first generation minus one. Thus this is a completed job
+                    # owned by this helper. Accept it once as a no-op; never
+                    # interrupt a newer generation.
                     state.last_cancelled_generation = envelope.generation
                     continue
                 if (
@@ -434,6 +438,7 @@ def trusted_live_helper_main(
         session,
         orphan_grace_ms / 1_000.0,
         first_generation,
+        last_cancelled_generation=first_generation - 1,
     )
     reader: TrustedLiveReader | None = None
     control_thread = threading.Thread(