mx/AareDAQ
0
1
Fork 0
Code Issues 27 Pull Requests Actions Packages Projects Releases 95 Wiki Activity

WIP debug wheel guard errors #141

Closed
perl_d wants to merge 1 commits from fix/graphics-and-recovery-debug into main
pull from: fix/graphics-and-recovery-debug
merge into: :main
Conversation 1 Commits 1 Files Changed 1
+943 -84
perl_d commented 2026-08-14 10:10:44 +02:00
Owner
Copy Link
Copy Source
No description provided.
perl_d added 26 commits 2026-08-14 10:10:44 +02:00
chore: name the bluebird theme in menu the default theme 63f4ad7612
fix: prevent libzmq abort and per-frame decode errors in prediction subscriber
CI / lint (push) Skipped
CI / test (3.11) (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
69178945e5 
Sniff for '{' before JSON-parsing zmq parts: JPEG frames start with 0xff
and raised UnicodeDecodeError on every frame. Stop closing the socket
from the GUI thread in stop(): zmq sockets are not thread-safe and the
concurrent close/recv tripped the signaler.cpp POLLIN assertion (core
dump); run() closes it in its own thread via the 500ms RCVTIMEO.

uv.lock: sync version to 0.8.3.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
fix: exposure wheel only increased when Alt held
CI / lint (push) Skipped
CI / test (3.11) (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
ac5936f7be 
Qt xcb/windows swap wheel axes while Alt is held, so angleDelta().y() is 0
and copysign(_, 0) is always positive. Fall back to angleDelta().x() and
ignore genuine zero deltas.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
chore: specify the omega panel 0 degree is a go-to not a move-by b8177bd764
feat: stage motor entry values, apply moves in one click
CI / lint (push) Skipped
CI / test (3.11) (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
e18c7feded 
Chi/Phi boxes in the Smargon tab no longer move on Enter: edits stage
the target (orange), the Move button sends all staged axes at once
(green), and boxes return to neutral when the motor reports arrival.
Out-of-range entries stay red and are never sent; limit tips pop as
tooltips. MotorMoveGroup is opt-in per box so other panels can adopt
the same logic later.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
feat: add More link in sample camera help overlay opening F1 dialog ebe0860ed4 
Underlined 'More… (F1)' line at the bottom of the painted help box emits
open_full_help, wired to the existing Mouse / Keyboard Controls dialog.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
fix: reserve sign width for GM labels; annotate red-highlight mismatch
CI / lint (push) Skipped
CI / test (3.11) (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
c837e6c44d 
Value column was content-sized, so rows shifted whenever a value flipped
negative. Labels now reserve '-88.888' width; right alignment keeps digits
anchored. Also TODO: red colors on live aerotech while labels display
aerotech_meas - intent unconfirmed, do not change condition until decided.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
fix: unsqueeze Chi/Phi row and widen Step box in smargon panel
CI / lint (push) Skipped
CI / test (3.11) (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
70107e6219 
Move button gets its own full-width row instead of sharing row 1 with the
Chi/Phi entries; Step box spans columns 1-4 instead of the narrow Chi
column.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
chore: Use rock and goto for better understanding 252e08384d
feat: add Change Energy row to experiment configuration c618354c01 
Copy of the Beamline Setup energy row (keV display, eV emit), placed
below the ML Loop Centring / Make Raster Grid row and always visible.
Wired to the same daq.change_energy; not staff-gated, server enforces
write permission.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
feat: rename Monochromator panel to Beamline Setup, add WIP beam-to-box row
CI / lint (push) Skipped
CI / test (3.11) (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
bb447b1567 
Display title only; class and file keep their names. New full-width
'Move Beam to Box (center) (WIP)' button under the Energy row, disabled
with a coming-soon tooltip until a DAQ endpoint exists.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
chore: using aare_banner.png since svg could be rendered wrong at rhel9 consoles d94fb88148
fix: send light slider changes from every input path, guard readback
CI / lint (push) Skipped
CI / test (3.11) (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
869a66ff4b 
Sliders only emitted on sliderReleased, so right-click+wheel, arrow keys
and groove clicks changed the value locally without a PUT and the 500 ms
status poll snapped it back. setTracking(False) + valueChanged now sends
one PUT per deliberate change; readback setValue is wrapped in
blockSignals to avoid echoing PUTs, and a 1.5 s grace window stops
in-flight stale status responses from bouncing the slider.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
feat: disable Beamline tab when active pgroup is outside token pgroups
CI / lint (push) Skipped
CI / test (3.11) (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
c5a6a175bd 
Switching to a visitor pgroup means running a user experiment: grey out
the Beamline tab (tooltip: beamline scientists only), bring the
Experiment tab forward with Dataset path and Exp. Config. opened.
Gate applies on transitions only so manual tab choices survive the
1 Hz status ticks.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
feat: default beamline state on login by role 656b441593 
Staff land in BeamLocation, users in SampleAlignment. One-shot on the
first status tick where the GUI owns the session and the beamline is
idle, so a running operation or a watch-only GUI is never disturbed.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
feat: show locked beamline banners to non-staff 1bce76e6fc 
Beamline setup, ABR meas. pos. and Beam configuration banners stay
visible for non-staff instead of vanishing, but are locked stand-ins:
clicking one pops the staff-only notice (same pattern as the
Auxiliary-puck tab) telling the user to log in as staff or contact
their local contact.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
chore: rename Beamline Setup to Beamline setup, comment tweaks
CI / lint (push) Skipped
CI / test (3.11) (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
75d7bed380 
Panel title case now matches the other banner names. Also clarify the
splash banner comment in gui.py.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
fix: busy flag in Axis views as plain status text, not a badge
CI / lint (push) Skipped
CI / test (3.11) (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
69d552c068 
Gonio camera, Beamline view and the combined view showed BEAMLINE BUSY
in the rounded badge pill, which reads as a clickable button. These
views are passive, so draw the same shadowed colored text the sample
camera uses for its warnings; the pill stays only on the sample-camera
session badges, which really are click targets.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
fix: grey out whole state strip while beamline is busy d659f05009 
Busy now empties the available-target set exactly like Moving, so no
entry looks clickable and no transition can be posted mid-operation
(same guard the status-bar menu already had). The current/pending
entry keeps its highlight as orientation.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
feat: switch to Beamline combined view while busy
CI / lint (push) Skipped
CI / test (3.11) (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
CI / test (3.11) (pull_request) Successful in 1m27s
Details
CI / test (3.12) (pull_request) Successful in 1m27s
Details
CI / lint (pull_request) Failing after 1m31s
Details
CI / test (3.13) (pull_request) Successful in 1m27s
Details
CI / test-with-beamline-plugins (pxi_bec) (pull_request) Successful in 2m1s
Details
CI / test-with-coverage (pull_request) Successful in 2m12s
Details
CI / coverage-analysis (pull_request) Failing after 3s
Details
CI / test-with-beamline-plugins (pxii_bec) (pull_request) Successful in 2m48s
Details
CI / test-with-beamline-plugins (pxiii_bec) (pull_request) Successful in 2m44s
Details
58bde9379b 
Generalize the robot-mount auto-switch: any busy period now brings up
the combined view so the motion can be watched, and the sample camera
returns when busy clears. Edge-triggered, so manual tab choices
survive between transitions; _mounting renamed to _watching_motion.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
chore: satisfy ruff format and SIM201 lint
CI / lint (push) Skipped
CI / test (3.11) (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
CI / lint (pull_request) Failing after 1m3s
Details
CI / test (3.11) (pull_request) Successful in 1m29s
Details
CI / test (3.12) (pull_request) Successful in 1m28s
Details
CI / test (3.13) (pull_request) Successful in 1m27s
Details
CI / test-with-beamline-plugins (pxi_bec) (pull_request) Successful in 1m30s
Details
CI / test-with-beamline-plugins (pxii_bec) (pull_request) Successful in 1m43s
Details
CI / test-with-beamline-plugins (pxiii_bec) (pull_request) Successful in 1m41s
Details
CI / test-with-coverage (pull_request) Successful in 2m6s
Details
CI / coverage-analysis (pull_request) Failing after 3s
Details
b4896105ab 
ruff format collapsed lines the Beamline setup rename and other edits
left splittable; SIM201 wanted != over 'not ... ==' in the prediction
subscriber's JSON sniff.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
fix: clear basedpyright diff violations 5871c959e2 
Rename NumberLineEdit.validator to range_validator: the instance attr
shadowed QLineEdit.validator() and broke type checking at call sites.
Annotate the smargon _move_axes dict and cast the stand-in self in the
prediction subscriber test.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
test: lift diff coverage over the 80 percent gate
CI / lint (push) Skipped
CI / test (3.11) (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
CI / lint (pull_request) Successful in 1m3s
Details
CI / test (3.11) (pull_request) Successful in 1m25s
Details
CI / test (3.12) (pull_request) Successful in 1m25s
Details
CI / test (3.13) (pull_request) Successful in 1m24s
Details
CI / test-with-beamline-plugins (pxi_bec) (pull_request) Successful in 1m32s
Details
CI / test-with-beamline-plugins (pxiii_bec) (pull_request) Successful in 1m37s
Details
CI / test-with-beamline-plugins (pxii_bec) (pull_request) Successful in 1m41s
Details
CI / test-with-coverage (pull_request) Successful in 2m4s
Details
CI / coverage-analysis (pull_request) Successful in 3s
Details
16e112f44a 
Promote the illumination panel's __main__ self-check to a real pytest
file so CI counts it, add busy-overlay render checks (status text
paints, video view routes through it), and cover the motor group's
incomplete-entry and below-min Enter paths. Local diff coverage from
the gui suite alone: 82 percent.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
fix: explain gated Beamline tab clicks; drop login state POST 6c720d29d3 
Two changes folded together because they touch the same status path:

- Revert the login-default state POST: a state transition can move
  motors, and merely opening the GUI must never move hardware. The GUI
  now adopts whatever state the server reports.
- A click on the pgroup-gated (disabled) Beamline tab used to be eaten
  silently by the tab bar. An event filter now pops the explanation:
  visitor-pgroup wording for staff, the staff-only message for users
  (same pattern as the Auxiliary-puck tab).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
test: cover every changed line in the branch diff
CI / lint (push) Skipped
CI / test (3.11) (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
CI / lint (pull_request) Successful in 1m17s
Details
CI / test (3.11) (pull_request) Successful in 1m44s
Details
CI / test (3.12) (pull_request) Successful in 1m41s
Details
CI / test (3.13) (pull_request) Successful in 2m1s
Details
CI / test-with-beamline-plugins (pxi_bec) (pull_request) Successful in 1m57s
Details
CI / test-with-beamline-plugins (pxii_bec) (pull_request) Successful in 2m0s
Details
CI / test-with-coverage (pull_request) Successful in 2m26s
Details
CI / coverage-analysis (pull_request) Successful in 3s
Details
CI / test-with-beamline-plugins (pxiii_bec) (pull_request) Failing after 18m13s
Details
aa6c226103 
Diff coverage vs main now 100 percent from the gui suite alone:
non-staff locked banners and both gated-tab popups, remote-close
bookkeeping in update_daq_status, smargon staged moves, camera More
link and Alt-wheel axis fallback, number box relimits, energy row
emit, and the gui.main() banner/graceful-exit path.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
wip guard wheel guard
CI / lint (push) Skipped
CI / test (3.11) (push) Skipped
CI / test (3.12) (push) Skipped
CI / test (3.13) (push) Skipped
CI / test-with-beamline-plugins (pxi_bec) (push) Skipped
CI / test-with-beamline-plugins (pxii_bec) (push) Skipped
CI / test-with-beamline-plugins (pxiii_bec) (push) Skipped
CI / lint (pull_request) Failing after 47s
Details
CI / test (3.11) (pull_request) Successful in 1m47s
Details
CI / test (3.13) (pull_request) Successful in 1m45s
Details
CI / test (3.12) (pull_request) Successful in 1m50s
Details
CI / test-with-beamline-plugins (pxi_bec) (pull_request) Successful in 1m49s
Details
CI / test-with-beamline-plugins (pxii_bec) (pull_request) Successful in 1m59s
Details
CI / test-with-beamline-plugins (pxiii_bec) (pull_request) Successful in 2m1s
Details
CI / test-with-coverage (pull_request) Successful in 2m30s
Details
CI / coverage-analysis (pull_request) Successful in 4s
Details
47449132e1
gitea-actions bot commented 2026-08-14 10:13:38 +02:00
Copy Link
Copy Source

Coverage report (automated)

Total line + branch coverage: 48%
Diff coverage vs main: 98% (minimum 80%)

Full report: coverage artifact on this run.

Coverage report (automated) Total line + branch coverage: 48% Diff coverage vs main: 98% (minimum 80%) Full report: coverage artifact on this run.
perl_d closed this pull request 2026-08-17 09:27:01 +02:00
perl_d deleted branch fix/graphics-and-recovery-debug 2026-08-17 09:27:04 +02:00

Pull request closed

This pull request cannot be reopened because the branch was deleted.
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
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: mx/AareDAQ#141