GUI: dynamic signals, sample tools, fast shutter row #144

Merged

duan_j merged 23 commits from feat/gui-dynamic-signals-and-sample-tools into main 2026-08-17 18:19:23 +02:00

Conversation 1 Commits 23 Files Changed 24

+656 -162

duan_j commented 2026-08-17 14:52:36 +02:00

Owner

Copy Link

Copy Source

Summary

• Replace Qt method overrides with native mechanisms; install app-level event filters once, after their targets exist
• Sample table: Unmeasured filter chip, Unflag context-menu action, click-the-# header to select all rows, sample count columns ordered by workflow (crossed wiring fixed), measured threshold now rotation count >= 1
• Beamline setup panel: live energy/wavelength readout; new fast shutter row (status flag left, Open/Close buttons right) using the same display scheme and DAQ slots as the status bar flag, staff-gated
• Status bar: ExpHutch shutter placed left of the fast shutter to match beam-path order
• Busy overlay title wave animation; pending transition target breathes in the state strip
• Help badge centered at top with right-aligned More link; expanded overlay opens under the badge

Test plan

• Unit tests cover the changed lines, including the new fast shutter row (placeholder, both states, both button signals)
• CI pytest runs with -s -vv

Generated with Claude Code

## Summary - Replace Qt method overrides with native mechanisms; install app-level event filters once, after their targets exist - Sample table: Unmeasured filter chip, Unflag context-menu action, click-the-# header to select all rows, sample count columns ordered by workflow (crossed wiring fixed), measured threshold now rotation count >= 1 - Beamline setup panel: live energy/wavelength readout; new fast shutter row (status flag left, Open/Close buttons right) using the same display scheme and DAQ slots as the status bar flag, staff-gated - Status bar: ExpHutch shutter placed left of the fast shutter to match beam-path order - Busy overlay title wave animation; pending transition target breathes in the state strip - Help badge centered at top with right-aligned More link; expanded overlay opens under the badge ## Test plan - Unit tests cover the changed lines, including the new fast shutter row (placeholder, both states, both button signals) - CI pytest runs with -s -vv Generated with [Claude Code](https://claude.com/claude-code)

gitea-actions bot commented 2026-08-17 14:55:49 +02:00

Copy Link

Copy Source

Coverage report (automated)

Total line + branch coverage: 49%
Diff coverage vs main: 89% (minimum 80%)

Full report: coverage artifact on this run.

Coverage report (automated) Total line + branch coverage: 49% Diff coverage vs main: 89% (minimum 80%) Full report: coverage artifact on this run.

duan_j added 16 commits 2026-08-17 15:34:59 +02:00

refactor: replace Qt overrides with native mechanisms, install app filters once ... c24da7739b

Per-window installs of the two QApplication-level filters (cursor,
wheel guard) stacked one stale copy per MainWindow; now installed once
per process, parented to the app. closeEvent overrides in the baton
dialogs replaced by finished.connect(timer.stop); keyPressEvent in
VideoGraphicsView replaced by WidgetShortcut QShortcuts; hover
enter/leave overrides in PlayPauseButton replaced by underMouse();
ValueLabel inherits ClickableLabel instead of duplicating its
mousePressEvent. Dead raster-timer branch and a PyQt5-era
event-position fallback deleted; redundant try/except and getattr
guards dropped now that class-level defaults cover pre-init reads.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

feat: breathe the pending transition target in the state strip ... fbd40eee90

While Moving, the target state sat solid blue and read as already
reached. An opacity pulse (QGraphicsOpacityEffect + QPropertyAnimation)
marks it as in progress; a stylesheet animation would repolish the
button every frame, which the guarded updates in _apply_highlight
exist to avoid.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

feat: wave-animate the busy overlay titles ... 80063a5df1

BEAMLINE BUSY and the robot warnings now hop per letter (clipped sine)
so they read as an in-progress signal, not a frozen label. Gated by a
new BusyOverlayStyle.animate flag: 'In viewing mode' stays static
because it is a passive notice. No timer - the phase rides the wall
clock and repaints ride the ~20 fps camera frames, so the wave freezes
with a stalled feed (which has its own error surface).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

fix: order sample count columns by workflow, unwire crossed columns ... f303f29214

Both bottom-dock tables now list mount -> raster -> screening ->
rotation, the order the work actually happens in. In the Auxiliary
table the swap also fixes a real bug: data() feeds get_entry
header-index-minus-1, but rotation/raster were crossed against the
header, so 'Raster count' displayed rotation counts and vice versa.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

feat: add Unmeasured filter chip to the sample table ... 4175cb8edf

Complement of Measured (rotation count <= 1): one click shows
everything still to be done, so it can be selected wholesale and
queued. Plain chip like All - unmeasured rows carry no tint, so
there is no legend color to wear; cross-status marks (queued/
flagged) show like in the Measured view.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

feat: add Unflag to the sample table context menu ... 900bc2f6f7

Below Mount/Unmount, acting on the selection like the queue actions.
Flagging happens by dropping rows on the Flagged chip; until now
there was no way back. Disabled when nothing in the selection is
flagged.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

feat: live energy/wavelength readout in Beamline setup ... 2a82c598c0

New 'Current energy / lambda' row above the setpoint, fed per DAQ
tick from diffraction.energy_keV; the setpoint row is renamed
'Set Energy (keV)' so 'what is' and 'what to set' are distinct.
Guards energy 0.0 (server's detector-unavailable fallback) because
the wavelength property divides by it. The copied energy row in the
experiment configuration is renamed to match.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

feat: put the ExpHutch shutter left of the fast shutter ... 977483ef28

Beam-path order in the status bar: the hutch shutter sits upstream
of the fast shutter, so it reads left to right along the beam.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

style: move Unmeasured next to All, 1px gap between filter chips ... 378c25799f

Unmeasured and All are both 'what is left' views; the hand-applied
labels (Queued/Flagged/Measured) follow. The 1px spacing keeps the
chips readable as separate buttons instead of one solid bar.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

style: help badge at center top, More link right-aligned ... a0baa2b54d

The '?' badge sat in a corner, which drifts oddly when the view is
scaled to fit; the top middle stays put and out of the sample's way.
Transparency unchanged - visible enough to find, not disturbing.
'More... (F1)' moves to the overlay's right edge, reading like a
dialog's action button.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

fix: measured threshold is rotation count >= 1 ... 2909182bb1

Confirmed by Dawn: any rotation data counts as measured; unmeasured
is exactly rotation count 0. The old > 1 rule left single-rotation
samples looking like still-to-do work in the Unmeasured view.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

feat: clicking the '#' header selects all rows ... 4a728baf79

The status column holds no sortable data, so its header click slot
was free: it now does Ctrl+A, pairing with the Unmeasured chip to
grab everything still to be done in one motion. The sort indicator
is put back afterwards - the click drags it onto '#' even though
the model ignores sorting there.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

style: expanded help overlay opens top center, under the badge ... 3053aaae93

The '?' badge moved to the top middle but the cheat sheet still
opened bottom-left, sending the mouse across the view to close it.
The overlay now drops in where the badge was.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

feat: fast shutter open/close row in Beamline setup ... 8f91f1ed2e

Status flag on the left (same rich-text scheme as the status bar,
theme-aware via set_theme), Open/Close buttons on the right, wired
to the same daq.open_shutter/close_shutter slots staff-gated in
main_window.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

style: wrap shutter flag f-strings for ruff format ... 32a835b661

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

fix: pyright-style ignore for setGraphicsEffect(None) ... 03ae77fa74

basedpyright disables mypy-style 'type: ignore' comments by default, so
the diff-quality gate still counted the violation; match the existing
'pyright: ignore[reportArgumentType]' convention from main_window.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

duan_j force-pushed feat/gui-dynamic-signals-and-sample-tools from 2b660e31c7 to 03ae77fa74 2026-08-17 15:34:59 +02:00 Compare

duan_j marked the pull request as work in progress 2026-08-17 15:50:31 +02:00

duan_j added 3 commits 2026-08-17 16:24:12 +02:00

feat: current energy readout in Exp. Config energy row ... 1fef28231b

Mirrors the Beamline setup live readout above Set Energy, fed by the
same DAQ tick with the zero-energy guard and repaint skip.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

feat: Queued chip view shows the actual run order ... 344888dac0

The queue engine keeps insertion order and Run pops its head, but the
Queued view sorted by the dewar table's header sort - the top row was
not what runs next. set_queued_ids now keeps the order it is fed (the
queue model's order) and the Queued view displays exactly that; header
clicks no longer reorder it.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

feat: queue controls live only in the Queued view ... 6ace1fcbcf

Run/Remove selected/Clear list act on the queue, whose order only the
Queued chip view shows - in other views they are greyed out with a
tooltip pointing at the chip. Run stays enabled while automation runs
so pausing is always possible. Applies to the docked trio and the
pop-out clones alike.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

duan_j added 1 commit 2026-08-17 16:49:31 +02:00

feat: sample camera starts in scale-to-fit ... b58c23d0f6

_autoscale now defaults on, so the view fits from the first layout
(the constructor's placeholder already carries the camera size and
resizeEvent refits on every resize). update_pixmap additionally
refits when the frame size changes - the real stream resolution can
differ from the placeholder, and only a view resize refit before.
Right-click 'Scale to fit' still toggles back to 1:1.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

duan_j added 1 commit 2026-08-17 16:50:52 +02:00

fix: no auto-switch to beamline view during Sample alignment ... cb5837d90f

Busy in Sample alignment IS the alignment (centring moves) - yanking
the view away to the combined beamline tab hid exactly what the user
was doing. The motion-watch switch now skips that state; robot
exchange and other busy transitions still switch as before.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

duan_j added 2 commits 2026-08-17 17:00:28 +02:00

chore: clarify move to mounting position in smargon movement adcc63d45c

test: pin the Sample-alignment motion-watch exception ... e9428ca64d

Robot motion switches to the combined view; alignment beginning
switches straight back while busy is still set, and staying busy in
alignment never re-triggers. Piggybacks on the init test's window -
extra MainWindow constructions feed the PySide teardown flake.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

duan_j marked the pull request as ready for review 2026-08-17 18:19:02 +02:00

duan_j merged commit e9428ca64d into main 2026-08-17 18:19:23 +02:00

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

bug

Something is not working

duplicate

This issue or pull request already exists

enhancement

New feature

help wanted

Need some help

invalid

Something is wrong

question

More information is needed

wontfix

This won't be fixed

No labels

Milestone

No items

No Milestone

Projects

Clear projects

No projects

Assignees

Clear assignees

buntschu_d (buntschu_d) duan_j (duan_j) glettig_w (glettig_w) gobbo_a (gobbo_a) gotthard_g (gotthard_g) leonarski_f (leonarski_f) mx-gitea olieric (olieric) perl_d (perl_d) takaba_k (takaba_k) wang_m (wang_m)

No Assignees

2 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: mx/AareDAQ#144