179 Commits

Include renames

Author	SHA1	Message	Date
duan_j	5cb32ba5fc	test: patch the test	2026-09-30 13:58:13 +02:00
duan_jandClaude Fable 5.1	3409d01efd	fix(gui): fire mount auto-centering on the first idle status tick ... The "apply after mounting" checkbox clicked Auto Centering as soon as the status poll showed a new sample id. /sample/mount still holds the hw lock at that point, /alc/center_loop takes the same lock non-blocking, and the resulting BeamlineBusyException is a quiet error the GUI swallows. So the automatic click never did anything; only a later manual click worked. Arm on the sample-id change and click on the first status tick with busy=False, which is exactly what the user did by hand. Skip arming while queue automation runs: it mounts and centers on its own and frees the lock between /scan/auto calls, so a GUI centering in that gap would steal the lock from the next scan. Pause during a scan's mount phase can still arm that one sample, but Pause ends in an unmount, so the window is a ms-wide lock gap sampled at 2 Hz; accepted, noted in the code. Supersedes the three-commit approach on fix/auto-center-after-mount-wait-idle (PR 243). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-29 16:51:07 +02:00
duan_jandClaude Fable 5.1	79bb351437	style(gui): soften the mounted-sample HUD ink on light themes ... Pure black (SHADOW) over the camera image read too harsh; use the theme text ink (TEXT) with the same white halo instead. Sunset keeps white on black. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-18 16:35:05 +02:00
duan_jandClaude Fable 5.1	b5e6159118	fix(gui): add "Show beam crosshair" toggle to the camera right-click menu ... Right-clicking the sample camera now offers a checkable "Show beam crosshair" entry. When on, two full-frame lines through the beam center are drawn with the same pen as the beam box, so the crosshair follows the beam state color. Off by default so the view stays as before. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-18 09:19:21 +02:00
duan_jandClaude Fable 5.1	90f653386a	fix(gui): app-level event filters tolerate PySide's stray QWidgetItem ... CI (3.12, PR 232) failed test_font_zoom_keeps_frozen_column_aligned_and_reautosizes with a pytest-qt CALL ERROR: PySide 6.9 handed both app-level filters a QWidgetItem instead of a QEvent during layout teardown, and event.type() raised. The wheel guard now keys on isinstance(event, QWheelEvent) and returns False itself instead of super().eventFilter() (which type-checks its arguments and would raise the same way); the cursor filter ignores anything that is not a QEvent. Regression test for each. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-17 21:12:55 +02:00
duan_jandClaude Fable 5.1	d70cac45bf	fix(gui): keep the file-name preview in the plain theme color ... Dawn: the red "file exists" tint on the path label reads as an error across the whole panel. The Run guard's popup already reports a clash, so the label stays in the standard text color. The popup now also asks the user to run the data collection again after the run number bump. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-17 18:44:56 +02:00
duan_jandClaude Fable 5.1	010513e141	fix(gui): reach the file-exists guard from every tab, test exact names ... The tabs are handed parent=DataCollectionSettings but QStackedWidget.addWidget() reparents them to the stack, so the guard's parent() lookup never found file_path_panel and every Run (rotation, screening, raster, X-ray centering, Simple) skipped the check. Lookup now walks up the widget tree; regression test drives all five runs through the real DataCollectionSettings. The "taken" test is exact again: <run>_master.h5 plus the DAQ's derived <run>_raster2d/_raster1d_master.h5. The directory test and the _*_master.h5 glob are gone: neither is a file a run writes, and they painted run numbers red that nothing would ever produce. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-17 18:44:56 +02:00
duan_jandClaude Fable 5.1	646de67291	fix(gui): make the file-exists guard literal: popup, run +1, no scan ... update_filename() still skipped to the next free run number on every edit and refresh, so the name was always free by the time Run was clicked and the guard never fired. The name is now exactly what the fields say (label turns red on a clash); on Run, an existing target pops "File already exists", bumps the run number by one and does nothing else. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-17 18:44:56 +02:00
duan_jandClaude Fable 5.1	8798a81555	fix(gui): pop up "File already exists" instead of silently bumping the run ... The Run guard called set_scan_kind(), which runs update_filename() and skips to the next free run number before the existence check, so the check never fired and the scan started under a new number without a word. Now the check runs first, then a warning box names the existing master file and the run number it moved to, and the run is blocked. - Simple tab "Run rotation" had no guard at all; same guard added - "Taken" also matches <run>_*_master.h5: X-ray Centering writes <run>_raster2d_master.h5, which the exact name missed - Camera context-menu "Evaluate grid" presses the panel button, so it gets the guard and stays inert while the button is disabled - Dead next_free_run_from() removed Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-17 18:44:56 +02:00
duan_jandClaude Fable 5.1	bf11528e86	fix(gui): zoom-proof the Dewar table and control heights, theme the mounted HUD ink ... Dewar "#" column sat 1px above the other rows at some zoom steps: the frozen-column overlay sizes its own header from "#" alone while the main header also sees the symbol columns, whose fallback-font glyphs have a taller line box. The overlay header is now pinned to the main header height on resize and (deferred, receiver-bound) on font/style change. Zoom also left columns at their startup widths (headers truncated) and clipped descenders in every button/combo/entry box: the 16px height pin in both sheets was raw px while the body font grew to 18/21px. Columns re-autosize on FontChange and the pin scales with the font ladder. Camera "Currently mounted" HUD: black ink on a white halo in the light themes, white on black in Sunset, instead of white-on-black everywhere. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-17 18:44:56 +02:00
duan_jandClaude Fable 5.1	1ea607ba56	fix(gui): keep queue head until /status confirms unmount on Mount next ... Mount next popped the mounted head before posting the exchange, so a failed unmount dropped a sample that was still on the gonio. Now the head stays queued and is removed only when /status shows a different (or no) sample mounted; a failed exchange leaves the queue intact for a retry. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-17 18:44:56 +02:00
duan_jandClaude Fable 5	1b6a32d137	feat(gui): pin status-bar operables right, stop readout width jitter ... - Fast Shutter / State / p-group / Session are addPermanentWidget now: QStatusBar itself pins them to the right corner, so wrapping of the other readouts never moves them - passive readouts keep wrapping in the FlowHost on narrow windows - grow-only min-width ratchet on every readout: changing number widths used to re-flow the row each DAQ tick and jitter every neighbour Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>	2026-09-17 18:44:56 +02:00
duan_jandClaude Fable 5	5cb57f4737	feat: status-bar readouts wrap on narrow windows instead of clipping ... All readouts (sharpness ... Cryo | Fast Shutter | State | p-group | Session) now live in one FlowLayout host: when the window gets narrow the bar grows extra rows and every value stays readable, where QStatusBar used to clip the permanent group and hide the rest. FlowLayout is the canonical Qt example trimmed down (Qt ships no built-in); the host pins its minimum height to the wrapped height because QStatusBar ignores heightForWidth. The old left/right addWidget vs addPermanentWidget split is gone with the wrap. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>	2026-09-16 14:37:19 +02:00
duan_jandClaude Fable 5	33239bf51f	refactor: drop the camera-region splitter, side columns fixed again ... User decision: the drag-resize bars beside the Sample camera view are not wanted - the side panels don't need resizing. Back to the plain HBox with zoom-scaled fixed column widths; the View-menu collapse toggles and the camera minimum-width clamp stay. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>	2026-09-16 14:37:19 +02:00
duan_jandClaude Fable 5	26fbe2ca42	fix: give deferred singleShot callbacks a receiver context ... Root cause of the long-standing cross-test SystemError flake ("QPushButton returned NULL", CI failing test_title_label after an unrelated file): TitleLabel schedules QTimer.singleShot(0, self._apply_collapsed) at construction; when the banner is deleted before the event loop spins (what every panel test does), the pending timer fires into the dead C++ object and poisons whatever test runs next. Deterministic repro added as a regression test. The receiver-context overload singleShot(0, self, ...) auto- cancels the callback when the widget dies. Same fix for the two deferred main-window callbacks (dock split, floating-dock enlarge). Note for the record: the LOCAL segfault storm this afternoon was the dev machine's disk hitting 100% full (uv cache at 15G) — Bus errors from mmap on a full disk, unrelated to any code. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>	2026-09-16 13:29:07 +02:00
duan_jandClaude Fable 5	e31b0e9a6f	fix: cast the mocked daq.unmount for basedpyright on CI ... CI's basedpyright (latest from the index, newer than the local venv) types win.daq as the real DAQWorker, so assert_not_called on the patched-in MagicMock flagged the two new gate-test lines. Note: the pytest job segfaults are NOT from this branch — plain origin/main crashes 2/4 runs under PySide6 6.11.2 (what CI installs; uv.lock pins 6.9.0 which is stable). Needs a separate dependency fix. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>	2026-09-16 13:28:16 +02:00
duan_jandClaude Fable 5	809959df33	feat!: remove Playlist Mode and Automation View, unpin window minimum ... Why the width shrink only worked after a Playlist Mode round-trip: Qt auto-pins a top-level window's minimum size to its layout minimum, and returning from Playlist Mode hid the Information dock (and every side dock), which happened to drop that layout minimum. The main view now gets an explicit small minimum (320x240) which disables the auto-pin outright, so the window shrinks directly and the dock contents clip or scroll instead. The Playlist Mode (Ctrl+6) and Automation View (Ctrl+5) prototypes are deleted per user decision: panels, pages, the content stack (the standard page is the only page left), menu actions, camera fan-out to their view copies, portrait alert interceptors (now plain runtime notification routers), and their styles (portraitRoot, compact* cards, COMPACT_* and FONT_HERO knobs). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>	2026-09-16 13:28:16 +02:00
duan_jandClaude Fable 5	fd0edffdc9	WIP: resizable camera region, menu panel collapse, zoom ladder ... - center splitter: left controls | camera tabs | beamline column; drag resizes the camera width, View menu check actions collapse the fixed-width side panels (no on-screen buttons) - font zoom restricted to a 100/125/150 percent ladder; the fixed-width side boxes scale with it so zoomed text does not clip - camera tab widget min width clamped to 1/3 of its natural minimum - resize bars: short centered grip PNGs shared by QMainWindow separators and QSplitter handles, single style source in styles.py - window min width 1244 -> ~376: automation row and sample-list chip row stop propagating their natural minimums (Ignored-width hosts), portrait page fixed width removed (portrait mode pins the window width itself) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>	2026-09-16 13:28:16 +02:00
duan_jandClaude Fable 5	f1f932bc7c	feat: full-name tooltips on the glyph count column headers ... The sample list's Mount/Gridscan/Screening/Rotation count columns show only a glyph in the header to save width; hovering now shows the full name via ToolTipRole. Text headers stay tooltip-free. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>	2026-09-14 13:23:32 +02:00
duan_jandClaude Fable 5	1fe3c7f4e5	refactor: transmission is a per-mode setting, placed in its section ... The shared "Rotation transmission" row sat in the top rows of BOTH the Gridscan and Rotation tabs, where it read as one setting for everything (and as nonsense in the Gridscan tab). Now each tab places its own row: Gridscan keeps "Transmission" with the shared resolution/distance rows, and the Rotation tab moves "Rotation transmission" below the Screening block and its Run button, as the first row of the Rotation section - next to the fields it actually applies to. Screening keeps its separate "Screening transmission". No behavior change: same field, same spreadsheet/user-value handling, only the label and the placement. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>	2026-09-14 13:23:32 +02:00
duan_jandClaude Fable 5	6d09ae4fe3	feat: show the mounted sample name on the camera view ... A "Currently mounted: <sample_name>" HUD line in the top-left corner of the sample camera, driven by the DAQ status (clears when nothing is mounted). Painted like the other camera HUDs and sized through the text zoom, which QSS cannot reach here. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>	2026-09-14 13:23:32 +02:00
duan_jandClaude Fable 5	1fc72649b0	feat: text zoom shortcuts and high-contrast resize lines ... - Ctrl+plus / Ctrl+minus / Ctrl+0 (and View menu entries) scale the QSS FONT_* ladder and the application default font together; the scale is clamped to 0.8-1.6 and persisted in QSettings appearance/font_scale. - Resize gutters keep a 5px hover/drag region but paint only a 2px line with a 1px shadow (hard-stop gradients per orientation). - WCAG contrast fixes: separators were 1.0-1.2:1 against every theme background, now >=3.25:1 (dark theme gold @70%); scrollbar handle 1.17:1 -> 3.38:1; unselected tab text on the sky gradient 2.07:1 -> 4.71:1 via TAB_IDLE_TEXT. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>	2026-09-14 13:23:32 +02:00
perl_d	9b58d77e5b	fix: update time param in aarescan calls for screening and raster	2026-09-14 12:41:06 +02:00
perl_d	32086ffc61	feat: add per-beamline default datacollection params	2026-09-11 10:51:25 +02:00
duan_jandClaude Fable 5.1	d5a7074ec1	feat: compact sample list headers, move Comment column ... Count columns use glyphs instead of long headers to save width, Comment moves ahead of the data-collection params, transmission shown as the stored value instead of percent. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-10 17:04:43 +02:00
perl_d	f7ebae2444	feat: add pxiii flux from lookup table	2026-09-10 16:36:04 +02:00
perl_d	82065c0f7d	fix: general fixes	2026-09-10 08:42:09 +02:00
David Perl	8d53505281	fix: remove zoom to fit test for unused functionality	2026-09-09 23:20:20 +02:00
duan_jandClaude Fable 5.1	22228c0868	feat: highlight whole mounted row in sample list ... The mounted sample used to tint only the frozen "#" cell. Paint the full row in the same blue so it is findable at a glance, and keep the theme's own text color on it (the mid-tone blue reads fine without the dark ink that the pastel status tints need). Repaint the whole row span on mount/unmount, not just column 0. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-09 16:54:43 +02:00
duan_jandClaude Fable 5.1	a2c5ed3d5c	feat: show spreadsheet params in sample list ... Add Oscillation, Exposure, Total range and Transmission columns to the dewar sample table, read from SampleShortInfo.aaredb_params (already filled by spreadsheetupdater from AareDB, so no server change). Transmission is shown as percent like the user spreadsheet. The new columns are nullable, so the header sort key now puts None last instead of raising on None < float. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-09 16:54:43 +02:00
perl_d	9f12167599	fix: update spreadsheetupdater tests	2026-09-09 11:49:34 +02:00
perl_d	aa90dea2eb	fix: update tellupdater tests	2026-09-09 11:42:07 +02:00
perl_d	1cd8102b69	fix: add tests and cleanup after exceptions	2026-09-09 10:09:10 +02:00
perl_d	18bcbdba10	feat: add hardware lock to server	2026-09-09 10:09:10 +02:00
perl_d	fbfe773954	feat: remove all busy-state handling	2026-09-09 10:09:10 +02:00
duan_jandClaude Fable 5.1	a56457d03b	test: route the tell-state stand-in through object for basedpyright ... Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-08 14:57:29 +02:00
duan_jandClaude Fable 5.1	ccb71bf43f	test: format the mocked token and cast the tell-state stand-in for basedpyright ... Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-08 14:56:55 +02:00
duan_jandClaude Fable 5.1	c3e7b9a2cc	test: cover the sample camera pacing, the newest-frame drain and the frame slot ... CI's diff-coverage gate sat at 29% because the ZMQ fixes live in code no test reached: the subscriber's socket setup, _emit_image/notify_frame_ displayed, _recv_latest and the run() frame path, plus the main window's frame slot. The subscriber now runs against a real inproc socket (the drain and the in-flight cap are the fix, so a mock would prove nothing); run() is driven with a stubbed _recv_latest that hands over one JPEG and then stops. The busy overlay gets a check that cooling is the only blue busy state. The subscriber fixture takes qapp so no QImage is built before the QApplication exists. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-08 14:56:16 +02:00
duan_jandClaude Fable 5.1	dbd5b9078f	style: paint the unknown-session badge with the viewing-mode style ... The sample camera drew its own gold/orange/red "Session Vacant / Baton Requested / Guest Mode" box whenever the busy overlay had nothing to show. Since the busy-style builder already receives the session state, that box only ever appeared while the session was still unknown (no status yet, or one without a session), so it flashed a different color and shape than the yellow "Viewing mode, click here to grab the baton" badge every known not-owned state gets. Hoist that badge into VIEWING_MODE_STYLE and paint it from both paths; the hover fill is shared through _badge_fill. The three MARK_TOOLTIP constants had no other users and are dropped. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-08 14:31:32 +02:00
duan_jandClaude Fable 5.1	f1cf55adb9	fix: take the aareDB transmission as the fraction aarecommon >= 0.7 declares ... CI resolves aarecommon 0.7.3, where DataCollectionParameters.transmission is a 0-to-1 fraction that rejects anything above 1.0 (the percent sheets are converted inside AareDB >= 0.83, which main already requires). The divide-by-100 from the earlier 'percentage' fix therefore failed the model test on CI and would have turned 20% into 0.2% at the beamline. Pass the fraction through and pin aarecommon>=0.7.3 so the older int percentage model can no longer be installed; relock. Also satisfy the diff typecheck gate: basedpyright only counts instance variables assigned in __init__, so the Database/User toggle widgets are created there and _build_source_toggle only lays them out. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-08 11:56:57 +02:00
duan_jandClaude Fable 5.1	f20bd065f5	feat: show AUTO CENTERING in the sample camera view while a loop centering runs ... /status cannot tell an auto centering from a manual alignment move (both are busy + SampleAlignment, the combo the overlay deliberately hides), so the DAQ worker emits its own auto_centering flag: True while its own /alc/center_loop POST is in flight (the endpoint blocks until done) or while the automation progress reports the Center step running. The sample camera views pass it to build_busy_overlay_style, which paints a purple AUTO CENTERING wave text like the ROBOT MOUNTING/COOLING ones. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>	2026-09-08 11:56:57 +02:00
leonarski_fandClaude Opus 5	63d902a82a	fix: read the aareDB transmission as the percentage it is ... DataCollectionParameters.transmission is a StrictInt documented as "positive, between 0 and 100" (aareDB's own API description of the spreadsheet payload), while every model that consumes it wants a 0-to-1 fraction. The old "divide by 100 only when above 1.0" guess therefore turned a spreadsheet asking for 1% into a scan at 100% transmission - a hundredfold dose on the sample. A fraction cannot be stored in that column at all: the model rejects 0.2. The mapping test now builds a real DataCollectionParameters instead of a stand-in namespace, so a renamed column fails the test rather than the beamline. That is what let 'totalrange' through. daq.py's spreadsheet_params and get_auto_raster_params still carry both the old column name and the same transmission guess. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01JHoUkj66jxByS2ypY5h9Mn	2026-09-08 11:56:57 +02:00
leonarski_fandClaude Opus 5	7cc662bfd8	fix: read the aareDB total angle from the column that exists ... The column is totalangle, not totalrange, so reading it raised AttributeError four times a second in the status loop. Reading a spreadsheet cell now goes through _spreadsheet_float, which treats a missing column, an empty cell and a cell that does not hold a number all as "not set" and logs the column once. aareDB owns these names; the GUI should fall back to its defaults when one moves, not die on the status loop it is read from. Note that the same misspelling is still in daq.py (spreadsheet_params and get_auto_raster_params), where getattr's default hides it: automation has never picked up the total angle from the spreadsheet either. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01JHoUkj66jxByS2ypY5h9Mn	2026-09-08 11:56:57 +02:00
leonarski_fandClaude Opus 5	8833f3a9d1	fix: keep user values in the scan panels across sample mounts ... The panels kept the effective detector distance, resolution and transmission in their own attributes, and a sample change overwrote those from the spreadsheet whatever the Database/User toggle said. The fields went on showing the user's numbers while the scan request carried the database ones, so a value had to be re-entered after every mount. The fields are now the only place a value lives. Each setting is worth, in order: what the user typed while "User values" is selected, what the mounted sample asks for, the panel default - one rule, ScanSettingsPanel ._setting, that each panel spells out a line at a time. Overrides are per setting, so a setting the user did not touch keeps following the sample. Along the way: * DbOverrideLineEdit is gone; the panels use NumberLineEdit directly, and the per-widget database/user bookkeeping is replaced by SampleParameters, the one place that knows the aareDB spreadsheet column names. * The (name, widget, converter) mapping loops with getattr/hasattr are replaced by explicit per-field commit slots. * The omega speed cap no longer drives one field's validator from another field's value: it is a read-out plus a check on the pair at Run time. * _add_row/_add_pair_row build the label/field/unit rows, which also puts the Total angle degree sign on its own row instead of the header above. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01JHoUkj66jxByS2ypY5h9Mn	2026-09-08 11:56:57 +02:00
duan_j	416302224c	feat: 900 Hz at 6d and 120 Hz at 10s for data collection. Paint input correspondingly.	2026-09-05 11:04:18 +02:00
duan_j	0696b583b0	test: no need to compare wording	2026-09-02 09:13:08 +02:00
perl_d	9939df6767	fix: separate detector tilt geometry per beamline	2026-09-01 14:50:54 +02:00
perl_d	e027ccbfb1	fix: return beam center in correct format	2026-08-31 17:57:36 +02:00
perl_d	8797d555a7	feat: add 1D beam center config for 10S	2026-08-31 17:37:35 +02:00
duan_j	a19cbf1081	test: no need to test energy 0 and update tolerance ... test: update test...	2026-08-24 19:24:29 +02:00