Merge remote-tracking branch 'origin/refactor/parallel-and-dedup' into main

Browse Source

Its only unmerged commit, "pre merge cleanup" (1a81871), branched off
refactor/parallel-and-dedup after PR #1 (b0bfe6e) had already merged that
branch into main and was never rebased onto main's later work. Every change
it made was independently reimplemented, more completely, by main's own
subsequent commits:

  - FFT pad-factor caching + the stored-cache display fast path
    (cached_rf_image, precomputed_pad_factor, _stored_fft_image,
    _stored_dc_image, PAD_FACTOR_MAX) -> 8348ad3, refined by c30c8b1.
  - The FftOptionsDialog "stored cache unusable at this pad" warning
    -> also 8348ad3.
  - spin_angle redrawing on arrows/keyboard via setKeyboardTracking(False)
    + valueChanged, and the corresponding tests
    (test_stepping_the_angle_spinbox_redraws,
    test_typing_an_angle_does_not_compute_intermediate_angles) -> already
    on main before the refactor/parallel-and-dedup merge point.

A real 3-way merge of 1a81871 confirmed this: it produced no conflicts in
sras_format.py/sras_compute.py only because both sides independently wrote
equivalent code, and silently duplicated a method definition
(_stored_fft_image) in sras_viewer/main_window.py where the two
implementations diverged textually. Recording this as a merge with main's
tree kept (-s ours) marks the branch as fully incorporated without
reintroducing its now-superseded, lower cache-version (CACH_VERSION 2 vs
main's 3, missing row-averaged-FFT support) implementation.

...

This commit is contained in:

Thomas Ales [M S E]

2026-08-10 19:01:21 -05:00

parent aca501ae5c 1a8187138f

commit ec0d322871

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available