Commit Graph
124 Commits
Author SHA1 Message Date
appleb_m 456cd63420 GUI: changed dewer load/unload to dewer transfer to match state name 2025-09-29 16:57:25 +02:00
appleb_m 1e882c5cd5 GUI: tidied up status_bar.py state handling. 2025-09-29 16:57:01 +02:00
leonarski_f 078e85f812 AareGUI: Auth based on local user 2025-09-26 09:57:12 +02:00
leonarski_f f2ff0e04aa AareGUI: Smoothen exit from GUI by adding timeout on ZeroMQ 2025-09-25 09:12:59 +02:00
leonarski_f 76e4fa0bcd AareGUI: Fix default addresses for services 2025-09-25 08:54:59 +02:00
Martin Appleby d90d847506 DAQ: changed beamline busy to be constant 2025-09-22 11:47:34 +02:00
leonarski_f f857f8b8b7 GUI: camera_image.py added BEAMLINE BUSY message when beamline is in use. ALso change colour of the beam centre mark 2025-09-19 16:12:20 +02:00
leonarski_f c5a11f049a GUI: camera_thread.py update for USB-C camera. 2025-09-19 16:11:37 +02:00
leonarski_f 14cd289b55 GUI: status bar update from Takashi recommendations 2025-09-19 16:10:40 +02:00
leonarski_f 89f8574a6d GUI: updated zmq_address for OAV 2025-09-18 10:09:38 +02:00
leonarski_f 7e96b58b5b DAQ - jfjoch_viewer.py: fixed slot bug and changed load functions to use the http address instead of file path. 2025-09-18 10:09:01 +02:00
leonarski_f 7ee95747b8 AareGUI: Use files with the viewer 2025-09-14 11:50:11 +02:00
leonarski_f 7d2cdeca68 DAQ/GUI - JFJoch: fixed bug where image viewer wasnt taking the path, by changing to the http address 2025-09-11 14:42:15 +02:00
leonarski_f 23ff756769 DAQ/GUI - JFJoch: updated to jfjoch client rc73, added functionality to get profile radius, removed functionality for mosasicty. 2025-09-11 14:41:29 +02:00
leonarski_f dd462d0acd GUI: added back 1x zoom button 2025-09-11 14:34:18 +02:00
GotthardG d47ce8be84 Introduce DataCollectionParameters model with validation and update dependencies
Build and Publish / build (push) Successful in 24s
Added a new `DataCollectionParameters` model in `aaredaqlib` with extensive field validation and default handling for increased robustness. Updated `aaredaqlib`, `aaredb`, and related dependencies to version `0.2.4` for consistency across modules. Enhanced logging for better visibility during validation.
2025-08-20 15:13:05 +02:00
leonarski_f 05fe41ae93 DAQ: fixed bug in Image-_number function> ALso checks if image_angle is 0 to prevent a divide by 0 error. 2025-07-22 17:07:12 +02:00
leonarski_f 174881d160 DAQ: fixed bug where order of samples dropped into the queue would occasioanlly be arbitrary. 2025-07-21 15:55:29 +02:00
leonarski_f 177199c60a GUI: axis camera optimization 2025-07-17 14:27:19 +02:00
leonarski_f e3e1e97712 GUI: update abr_tweak_panel default abr step in um 2025-07-17 14:27:19 +02:00
leonarski_f 09be1864a5 GUI: Run viewer to check online X-ray images 2025-07-16 16:49:46 +02:00
leonarski_f e879c1b757 GUI: More adjustments to paths 2025-07-15 09:57:17 +02:00
leonarski_f 47d24e17d1 GUI: Force paths for common data collection modes 2025-07-15 09:57:17 +02:00
leonarski_f b99a126578 GUI: Use 4 digit year 2025-07-15 09:57:17 +02:00
leonarski_f cac3b67dde DAQ: Always add "raster/" for rasters (remove {type} in GUI) 2025-07-15 09:57:17 +02:00
leonarski_f d672ce8780 GUI: Tweak defaults for ABR step and rotation/screening 2025-07-15 09:57:17 +02:00
leonarski_f 58df388409 DAQ: Fix issues with DAQ status updates 2025-07-15 09:57:16 +02:00
leonarski_f 5ce803ad0c DAQ: JFJoch viewer - modification to DBus, always provide file name to LoadImage 2025-07-15 09:57:16 +02:00
leonarski_f a245771ebd GUI: Dedicated directory for raster files 2025-07-15 09:57:16 +02:00
leonarski_f a875c6a1d9 DAQ: Returning list of completed rasters 2025-07-15 09:57:16 +02:00
leonarski_f 000b597271 DAQ: Added auto-centering 2025-07-15 09:57:16 +02:00
leonarski_f 488386597f GUI: Potential fix to camera thread exit issue 2025-07-15 09:57:16 +02:00
leonarski_f 63d0acc227 GUI: Add beamline camera view 2025-07-15 09:57:16 +02:00
leonarski_f 88e639b070 DAQ: Switch to raster panel from rotation panel if change is made to the drawn grid 2025-07-15 09:57:16 +02:00
leonarski_f 0fcdd13c5a DAQ: always check proper file is open in the viewer 2025-07-15 09:57:16 +02:00
leonarski_f edbdab6625 GUI: Add spot ice ratio to the drop down panel and grid scan result visualisation. Fixed bug where spot count (ice) wasn't being correctly parsed to the GUI. 2025-07-09 17:15:20 +02:00
leonarski_f 2d4acf868d GUI: Display spots ice/spots indexed 2025-07-08 13:21:16 +02:00
leonarski_f 35249295e1 DAQ: automatically move to an optimal data collection point following a grid scan. Bug fix in _draw_grid to check if values[pxl] is None. 2025-07-08 11:50:57 +02:00
leonarski_f 7c03965302 GUI: if left_click_event occurs outside of camera image area, no longer moves smargon. 2025-07-07 09:57:00 +02:00
leonarski_f 02b83b0096 DAQ: Now uploads screenshots to aaredb following loop centering and rotation data collection. Removed a zoom setting. Updated mount procedure to include loop centering following robot mount. 2025-07-04 16:23:29 +02:00
leonarski_f 6bc3ed2eae DAQ: sample setter now clears manual sample. removed sample_clear. Manual sample must still be unmounted by hand. 2025-07-04 11:59:36 +02:00
leonarski_f 731efccc2b DAQ: added ml_bounding_box to loop centering, creates grid scan grid using ml. Fixed bug where filename wouldn't iterate for copied grid scans. 2025-07-04 10:59:42 +02:00
leonarski_f 053daa24ff GUI: On new sample set data collection tab to raster 2025-06-30 22:37:36 +02:00
leonarski_f b6a91aa952 GUI: Fix rotation/screening titles and dose vertical alignment 2025-06-30 14:49:05 +02:00
leonarski_f 0c347783b7 GUI: Fix menu not loading in beam location mode 2025-06-30 14:44:30 +02:00
leonarski_f a3d937fb07 GUI: Fix logic to update grid scan size 2025-06-30 14:41:35 +02:00
leonarski_f 606f1b62fb GUI: Add completed grid scan table 2025-06-29 12:19:47 +02:00
leonarski_f 518e3df0d6 GUI: Grid scan WIP 2025-06-29 11:18:13 +02:00
leonarski_f 043a5eef45 GUI: Manual sample panel (WIP) 2025-06-29 11:10:50 +02:00
leonarski_f b1c4feaee2 VERSION: 0.2.3
Build and Publish / build (push) Successful in 21s
2025-06-26 13:48:21 +02:00